Skip to content

Commit 9efc0d1

Browse files
committed
Add package and version to deprecated services definitions
1 parent 0688be6 commit 9efc0d1

File tree

4 files changed

+34
-5
lines changed

4 files changed

+34
-5
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [Unreleased](https://github.com/ajgarlag/psr-http-message-bundle/compare/1.1.0...main)
66

7+
### Fixed
8+
- Add package and version to deprecated services definitions
9+
710
## [1.1.0](https://github.com/ajgarlag/psr-http-message-bundle/compare/1.0.1...1.1.0) - 2021-02-04
811

912
### Changed

src/DependencyInjection/AjgarlagPsrHttpMessageExtension.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Psr\Http\Message\UploadedFileFactoryInterface;
2121
use Sensio\Bundle\FrameworkExtraBundle\DependencyInjection\Configuration as SensioFrameworkExtraConfiguration;
2222
use Symfony\Component\Config\FileLocator;
23+
use Symfony\Component\DependencyInjection\Compiler\AliasDeprecatedPublicServicesPass;
2324
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
2425
use Symfony\Component\DependencyInjection\ContainerBuilder;
2526
use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -58,7 +59,11 @@ public function load(array $configs, ContainerBuilder $container)
5859
$loader->load('psr7.xml');
5960

6061
if ($config['alias_sensio_framework_extra_services']['enabled']) {
61-
$loader->load('alias_sensio_framework_extra.xml');
62+
if (!class_exists(AliasDeprecatedPublicServicesPass::class)) {
63+
$loader->load('alias_sensio_framework_extra_legacy.xml');
64+
} else {
65+
$loader->load('alias_sensio_framework_extra.xml');
66+
}
6267
}
6368
}
6469

src/Resources/config/alias_sensio_framework_extra.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
<services>
88
<service id="sensio_framework_extra.psr7.http_message_factory" alias="ajgarlag_psr_http_message.psr7.http_message_factory">
9-
<deprecated>The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.http_message_factory" instead.</deprecated>
9+
<deprecated package="ajgarlag/psr-http-message-bundle" version="1.1">The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.http_message_factory" instead.</deprecated>
1010
</service>
1111
<service id="sensio_framework_extra.psr7.http_foundation_factory" alias="ajgarlag_psr_http_message.psr7.http_foundation_factory">
12-
<deprecated>The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.http_foundation_factory" instead.</deprecated>
12+
<deprecated package="ajgarlag/psr-http-message-bundle" version="1.1">The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.http_foundation_factory" instead.</deprecated>
1313
</service>
1414
<service id="sensio_framework_extra.psr7.argument_value_resolver.server_request" alias="ajgarlag_psr_http_message.psr7.argument_value_resolver.server_request">
15-
<deprecated>The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.argument_value_resolver.server_request" instead.</deprecated>
15+
<deprecated package="ajgarlag/psr-http-message-bundle" version="1.1">The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.argument_value_resolver.server_request" instead.</deprecated>
1616
</service>
1717
<service id="sensio_framework_extra.psr7.listener.response" alias="ajgarlag_psr_http_message.psr7.listener.response">
18-
<deprecated>The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.listener.response" instead.</deprecated>
18+
<deprecated package="ajgarlag/psr-http-message-bundle" version="1.1">The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.listener.response" instead.</deprecated>
1919
</service>
2020
</services>
2121
</container>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
6+
7+
<services>
8+
<service id="sensio_framework_extra.psr7.http_message_factory" alias="ajgarlag_psr_http_message.psr7.http_message_factory">
9+
<deprecated>The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.http_message_factory" instead.</deprecated>
10+
</service>
11+
<service id="sensio_framework_extra.psr7.http_foundation_factory" alias="ajgarlag_psr_http_message.psr7.http_foundation_factory">
12+
<deprecated>The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.http_foundation_factory" instead.</deprecated>
13+
</service>
14+
<service id="sensio_framework_extra.psr7.argument_value_resolver.server_request" alias="ajgarlag_psr_http_message.psr7.argument_value_resolver.server_request">
15+
<deprecated>The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.argument_value_resolver.server_request" instead.</deprecated>
16+
</service>
17+
<service id="sensio_framework_extra.psr7.listener.response" alias="ajgarlag_psr_http_message.psr7.listener.response">
18+
<deprecated>The "%alias_id%" service alias is deprecated. Use "ajgarlag_psr_http_message.psr7.listener.response" instead.</deprecated>
19+
</service>
20+
</services>
21+
</container>

0 commit comments

Comments
 (0)