[HttpClient] Add types to private properties

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

AmpHttpClient.php

@@ -42,10 +42,8 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface,
     use HttpClientTrait;
     use LoggerAwareTrait;
 
-    private $defaultOptions = self::OPTIONS_DEFAULTS;
-
-    /** @var AmpClientState */
-    private $multi;
+    private array $defaultOptions = self::OPTIONS_DEFAULTS;
+    private AmpClientState $multi;
 
     /**
      * @param array    $defaultOptions     Default requests' options

CachingHttpClient.php

@@ -34,9 +34,9 @@ class CachingHttpClient implements HttpClientInterface
 {
     use HttpClientTrait;
 
-    private $client;
-    private $cache;
-    private $defaultOptions = self::OPTIONS_DEFAULTS;
+    private HttpClientInterface $client;
+    private HttpCache $cache;
+    private array $defaultOptions = self::OPTIONS_DEFAULTS;
 
     public function __construct(HttpClientInterface $client, StoreInterface $store, array $defaultOptions = [])
     {

Chunk/DataChunk.php

@@ -20,8 +20,8 @@
  */
 class DataChunk implements ChunkInterface
 {
-    private $offset = 0;
-    private $content = '';
+    private int $offset = 0;
+    private string $content = '';
 
     public function __construct(int $offset = 0, string $content = '')
     {

Chunk/ErrorChunk.php

@@ -22,10 +22,10 @@
  */
 class ErrorChunk implements ChunkInterface
 {
-    private $didThrow = false;
-    private $offset;
-    private $errorMessage;
-    private $error;
+    private bool $didThrow = false;
+    private int $offset;
+    private string $errorMessage;
+    private ?\Throwable $error = null;
 
     public function __construct(int $offset, \Throwable|string $error)
     {

Chunk/InformationalChunk.php

@@ -18,7 +18,7 @@
  */
 class InformationalChunk extends DataChunk
 {
-    private $status;
+    private array $status;
 
     public function __construct(int $statusCode, array $headers)
     {

Chunk/ServerSentEvent.php

@@ -19,10 +19,10 @@
  */
 final class ServerSentEvent extends DataChunk implements ChunkInterface
 {
-    private $data = '';
-    private $id = '';
-    private $type = 'message';
-    private $retry = 0;
+    private string $data = '';
+    private string $id = '';
+    private string $type = 'message';
+    private float $retry = 0;
 
     public function __construct(string $content)
     {

CurlHttpClient.php

@@ -37,7 +37,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
     use HttpClientTrait;
     use LoggerAwareTrait;
 
-    private $defaultOptions = self::OPTIONS_DEFAULTS + [
+    private array $defaultOptions = self::OPTIONS_DEFAULTS + [
         'auth_ntlm' => null, // array|string - an array containing the username as first value, and optionally the
                              //   password as the second one; or string like username:password - enabling NTLM auth
         'extra' => [
@@ -47,12 +47,10 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
 
     /**
      * An internal object to share state between the client and its responses.
-     *
-     * @var CurlClientState
      */
-    private $multi;
+    private CurlClientState $multi;
 
-    private static $curlVersion;
+    private static array $curlVersion;
 
     /**
      * @param array $defaultOptions     Default request's options

DataCollector/HttpClientDataCollector.php

@@ -26,7 +26,7 @@ final class HttpClientDataCollector extends DataCollector implements LateDataCol
     /**
      * @var TraceableHttpClient[]
      */
-    private $clients = [];
+    private array $clients = [];
 
     public function registerClient(string $name, TraceableHttpClient $client)
     {

DecoratorTrait.php

@@ -22,7 +22,7 @@
  */
 trait DecoratorTrait
 {
-    private $client;
+    private HttpClientInterface $client;
 
     public function __construct(HttpClientInterface $client = null)
     {

EventSourceHttpClient.php

@@ -30,7 +30,7 @@ final class EventSourceHttpClient implements HttpClientInterface
         AsyncDecoratorTrait::withOptions insteadof HttpClientTrait;
     }
 
-    private $reconnectionTime;
+    private float $reconnectionTime;
 
     public function __construct(HttpClientInterface $client = null, float $reconnectionTime = 10.0)
     {
@@ -52,10 +52,10 @@ public function connect(string $url, array $options = []): ResponseInterface
     public function request(string $method, string $url, array $options = []): ResponseInterface
     {
         $state = new class() {
-            public $buffer = null;
-            public $lastEventId = null;
-            public $reconnectionTime;
-            public $lastError = null;
+            public ?string $buffer = null;
+            public ?string $lastEventId = null;
+            public float $reconnectionTime;
+            public ?float $lastError = null;
         };
         $state->reconnectionTime = $this->reconnectionTime;