Review feedback

simonberger · simonberger · commit bec8ee7dddd7 · 2023-03-15T17:37:11.000+01:00
diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
@@ -56,11 +56,7 @@ FrameworkBundle
 ---------------
 
  * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
-
-HttpClient
-----------
-
-* Deprecate the `Http\Client\HttpClient` service, use the `Http\Client\HttpAsyncClient` service for method `::sendAsyncRequest` and `psr\Http\Client\ClientInterface` for `::sendRequest` instead
+ * Deprecate the `Http\Client\HttpClient` service, use `Psr\Http\Client\ClientInterface` instead
 
 HttpFoundation
 --------------
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -18,6 +18,8 @@ CHANGELOG
  * Add `framework.http_cache.skip_response_headers` option
  * Display warmers duration on debug verbosity for `cache:clear` command
  * Add `AbstractController::sendEarlyHints()` to send HTTP Early Hints
+ * Add services `httplug.http_client` and `Http\Client\HttpAsyncClient` for `Symfony\Component\HttpClient\HttplugClient` and alias all configured `scoped_clients` by interface `Http\Client\HttpAsyncClient`
+ * Deprecate the `Http\Client\HttpClient` service, use `Psr\Http\Client\ClientInterface` instead
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2356,7 +2356,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
         }
 
         if (!$hasHttplug = ContainerBuilder::willBeAvailable('php-http/httplug', HttpAsyncClient::class, ['symfony/framework-bundle', 'symfony/http-client'])) {
-            $container->removeDefinition(HttpAsyncClient::class);
+            $container->removeDefinition('httplug.http_client');
+            $container->removeAlias(HttpAsyncClient::class);
             $container->removeAlias(HttpClient::class);
         }
 
@@ -2429,7 +2430,7 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             }
 
             if ($hasHttplug) {
-                $container->setDefinition('httplug.'.$name, new ChildDefinition(HttpAsyncClient::class))
+                $container->setDefinition('httplug.'.$name, new ChildDefinition('httplug.http_client'))
                     ->replaceArgument(0, new Reference($name));
 
                 $container->registerAliasForArgument('httplug.'.$name, HttpAsyncClient::class, $name);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/http_client.php
@@ -50,19 +50,16 @@
 
         ->alias(ClientInterface::class, 'psr18.http_client')
 
-        ->set(HttpAsyncClient::class, HttplugClient::class)
+        ->set('httplug.http_client', HttplugClient::class)
             ->args([
                 service('http_client'),
                 service(ResponseFactoryInterface::class)->ignoreOnInvalid(),
                 service(StreamFactoryInterface::class)->ignoreOnInvalid(),
             ])
 
-        ->alias(\Http\Client\HttpClient::class, HttpAsyncClient::class)
-            ->deprecate(
-                'symfony/http-client',
-                '6.3',
-                'The "%alias_id%" service is deprecated, use the "'.HttpAsyncClient::class.'" service for method "::sendAsyncRequest" and "'.ClientInterface::class.'" for "::sendRequest" instead',
-            )
+        ->alias(HttpAsyncClient::class, 'httplug.http_client')
+        ->alias(\Http\Client\HttpClient::class, 'httplug.http_client')
+            ->deprecate('symfony/framework-bundle', '6.3', 'The "%alias_id%" service is deprecated, use the "'.ClientInterface::class.'" instead.',)
 
         ->set('http_client.abstract_retry_strategy', GenericRetryStrategy::class)
             ->abstract()

Original file line number	Diff line number	Diff line change
`@@ -2356,7 +2356,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder`
`2356`	`2356`	`}`
`2357`	`2357`
`2358`	`2358`	`if (!$hasHttplug = ContainerBuilder::willBeAvailable('php-http/httplug', HttpAsyncClient::class, ['symfony/framework-bundle', 'symfony/http-client'])) {`
`2359`		`- $container->removeDefinition(HttpAsyncClient::class);`
	`2359`	`+ $container->removeDefinition('httplug.http_client');`
	`2360`	`+ $container->removeAlias(HttpAsyncClient::class);`
`2360`	`2361`	`$container->removeAlias(HttpClient::class);`
`2361`	`2362`	`}`
`2362`	`2363`
`@@ -2429,7 +2430,7 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder`
`2429`	`2430`	`}`
`2430`	`2431`
`2431`	`2432`	`if ($hasHttplug) {`
`2432`		`- $container->setDefinition('httplug.'.$name, new ChildDefinition(HttpAsyncClient::class))`
	`2433`	`+ $container->setDefinition('httplug.'.$name, new ChildDefinition('httplug.http_client'))`
`2433`	`2434`	`->replaceArgument(0, new Reference($name));`
`2434`	`2435`
`2435`	`2436`	`$container->registerAliasForArgument('httplug.'.$name, HttpAsyncClient::class, $name);`