[HttpClient] fix tests and merge

Author: nicolas-grekas

src/Symfony/Component/HttpClient/Response/AmpResponse.php

@@ -28,6 +28,7 @@
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\HttpClientTrait;
 use Symfony\Component\HttpClient\Internal\AmpBody;
+use Symfony\Component\HttpClient\Internal\AmpCanary;
 use Symfony\Component\HttpClient\Internal\AmpClientState;
 use Symfony\Component\HttpClient\Internal\ClientState;
 use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -141,13 +142,17 @@ public function __destruct()
         try {
             $this->doDestruct();
         } finally {
+            $multi = clone $this->multi;
+
             $this->close();
 
             // Clear the DNS cache when all requests completed
             if (0 >= --$this->multi->responseCount) {
                 $this->multi->responseCount = 0;
                 $this->multi->dnsCache = [];
             }
+
+            $this->multi = $multi;
         }
     }
 
@@ -222,11 +227,9 @@ private static function select(ClientState $multi, float $timeout): int
 
     private static function generateResponse(Request $request, AmpClientState $multi, string $id, array &$info, array &$headers, CancellationTokenSource $canceller, array &$options, \Closure $onProgress, &$handle, ?LoggerInterface $logger, Promise &$pause)
     {
-        $activity = &$multi->handlesActivity;
-
-        $request->setInformationalResponseHandler(static function (Response $response) use (&$activity, $id, &$info, &$headers) {
+        $request->setInformationalResponseHandler(static function (Response $response) use ($multi, $id, &$info, &$headers) {
             self::addResponseHeaders($response, $info, $headers);
-            $activity[$id][] = new InformationalChunk($response->getStatus(), $response->getHeaders());
+            $multi->handlesActivity[$id][] = new InformationalChunk($response->getStatus(), $response->getHeaders());
             self::stopLoop();
         });
 
@@ -240,11 +243,11 @@ private static function generateResponse(Request $request, AmpClientState $multi
 
             $options = null;
 
-            $activity[$id][] = new FirstChunk();
+            $multi->handlesActivity[$id][] = new FirstChunk();
 
             if ('HEAD' === $response->getRequest()->getMethod() || \in_array($info['http_code'], [204, 304], true)) {
-                $activity[$id][] = null;
-                $activity[$id][] = null;
+                $multi->handlesActivity[$id][] = null;
+                $multi->handlesActivity[$id][] = null;
                 self::stopLoop();
 
                 return;
@@ -266,14 +269,14 @@ private static function generateResponse(Request $request, AmpClientState $multi
                 }
 
                 $info['size_download'] += \strlen($data);
-                $activity[$id][] = $data;
+                $multi->handlesActivity[$id][] = $data;
             }
 
-            $activity[$id][] = null;
-            $activity[$id][] = null;
+            $multi->handlesActivity[$id][] = null;
+            $multi->handlesActivity[$id][] = null;
         } catch (\Throwable $e) {
-            $activity[$id][] = null;
-            $activity[$id][] = $e;
+            $multi->handlesActivity[$id][] = null;
+            $multi->handlesActivity[$id][] = $e;
         } finally {
             $info['download_content_length'] = $info['size_download'];
         }

src/Symfony/Component/HttpClient/Response/AsyncResponse.php

@@ -66,9 +66,9 @@ public function __construct(HttpClientInterface $client, string $method, string
                         return false;
                     }
                 }
-            }
 
-            return false;
+                return false;
+            }
         };
         if (\array_key_exists('user_data', $options)) {
             $this->info['user_data'] = $options['user_data'];
@@ -175,7 +175,6 @@ public function __destruct()
 
         if ($this->passthru && null === $this->getInfo('error')) {
             $this->info['canceled'] = true;
-            $this->info['error'] = 'Response has been canceled.';
 
             try {
                 foreach (self::passthru($this->client, $this, new LastChunk()) as $chunk) {

src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php

@@ -24,6 +24,10 @@ class AsyncDecoratorTraitTest extends NativeHttpClientTest
 {
     protected function getHttpClient(string $testCase, \Closure $chunkFilter = null): HttpClientInterface
     {
+        if ('testHandleIsRemovedOnException' === $testCase) {
+            $this->markTestSkipped("AsyncDecoratorTrait doesn't cache handles");
+        }
+
         $chunkFilter = $chunkFilter ?? static function (ChunkInterface $chunk, AsyncContext $context) { yield $chunk; };
 
         return new class(parent::getHttpClient($testCase), $chunkFilter) implements HttpClientInterface {
@@ -227,7 +231,7 @@ public function testRetryTimeout()
                 } else {
                     $context->passthru();
                     $context->getResponse()->cancel();
-                    $context->replaceRequest('GET', 'http://localhost:8057/timeout-header', ['timeout' => 1]);
+                    $context->replaceRequest('GET', 'http://localhost:8057/timeout-header', ['timeout' => 10]);
                 }
             }
         });