symfony · nicolas-grekas · Jul 27, 2023 · Jul 27, 2023
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTestCase.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\SkippedTestSuiteError;
 use Psr\Cache\CacheItemPoolInterface;
+use Relay\Relay;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 
 abstract class AbstractRedisAdapterTestCase extends AdapterTestCase
@@ -23,7 +24,7 @@ abstract class AbstractRedisAdapterTestCase extends AdapterTestCase
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
     ];
 
-    protected static $redis;
+    protected static \Redis|Relay|\RedisArray|\RedisCluster|\Predis\ClientInterface $redis;
 
     public function createCachePool(int $defaultLifetime = 0, string $testMethod = null): CacheItemPoolInterface
     {
@@ -42,11 +43,6 @@ public static function setUpBeforeClass(): void
         }
     }
 
-    public static function tearDownAfterClass(): void
-    {
-        self::$redis = null;
-    }
-
     /**
      * @runInSeparateProcess
      */

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PhpArrayAdapterTest.php
@@ -148,7 +148,7 @@ public function testStoredFile()
 
 class PhpArrayAdapterWrapper extends PhpArrayAdapter
 {
-    protected $data = [];
+    protected array $data = [];
 
     public function save(CacheItemInterface $item): bool
     {

@@ -19,6 +19,7 @@
 final class Cursor
 {
     private OutputInterface $output;
+    /** @var resource */
     private $input;
 
     /**

@@ -28,6 +28,7 @@
 abstract class Input implements InputInterface, StreamableInputInterface
 {
     protected $definition;
+    /** @var resource */
     protected $stream;
     protected $options = [];
     protected $arguments = [];

@@ -29,6 +29,7 @@
  */
 class StreamOutput extends Output
 {
+    /** @var resource */
     private $stream;
 
     /**

@@ -17,6 +17,7 @@
 
 class CursorTest extends TestCase
 {
+    /** @var resource */
     protected $stream;
 
     protected function setUp(): void
@@ -26,8 +27,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        fclose($this->stream);
-        $this->stream = null;
+        unset($this->stream);
     }
 
     public function testMoveUpOneLine()

@@ -25,6 +25,7 @@
 
 class TableTest extends TestCase
 {
+    /** @var resource */
     protected $stream;
 
     protected function setUp(): void
@@ -34,8 +35,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        fclose($this->stream);
-        $this->stream = null;
+        unset($this->stream);
     }
 
     /**

@@ -22,6 +22,7 @@
 
 class ConsoleSectionOutputTest extends TestCase
 {
+    /** @var resource */
     private $stream;
 
     protected function setUp(): void
@@ -31,7 +32,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        $this->stream = null;
+        unset($this->stream);
     }
 
     public function testClearAll()

@@ -17,6 +17,7 @@
 
 class StreamOutputTest extends TestCase
 {
+    /** @var resource */
     protected $stream;
 
     protected function setUp(): void
@@ -26,7 +27,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        $this->stream = null;
+        unset($this->stream);
     }
 
     public function testConstructor()

@@ -29,16 +29,14 @@
  */
 abstract class Descriptor implements DescriptorInterface
 {
-    /** @var OutputStyle */
-    protected $output;
-    protected $type;
-    protected $ownOptions = [];
-    protected $overriddenOptions = [];
-    protected $parentOptions = [];
-    protected $extensionOptions = [];
-    protected $requiredOptions = [];
-    protected $parents = [];
-    protected $extensions = [];
+    protected OutputStyle $output;
+    protected array $ownOptions = [];
+    protected array $overriddenOptions = [];
+    protected array $parentOptions = [];
+    protected array $extensionOptions = [];
+    protected array $requiredOptions = [];
+    protected array $parents = [];
+    protected array $extensions = [];
 
     public function describe(OutputInterface $output, ?object $object, array $options = []): void
     {

@@ -31,7 +31,7 @@ abstract class AbstractRequestHandlerTestCase extends TestCase
 {
     protected RequestHandlerInterface $requestHandler;
     protected FormFactory $factory;
-    protected $request;
+    protected mixed $request = null;
     protected ServerParams $serverParams;
 
     protected function setUp(): void

diff --git a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php
@@ -145,15 +145,16 @@ private function getClient(array $options): array
         $options['crypto_method'] && $context = $context->withMinimumVersion($options['crypto_method']);
 
         $connector = $handleConnector = new class() implements Connector {
-            public $connector;
-            public $uri;
+            public DnsConnector $connector;
+            public string $uri;
+            /** @var resource|null */
             public $handle;
 
             public function connect(string $uri, ConnectContext $context = null, CancellationToken $token = null): Promise
             {
                 $result = $this->connector->connect($this->uri ?? $uri, $context, $token);
                 $result->onResolve(function ($e, $socket) {
-                    $this->handle = null !== $socket ? $socket->getResource() : false;
+                    $this->handle = $socket?->getResource();
                 });
 
                 return $result;

diff --git a/src/Symfony/Component/HttpClient/Internal/AmpListener.php b/src/Symfony/Component/HttpClient/Internal/AmpListener.php
@@ -28,6 +28,7 @@ class AmpListener implements EventListener
     private array $info;
     private array $pinSha256;
     private \Closure $onProgress;
+    /** @var resource|null */
     private $handle;
 
     public function __construct(array &$info, array $pinSha256, \Closure $onProgress, &$handle)

diff --git a/src/Symfony/Component/HttpClient/Response/AsyncContext.php b/src/Symfony/Component/HttpClient/Response/AsyncContext.php
@@ -25,10 +25,12 @@
  */
 final class AsyncContext
 {
+    /** @var callable|null */
     private $passthru;
     private HttpClientInterface $client;
     private ResponseInterface $response;
     private array $info = [];
+    /** @var resource|null */
     private $content;
     private int $offset;
 

diff --git a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php
@@ -37,6 +37,7 @@ class AsyncResponse implements ResponseInterface, StreamableInterface
     private ?HttpClientInterface $client;
     private ResponseInterface $response;
     private array $info = ['canceled' => false];
+    /** @var callable|null */
     private $passthru;
     private ?\Iterator $stream = null;
     private ?int $yieldedState = null;

diff --git a/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php b/src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
@@ -30,7 +30,9 @@ trait CommonResponseTrait
      * @var callable|null A callback that tells whether we're waiting for response headers
      */
     private $initializer;
+    /** @var bool|\Closure|resource|null */
     private $shouldBuffer;
+    /** @var resource|null */
     private $content;
     private int $offset = 0;
     private ?array $jsonData = null;

diff --git a/src/Symfony/Component/HttpClient/Response/NativeResponse.php b/src/Symfony/Component/HttpClient/Response/NativeResponse.php
@@ -34,8 +34,8 @@ final class NativeResponse implements ResponseInterface, StreamableInterface
      */
     private $context;
     private string $url;
-    private $resolver;
-    private $onProgress;
+    private \Closure $resolver;
+    private ?\Closure $onProgress;
     private ?int $remaining = null;
 
     /**
@@ -58,8 +58,8 @@ public function __construct(NativeClientState $multi, $context, string $url, arr
        $this->logger = $logger;
         $this->timeout = $options['timeout'];
         $this->info = &$info;
-        $this->resolver = $resolver;
-        $this->onProgress = $onProgress;
+        $this->resolver = $resolver(...);
+        $this->onProgress = $onProgress ? $onProgress(...) : null;
         $this->inflate = !isset($options['normalized_headers']['accept-encoding']);
         $this->shouldBuffer = $options['buffer'] ?? true;
 
@@ -177,7 +177,7 @@ private function open(): void
         }
 
         stream_set_blocking($h, false);
-        $this->context = $this->resolver = null;
+        unset($this->context, $this->resolver);
 
         // Create dechunk buffers
         if (isset($this->headers['content-length'])) {

diff --git a/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php b/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php
@@ -38,7 +38,7 @@ trait TransportResponseTrait
         'canceled' => false,
     ];
 
-    /** @var object|resource */
+    /** @var object|resource|null */
     private $handle;
     private int|string $id;
     private ?float $timeout = 0;

diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseFunctionalTest.php
@@ -16,6 +16,7 @@
 
 class ResponseFunctionalTest extends TestCase
 {
+    /** @var resource|false */
     private static $server;
 
     public static function setUpBeforeClass(): void

diff --git a/...ony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php b/...ony/Component/HttpFoundation/Tests/Session/Storage/Handler/AbstractSessionHandlerTest.php
@@ -16,6 +16,7 @@
 
 class AbstractSessionHandlerTest extends TestCase
 {
+    /** @var resource|false */
     private static $server;
 
     public static function setUpBeforeClass(): void

diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SubRequestHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SubRequestHandlerTest.php
@@ -142,11 +142,9 @@ private function getGlobalState(): array
 
 class TestSubRequestHandlerKernel implements HttpKernelInterface
 {
-    private $assertCallback;
-
-    public function __construct(\Closure $assertCallback)
-    {
-        $this->assertCallback = $assertCallback;
+    public function __construct(
+        private \Closure $assertCallback,
+    ) {
     }
 
     public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = true): Response

diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/AbstractStream.php
@@ -24,8 +24,11 @@
  */
 abstract class AbstractStream
 {
+    /** @var resource|null */
     protected $stream;
+    /** @var resource|null */
     protected $in;
+    /** @var resource|null */
     protected $out;
 
     private string $debug = '';

diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
@@ -261,7 +261,7 @@ private function process(array $jobs): void
     public function testBatchHandlerNoBatch()
     {
         $handler = new class() implements BatchHandlerInterface {
-            public $processedMessages;
+            public array $processedMessages;
 
             use BatchHandlerTrait;
 

diff --git a/src/Symfony/Component/Mime/Part/AbstractPart.php b/src/Symfony/Component/Mime/Part/AbstractPart.php
@@ -18,7 +18,7 @@
  */
 abstract class AbstractPart
 {
-    private $headers;
+    private Headers $headers;
 
     public function __construct()
     {

diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Component/Mime/Part/TextPart.php
@@ -28,6 +28,7 @@ class TextPart extends AbstractPart
 
     private static array $encoders = [];
 
+    /** @var resource|string|File */
     private $body;
     private ?string $charset;
     private string $subtype;

diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
@@ -23,19 +23,18 @@ abstract class AbstractPipes implements PipesInterface
     public array $pipes = [];
 
     private string $inputBuffer = '';
+    /** @var resource|string|\Iterator */
     private $input;
     private bool $blocked = true;
     private ?string $lastError = null;
 
     /**
-     * @param resource|string|int|float|bool|\Iterator|null $input
+     * @param resource|string|\Iterator $input
      */
-    public function __construct(mixed $input)
+    public function __construct($input)
     {
         if (\is_resource($input) || $input instanceof \Iterator) {
             $this->input = $input;
-        } elseif (\is_string($input)) {
-            $this->inputBuffer = $input;
         } else {
             $this->inputBuffer = (string) $input;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ @@
      */
     class StreamOutput extends Output
     {
+        /** @var resource */
         private $stream;
         /**
@@ Expand Down @@