-

Author: nicolas-grekas

src/Symfony/Component/HttpClient/Internal/AmpClientState.php

@@ -54,7 +54,7 @@ public function __construct(
         private int $maxPendingPushes,
         private ?LoggerInterface &$logger,
     ) {
-        $clientConfigurator ??= static fn (PooledHttpClient $client) => new InterceptedHttpClient($client, new RetryRequests(2));
+        $clientConfigurator ??= static fn (PooledHttpClient $client) => new InterceptedHttpClient($client, new RetryRequests(2), []);
         $this->clientConfigurator = $clientConfigurator(...);
     }
 
@@ -130,7 +130,7 @@ private function getClient(array $options): array
         $options['crypto_method'] && $context = $context->withMinimumVersion($options['crypto_method']);
 
         $connector = $handleConnector = new class() implements SocketConnector {
-            public DnsConnector $connector;
+            public DnsSocketConnector $connector;
             public string $uri;
             /** @var resource|null */
             public $handle;

src/Symfony/Component/HttpClient/Internal/AmpListener.php

@@ -11,11 +11,13 @@
 
 namespace Symfony\Component\HttpClient\Internal;
 
+use Amp\Http\Client\ApplicationInterceptor;
+use Amp\Http\Client\Connection\Connection;
 use Amp\Http\Client\Connection\Stream;
 use Amp\Http\Client\EventListener;
+use Amp\Http\Client\NetworkInterceptor;
 use Amp\Http\Client\Request;
-use Amp\Promise;
-use Amp\Success;
+use Amp\Http\Client\Response;
 use Symfony\Component\HttpClient\Exception\TransportException;
 
 /**
@@ -49,30 +51,29 @@ public function __construct(
         $this->info = &$info;
     }
 
-    public function startRequest(Request $request): void
+    public function completeDnsResolution(Request $request): void
     {
-        $this->info['start_time'] ??= microtime(true);
+        $this->info['namelookup_time'] = microtime(true) - $this->info['start_time'];
         ($this->onProgress)();
     }
 
-    public function startDnsResolution(Request $request): void
-    {
-        ($this->onProgress)();
-    }
+    //XXX
 
-    public function startConnectionCreation(Request $request): void
+    public function requestStart(Request $request): void
     {
+        $this->info['start_time'] ??= microtime(true);
         ($this->onProgress)();
     }
 
-    public function startTlsNegotiation(Request $request): void
+    public function connectionAcquired(Request $request, Connection $connection, int $streamCount): void
     {
+        $this->info['connect_time'] = microtime(true) - $this->info['start_time'];
         ($this->onProgress)();
     }
 
-    public function startSendingRequest(Request $request, Stream $stream): void
+    public function requestHeaderStart(Request $request, Stream $stream): void
     {
-        $host = $stream->getRemoteAddress()->getAddress();
+        $host = $stream->getRemoteAddress()->toString();
 
         if (str_contains($host, ':')) {
             $host = '['.$host.']';
@@ -121,41 +122,82 @@ public function startSendingRequest(Request $request, Stream $stream): void
         $this->info['debug'] .= "\r\n";
     }
 
-    public function completeSendingRequest(Request $request, Stream $stream): void
+    public function requestBodyEnd(Request $request, Stream $stream): void
+    {
+    }
+
+    public function responseHeaderStart(Request $request, Stream $stream): void
+    {
+    }
+
+    public function requestEnd(Request $request, Response $response): void
+    {
+    }
+
+    public function requestFailed(Request $request, \Throwable $exception): void
     {
+        $this->handle = null;
         ($this->onProgress)();
     }
 
-    public function startReceivingResponse(Request $request, Stream $stream): void
+    public function requestHeaderEnd(Request $request, Stream $stream): void
     {
-        $this->info['starttransfer_time'] = microtime(true) - $this->info['start_time'];
         ($this->onProgress)();
     }
 
-    public function completeReceivingResponse(Request $request, Stream $stream): void
+    public function requestBodyStart(Request $request, Stream $stream): void
+    {
+    }
+
+    public function requestBodyProgress(Request $request, Stream $stream): void
     {
-        $this->handle = null;
         ($this->onProgress)();
     }
 
-    public function completeDnsResolution(Request $request): void
+    public function responseHeaderEnd(Request $request, Stream $stream, Response $response): void
     {
-        $this->info['namelookup_time'] = microtime(true) - $this->info['start_time'];
+    }
+
+    public function responseBodyStart(Request $request, Stream $stream, Response $response): void
+    {
+        $this->info['starttransfer_time'] = microtime(true) - $this->info['start_time'];
         ($this->onProgress)();
     }
 
-    public function completeConnectionCreation(Request $request): void
+    public function responseBodyProgress(Request $request, Stream $stream, Response $response): void
     {
-        $this->info['connect_time'] = microtime(true) - $this->info['start_time'];
         ($this->onProgress)();
     }
 
-    public function completeTlsNegotiation(Request $request): void
+    public function responseBodyEnd(Request $request, Stream $stream, Response $response): void
     {
+        $this->handle = null;
         ($this->onProgress)();
     }
 
-    public function abort(Request $request, \Throwable $cause): void
+    public function applicationInterceptorStart(Request $request, ApplicationInterceptor $interceptor): void
+    {
+    }
+
+    public function applicationInterceptorEnd(Request $request, ApplicationInterceptor $interceptor, Response $response): void
+    {
+    }
+
+    public function networkInterceptorStart(Request $request, NetworkInterceptor $interceptor): void
+    {
+    }
+
+    public function networkInterceptorEnd(Request $request, NetworkInterceptor $interceptor, Response $response): void
+    {
+    }
+
+    public function push(Request $request): void
+    {
+    }
+
+    public function requestRejected(Request $request): void
     {
+        $this->handle = null;
+        ($this->onProgress)();
     }
 }

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

@@ -135,7 +135,7 @@ public function __wakeup(): void
     public function __destruct()
     {
         try {
-            //$this->doDestruct();
+            $this->doDestruct();
         } finally {
             // Clear the DNS cache when all requests completed
             if (0 >= --$this->multi->responseCount) {