Skip to content

Commit 23ac93a

Browse files
committed
split deprecation for different symfony versions
1 parent 8c7af0a commit 23ac93a

File tree

4 files changed

+29
-3
lines changed

4 files changed

+29
-3
lines changed

src/DependencyInjection/HttplugExtension.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
3333
use Symfony\Component\DependencyInjection\Reference;
3434
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
35+
use Symfony\Component\HttpKernel\Kernel;
3536
use Twig\Environment as TwigEnvironment;
3637

3738
/**
@@ -60,6 +61,12 @@ public function load(array $configs, ContainerBuilder $container)
6061
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
6162

6263
$loader->load('services.xml');
64+
// TODO: Move this back into services.xml when we drop support for Symfony 4, or completely remove the service in the next major version.
65+
if (Kernel::MAJOR_VERSION >= 5) {
66+
$loader->load('services_legacy.xml');
67+
} else {
68+
$loader->load('services_legacy_sf4.xml');
69+
}
6370
$loader->load('plugins.xml');
6471
if (\class_exists(MockClient::class)) {
6572
$loader->load('mock-client.xml');

src/Resources/config/services.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
<service id="httplug.client.default" class="Http\Client\HttpClient">
4848
<factory class="Http\Discovery\HttpClientDiscovery" method="find" />
4949
</service>
50-
<service id="Http\Client\HttpClient" alias="httplug.client" public="false">
51-
<deprecated package="php-http/httplug-bundle" version="1.28" />
52-
</service>
5350
<service id="Psr\Http\Client\ClientInterface" alias="httplug.client" public="false" />
5451

5552
<!-- Discovery for PSR-18 -->
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
5+
6+
<services>
7+
<service id="Http\Client\HttpClient" alias="httplug.client" public="false">
8+
<deprecated package="php-http/httplug-bundle" version="1.28">The "%service_id%" service is deprecated in favor of using PSR-7 Psr\Http\Client\ClientInterface</deprecated>
9+
</service>
10+
</services>
11+
</container>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
5+
6+
<services>
7+
<service id="Http\Client\HttpClient" alias="httplug.client" public="false">
8+
<deprecated>The "%service_id%" service is deprecated in favor of using PSR-7 Psr\Http\Client\ClientInterface</deprecated>
9+
</service>
10+
</services>
11+
</container>

0 commit comments

Comments
 (0)