Remove FQCN type hints on properties

fabpot · fabpot · commit 99e42b54cedf · 2021-12-08T16:13:44.000+01:00
diff --git a/AmpHttpClient.php b/AmpHttpClient.php
@@ -43,7 +43,7 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface,
     use LoggerAwareTrait;
 
     private array $defaultOptions = self::OPTIONS_DEFAULTS;
-    private AmpClientState $multi;
+    private $multi;
 
     /**
      * @param array    $defaultOptions     Default requests' options
diff --git a/CachingHttpClient.php b/CachingHttpClient.php
@@ -35,8 +35,8 @@ class CachingHttpClient implements HttpClientInterface, ResetInterface
 {
     use HttpClientTrait;
 
-    private HttpClientInterface $client;
-    private HttpCache $cache;
+    private $client;
+    private $cache;
     private array $defaultOptions = self::OPTIONS_DEFAULTS;
 
     public function __construct(HttpClientInterface $client, StoreInterface $store, array $defaultOptions = [])
diff --git a/CurlHttpClient.php b/CurlHttpClient.php
@@ -48,7 +48,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
     /**
      * An internal object to share state between the client and its responses.
      */
-    private CurlClientState $multi;
+    private $multi;
 
     private static array $curlVersion;
 
diff --git a/DecoratorTrait.php b/DecoratorTrait.php
@@ -23,7 +23,7 @@
  */
 trait DecoratorTrait
 {
-    private HttpClientInterface $client;
+    private $client;
 
     public function __construct(HttpClientInterface $client = null)
     {
diff --git a/Exception/HttpExceptionTrait.php b/Exception/HttpExceptionTrait.php
@@ -20,7 +20,7 @@
  */
 trait HttpExceptionTrait
 {
-    private ResponseInterface $response;
+    private $response;
 
     public function __construct(ResponseInterface $response)
     {
diff --git a/HttplugClient.php b/HttplugClient.php
@@ -58,16 +58,16 @@
  */
 final class HttplugClient implements HttplugInterface, HttpAsyncClient, RequestFactory, StreamFactory, UriFactory, ResetInterface
 {
-    private HttpClientInterface $client;
-    private ResponseFactoryInterface $responseFactory;
-    private StreamFactoryInterface $streamFactory;
+    private $client;
+    private $responseFactory;
+    private $streamFactory;
 
     /**
      * @var \SplObjectStorage<ResponseInterface, array{RequestInterface, Promise}>|null
      */
     private ?\SplObjectStorage $promisePool;
 
-    private HttplugWaitLoop $waitLoop;
+    private $waitLoop;
 
     public function __construct(HttpClientInterface $client = null, ResponseFactoryInterface $responseFactory = null, StreamFactoryInterface $streamFactory = null)
     {
diff --git a/Internal/AmpBody.php b/Internal/AmpBody.php
@@ -25,7 +25,7 @@
  */
 class AmpBody implements RequestBody, InputStream
 {
-    private ResourceInputStream|\Closure|string $body;
+    private $body;
     private array $info;
     private \Closure $onProgress;
     private ?int $offset = 0;
diff --git a/Internal/AmpClientState.php b/Internal/AmpClientState.php
@@ -49,7 +49,7 @@ final class AmpClientState extends ClientState
     private \Closure $clientConfigurator;
     private int $maxHostConnections;
     private int $maxPendingPushes;
-    private ?LoggerInterface $logger;
+    private $logger;
 
     public function __construct(?callable $clientConfigurator, int $maxHostConnections, int $maxPendingPushes, ?LoggerInterface &$logger)
     {
diff --git a/Internal/CurlClientState.php b/Internal/CurlClientState.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpClient\Internal;
 
-use Psr\Log\LoggerInterface;
 
 /**
  * Internal representation of the cURL client's state.
@@ -25,11 +24,11 @@ final class CurlClientState extends ClientState
     public \CurlMultiHandle $handle;
     /** @var PushedResponse[] */
     public array $pushedResponses = [];
-    public DnsCache $dnsCache;
+    public $dnsCache;
     /** @var float[] */
     public array $pauseExpiries = [];
     public int $execCounter = \PHP_INT_MIN;
-    public ?LoggerInterface $logger = null;
+    public $logger = null;
 
     public function __construct()
     {
diff --git a/Internal/HttplugWaitLoop.php b/Internal/HttplugWaitLoop.php
@@ -30,10 +30,10 @@
  */
 final class HttplugWaitLoop
 {
-    private HttpClientInterface $client;
+    private $client;
     private ?\SplObjectStorage $promisePool;
-    private ResponseFactoryInterface $responseFactory;
-    private StreamFactoryInterface $streamFactory;
+    private $responseFactory;
+    private $streamFactory;
 
     /**
      * @param \SplObjectStorage<ResponseInterface, array{Psr7RequestInterface, Promise}>|null $promisePool
diff --git a/Internal/PushedResponse.php b/Internal/PushedResponse.php
@@ -22,7 +22,7 @@
  */
 final class PushedResponse
 {
-    public CurlResponse $response;
+    public $response;
 
     /** @var string[] */
     public array $requestHeaders;
diff --git a/MockHttpClient.php b/MockHttpClient.php
@@ -28,7 +28,7 @@ class MockHttpClient implements HttpClientInterface, ResetInterface
 {
     use HttpClientTrait;
 
-    private ResponseInterface|\Closure|iterable|null $responseFactory;
+    private $responseFactory;
     private int $requestsCount = 0;
     private array $defaultOptions = [];
 
diff --git a/NativeHttpClient.php b/NativeHttpClient.php
@@ -37,7 +37,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac
     use LoggerAwareTrait;
 
     private array $defaultOptions = self::OPTIONS_DEFAULTS;
-    private NativeClientState $multi;
+    private $multi;
 
     /**
      * @param array $defaultOptions     Default request's options
diff --git a/NoPrivateNetworkHttpClient.php b/NoPrivateNetworkHttpClient.php
@@ -45,7 +45,7 @@ final class NoPrivateNetworkHttpClient implements HttpClientInterface, LoggerAwa
         '::/128',
     ];
 
-    private HttpClientInterface $client;
+    private $client;
     private string|array|null $subnets;
 
     /**
diff --git a/Psr18Client.php b/Psr18Client.php
@@ -52,9 +52,9 @@
  */
 final class Psr18Client implements ClientInterface, RequestFactoryInterface, StreamFactoryInterface, UriFactoryInterface, ResetInterface
 {
-    private HttpClientInterface $client;
-    private ResponseFactoryInterface $responseFactory;
-    private StreamFactoryInterface $streamFactory;
+    private $client;
+    private $responseFactory;
+    private $streamFactory;
 
     public function __construct(HttpClientInterface $client = null, ResponseFactoryInterface $responseFactory = null, StreamFactoryInterface $streamFactory = null)
     {
@@ -205,7 +205,7 @@ public function reset()
  */
 class Psr18NetworkException extends \RuntimeException implements NetworkExceptionInterface
 {
-    private RequestInterface $request;
+    private $request;
 
     public function __construct(TransportExceptionInterface $e, RequestInterface $request)
     {
@@ -224,7 +224,7 @@ public function getRequest(): RequestInterface
  */
 class Psr18RequestException extends \InvalidArgumentException implements RequestExceptionInterface
 {
-    private RequestInterface $request;
+    private $request;
 
     public function __construct(TransportExceptionInterface $e, RequestInterface $request)
     {
diff --git a/Response/AmpResponse.php b/Response/AmpResponse.php
@@ -45,9 +45,9 @@ final class AmpResponse implements ResponseInterface, StreamableInterface
 
     private static string $nextId = 'a';
 
-    private AmpClientState $multi;
+    private $multi;
     private ?array $options;
-    private CancellationTokenSource $canceller;
+    private $canceller;
     private \Closure $onProgress;
 
     private static ?string $delay = null;
diff --git a/Response/AsyncContext.php b/Response/AsyncContext.php
@@ -25,8 +25,8 @@
 final class AsyncContext
 {
     private $passthru;
-    private HttpClientInterface $client;
-    private ResponseInterface $response;
+    private $client;
+    private $response;
     private array $info = [];
     private $content;
     private int $offset;
diff --git a/Response/AsyncResponse.php b/Response/AsyncResponse.php
@@ -34,8 +34,8 @@ final class AsyncResponse implements ResponseInterface, StreamableInterface
     private const FIRST_CHUNK_YIELDED = 1;
     private const LAST_CHUNK_YIELDED = 2;
 
-    private ?HttpClientInterface $client;
-    private ResponseInterface $response;
+    private $client;
+    private $response;
     private array $info = ['canceled' => false];
     private $passthru;
     private $stream;
diff --git a/Response/CurlResponse.php b/Response/CurlResponse.php
@@ -33,7 +33,7 @@ final class CurlResponse implements ResponseInterface, StreamableInterface
     use TransportResponseTrait;
 
     private static bool $performing = false;
-    private CurlClientState $multi;
+    private $multi;
 
     /**
      * @var resource
diff --git a/Response/HttplugPromise.php b/Response/HttplugPromise.php
@@ -23,7 +23,7 @@
  */
 final class HttplugPromise implements HttplugPromiseInterface
 {
-    private GuzzlePromiseInterface $promise;
+    private $promise;
 
     public function __construct(GuzzlePromiseInterface $promise)
     {
diff --git a/Response/NativeResponse.php b/Response/NativeResponse.php
@@ -43,7 +43,7 @@ final class NativeResponse implements ResponseInterface, StreamableInterface
      */
     private $buffer;
 
-    private NativeClientState $multi;
+    private $multi;
     private float $pauseExpiry = 0.0;
 
     /**
diff --git a/Response/StreamWrapper.php b/Response/StreamWrapper.php
@@ -25,9 +25,9 @@ class StreamWrapper
     /** @var resource|string|null */
     public $context;
 
-    private HttpClientInterface|ResponseInterface $client;
+    private $client;
 
-    private ResponseInterface $response;
+    private $response;
 
     /** @var resource|null */
     private $content;
diff --git a/Response/TraceableResponse.php b/Response/TraceableResponse.php
@@ -31,10 +31,10 @@
  */
 class TraceableResponse implements ResponseInterface, StreamableInterface
 {
-    private HttpClientInterface $client;
-    private ResponseInterface $response;
+    private $client;
+    private $response;
     private mixed $content;
-    private ?StopwatchEvent $event;
+    private $event;
 
     public function __construct(HttpClientInterface $client, ResponseInterface $response, &$content, StopwatchEvent $event = null)
     {
diff --git a/Response/TransportResponseTrait.php b/Response/TransportResponseTrait.php
@@ -11,13 +11,11 @@
 
 namespace Symfony\Component\HttpClient\Response;
 
-use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpClient\Chunk\DataChunk;
 use Symfony\Component\HttpClient\Chunk\ErrorChunk;
 use Symfony\Component\HttpClient\Chunk\FirstChunk;
 use Symfony\Component\HttpClient\Chunk\LastChunk;
 use Symfony\Component\HttpClient\Exception\TransportException;
-use Symfony\Component\HttpClient\Internal\Canary;
 use Symfony\Component\HttpClient\Internal\ClientState;
 
 /**
@@ -41,10 +39,10 @@ trait TransportResponseTrait
     private $handle;
     private int|string $id;
     private ?float $timeout = 0;
-    private \InflateContext|bool|null $inflate = null;
+    private $inflate = null;
     private ?array $finalInfo = null;
-    private Canary $canary;
-    private ?LoggerInterface $logger = null;
+    private $canary;
+    private $logger = null;
 
     /**
      * {@inheritdoc}
diff --git a/RetryableHttpClient.php b/RetryableHttpClient.php
@@ -32,9 +32,9 @@ class RetryableHttpClient implements HttpClientInterface, ResetInterface
 {
     use AsyncDecoratorTrait;
 
-    private RetryStrategyInterface $strategy;
+    private $strategy;
     private int $maxRetries;
-    private LoggerInterface $logger;
+    private $logger;
 
     /**
      * @param int $maxRetries The maximum number of times to retry
diff --git a/ScopingHttpClient.php b/ScopingHttpClient.php
@@ -28,7 +28,7 @@ class ScopingHttpClient implements HttpClientInterface, ResetInterface, LoggerAw
 {
     use HttpClientTrait;
 
-    private HttpClientInterface $client;
+    private $client;
     private array $defaultOptionsByRegexp;
     private ?string $defaultRegexp;
 
diff --git a/TraceableHttpClient.php b/TraceableHttpClient.php
@@ -26,9 +26,9 @@
  */
 final class TraceableHttpClient implements HttpClientInterface, ResetInterface, LoggerAwareInterface
 {
-    private HttpClientInterface $client;
+    private $client;
     private array $tracedRequests = [];
-    private ?Stopwatch $stopwatch;
+    private $stopwatch;
 
     public function __construct(HttpClientInterface $client, Stopwatch $stopwatch = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ class CachingHttpClient implements HttpClientInterface, ResetInterface`
`35`	`35`	`{`
`36`	`36`	`use HttpClientTrait;`
`37`	`37`
`38`		`- private HttpClientInterface $client;`
`39`		`- private HttpCache $cache;`
	`38`	`+ private $client;`
	`39`	`+ private $cache;`
`40`	`40`	`private array $defaultOptions = self::OPTIONS_DEFAULTS;`
`41`	`41`
`42`	`42`	`public function __construct(HttpClientInterface $client, StoreInterface $store, array $defaultOptions = [])`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`trait DecoratorTrait`
`25`	`25`	`{`
`26`		`- private HttpClientInterface $client;`
	`26`	`+ private $client;`
`27`	`27`
`28`	`28`	`public function __construct(HttpClientInterface $client = null)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`trait HttpExceptionTrait`
`22`	`22`	`{`
`23`		`- private ResponseInterface $response;`
	`23`	`+ private $response;`
`24`	`24`
`25`	`25`	`public function __construct(ResponseInterface $response)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*/`
`26`	`26`	`class AmpBody implements RequestBody, InputStream`
`27`	`27`	`{`
`28`		`- private ResourceInputStream\|\Closure\|string $body;`
	`28`	`+ private $body;`
`29`	`29`	`private array $info;`
`30`	`30`	`private \Closure $onProgress;`
`31`	`31`	`private ?int $offset = 0;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ final class AmpClientState extends ClientState`
`49`	`49`	`private \Closure $clientConfigurator;`
`50`	`50`	`private int $maxHostConnections;`
`51`	`51`	`private int $maxPendingPushes;`
`52`		`- private ?LoggerInterface $logger;`
	`52`	`+ private $logger;`
`53`	`53`
`54`	`54`	`public function __construct(?callable $clientConfigurator, int $maxHostConnections, int $maxPendingPushes, ?LoggerInterface &$logger)`
`55`	`55`	`{`