diff --git a/CHANGELOG.md b/CHANGELOG.md index cb493b6c..0d7bda91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. +# unreleased + +- Deprecated `Http\Client\HttpClient` in favor of `Psr\Http\Client\ClientInterface` (#425). +- Added alias to autowire `Psr\Http\Client\ClientInterface` service (#425). + # 1.27.1 - 2023-03-03 - Added `: void` to `Collector::reset` to avoid PHP warning. diff --git a/src/DependencyInjection/HttplugExtension.php b/src/DependencyInjection/HttplugExtension.php index c2b5218c..4b9e2668 100644 --- a/src/DependencyInjection/HttplugExtension.php +++ b/src/DependencyInjection/HttplugExtension.php @@ -32,6 +32,7 @@ use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\HttpKernel\Kernel; use Twig\Environment as TwigEnvironment; /** @@ -60,6 +61,12 @@ public function load(array $configs, ContainerBuilder $container) $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.xml'); + // TODO: Move this back into services.xml when we drop support for Symfony 4, or completely remove the service in the next major version. + if (Kernel::MAJOR_VERSION >= 5) { + $loader->load('services_legacy.xml'); + } else { + $loader->load('services_legacy_sf4.xml'); + } $loader->load('plugins.xml'); if (\class_exists(MockClient::class)) { $loader->load('mock-client.xml'); diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml index a839d134..c8e9ed04 100644 --- a/src/Resources/config/services.xml +++ b/src/Resources/config/services.xml @@ -47,7 +47,7 @@ - + diff --git a/src/Resources/config/services_legacy.xml b/src/Resources/config/services_legacy.xml new file mode 100644 index 00000000..b92221aa --- /dev/null +++ b/src/Resources/config/services_legacy.xml @@ -0,0 +1,11 @@ + + + + + + The "%alias_id%" service is deprecated in favor of using PSR-7 Psr\Http\Client\ClientInterface + + + diff --git a/src/Resources/config/services_legacy_sf4.xml b/src/Resources/config/services_legacy_sf4.xml new file mode 100644 index 00000000..357c50c8 --- /dev/null +++ b/src/Resources/config/services_legacy_sf4.xml @@ -0,0 +1,11 @@ + + + + + + The "%alias_id%" service is deprecated in favor of using PSR-7 Psr\Http\Client\ClientInterface + + +