Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 88666b54d6fe · 2021-09-07T12:48:39.000+02:00
* 5.4:
  [HttpClient] fix test
diff --git a/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php b/src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\HttpClient\Tests;
 
 use Symfony\Component\HttpClient\AsyncDecoratorTrait;
-use Symfony\Component\HttpClient\CurlHttpClient;
 use Symfony\Component\HttpClient\DecoratorTrait;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpClient\Response\AsyncContext;
@@ -32,7 +31,7 @@ protected function getHttpClient(string $testCase, \Closure $chunkFilter = null,
         }
 
         if ('testTimeoutOnDestruct' === $testCase) {
-            return new CurlHttpClient();
+            return HttpClient::create();
         }
 
         $chunkFilter = $chunkFilter ?? static function (ChunkInterface $chunk, AsyncContext $context) { yield $chunk; };
@@ -58,10 +57,10 @@ public function request(string $method, string $url, array $options = []): Respo
     public function testTimeoutOnDestruct()
     {
         if (HttpClient::create() instanceof NativeHttpClient) {
-            parent::testTimeoutOnDestruct();
-        } else {
-            HttpClientTestCase::testTimeoutOnDestruct();
+            $this->markTestSkipped('NativeHttpClient doesn\'t support opening concurrent requests.');
         }
+
+        HttpClientTestCase::testTimeoutOnDestruct();
     }
 
     public function testRetry404()
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php
@@ -29,7 +29,7 @@ class LocaleAwareListener implements EventSubscriberInterface
     private $requestStack;
 
     /**
-     * @param LocaleAwareInterface[] $localeAwareServices
+     * @param iterable<mixed, LocaleAwareInterface> $localeAwareServices
      */
     public function __construct(iterable $localeAwareServices, RequestStack $requestStack)
     {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\HttpClient\Tests;`
`13`	`13`
`14`	`14`	`use Symfony\Component\HttpClient\AsyncDecoratorTrait;`
`15`		`-use Symfony\Component\HttpClient\CurlHttpClient;`
`16`	`15`	`use Symfony\Component\HttpClient\DecoratorTrait;`
`17`	`16`	`use Symfony\Component\HttpClient\HttpClient;`
`18`	`17`	`use Symfony\Component\HttpClient\Response\AsyncContext;`
`@@ -32,7 +31,7 @@ protected function getHttpClient(string $testCase, \Closure $chunkFilter = null,`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`if ('testTimeoutOnDestruct' === $testCase) {`
`35`		`- return new CurlHttpClient();`
	`34`	`+ return HttpClient::create();`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`$chunkFilter = $chunkFilter ?? static function (ChunkInterface $chunk, AsyncContext $context) { yield $chunk; };`
`@@ -58,10 +57,10 @@ public function request(string $method, string $url, array $options = []): Respo`
`58`	`57`	`public function testTimeoutOnDestruct()`
`59`	`58`	`{`
`60`	`59`	`if (HttpClient::create() instanceof NativeHttpClient) {`
`61`		`- parent::testTimeoutOnDestruct();`
`62`		`- } else {`
`63`		`- HttpClientTestCase::testTimeoutOnDestruct();`
	`60`	`+ $this->markTestSkipped('NativeHttpClient doesn\'t support opening concurrent requests.');`
`64`	`61`	`}`
	`62`	`+`
	`63`	`+ HttpClientTestCase::testTimeoutOnDestruct();`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`public function testRetry404()`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class LocaleAwareListener implements EventSubscriberInterface`
`29`	`29`	`private $requestStack;`
`30`	`30`
`31`	`31`	`/**`
`32`		`- * @param LocaleAwareInterface[] $localeAwareServices`
	`32`	`+ * @param iterable<mixed, LocaleAwareInterface> $localeAwareServices`
`33`	`33`	`*/`
`34`	`34`	`public function __construct(iterable $localeAwareServices, RequestStack $requestStack)`
`35`	`35`	`{`