Add types to private and internal properties

Author: nicolas-grekas

Internal/PushedResponse.php

@@ -22,20 +22,11 @@
  */
 final class PushedResponse
 {
-    public CurlResponse $response;
-
-    /** @var string[] */
-    public array $requestHeaders;
-
-    public array $parentOptions = [];
-
-    public $handle;
-
-    public function __construct(CurlResponse $response, array $requestHeaders, array $parentOptions, $handle)
-    {
-        $this->response = $response;
-        $this->requestHeaders = $requestHeaders;
-        $this->parentOptions = $parentOptions;
-        $this->handle = $handle;
+    public function __construct(
+        public CurlResponse $response,
+        public array $requestHeaders,
+        public array $parentOptions,
+        public \CurlHandle $handle,
+    ) {
     }
 }

Response/AsyncResponse.php

@@ -38,8 +38,8 @@ class AsyncResponse implements ResponseInterface, StreamableInterface
     private ResponseInterface $response;
     private array $info = ['canceled' => false];
     private $passthru;
-    private $stream;
-    private $yieldedState;
+    private ?\Iterator $stream = null;
+    private ?int $yieldedState = null;
 
     /**
      * @param ?callable(ChunkInterface, AsyncContext): ?\Iterator $passthru

Response/CurlResponse.php

@@ -242,7 +242,7 @@ public function __destruct()
 
             $this->doDestruct();
         } finally {
-            if (\is_resource($this->handle) || $this->handle instanceof \CurlHandle) {
+            if ($this->handle instanceof \CurlHandle) {
                 curl_setopt($this->handle, \CURLOPT_VERBOSE, false);
             }
         }

Response/StreamWrapper.php

@@ -30,7 +30,7 @@ class StreamWrapper
     private ResponseInterface $response;
 
     /** @var resource|string|null */
-    private $content;
+    private $content = null;
 
     /** @var resource|callable|null */
     private $handle;

RetryableHttpClient.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\HttpClient;
 
 use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
 use Symfony\Component\HttpClient\Response\AsyncContext;
 use Symfony\Component\HttpClient\Response\AsyncResponse;
 use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
@@ -34,7 +33,7 @@ class RetryableHttpClient implements HttpClientInterface, ResetInterface
 
     private RetryStrategyInterface $strategy;
     private int $maxRetries;
-    private LoggerInterface $logger;
+    private ?LoggerInterface $logger;
     private array $baseUris = [];
 
     /**
@@ -45,7 +44,7 @@ public function __construct(HttpClientInterface $client, RetryStrategyInterface
         $this->client = $client;
         $this->strategy = $strategy ?? new GenericRetryStrategy();
         $this->maxRetries = $maxRetries;
-        $this->logger = $logger ?? new NullLogger();
+        $this->logger = $logger;
     }
 
     public function withOptions(array $options): static
@@ -149,7 +148,7 @@ public function request(string $method, string $url, array $options = []): Respo
             $content = '';
             $firstChunk = null;
 
-            $this->logger->info('Try #{count} after {delay}ms'.($exception ? ': '.$exception->getMessage() : ', status code: '.$context->getStatusCode()), [
+            $this->logger?->info('Try #{count} after {delay}ms'.($exception ? ': '.$exception->getMessage() : ', status code: '.$context->getStatusCode()), [
                 'count' => $retryCount,
                 'delay' => $delay,
             ]);