Use typed properties in tests as much as possible

nicolas-grekas · nicolas-grekas · commit 43afd1ed0f16 · 2023-07-25T10:53:33.000+02:00
diff --git a/Tests/File/FakeFile.php b/Tests/File/FakeFile.php
@@ -15,7 +15,7 @@
 
 class FakeFile extends OrigFile
 {
-    private $realpath;
+    private string $realpath;
 
     public function __construct(string $realpath, string $path)
     {
diff --git a/Tests/File/FileTest.php b/Tests/File/FileTest.php
@@ -20,8 +20,6 @@
  */
 class FileTest extends TestCase
 {
-    protected $file;
-
     public function testGetMimeTypeUsesMimeTypeGuessers()
     {
         $file = new File(__DIR__.'/Fixtures/test.gif');
diff --git a/Tests/Fixtures/response-functional/deleted_cookie.php b/Tests/Fixtures/response-functional/deleted_cookie.php
@@ -34,10 +34,7 @@
 $listener = new SessionListener($container);
 
 $kernel = new class($r) implements HttpKernelInterface {
-    /**
-     * @var Response
-     */
-    private $response;
+    private Response $response;
 
     public function __construct(Response $response)
     {
diff --git a/Tests/RateLimiter/MockAbstractRequestRateLimiter.php b/Tests/RateLimiter/MockAbstractRequestRateLimiter.php
@@ -20,7 +20,7 @@ class MockAbstractRequestRateLimiter extends AbstractRequestRateLimiter
     /**
      * @var LimiterInterface[]
      */
-    private $limiters;
+    private array $limiters;
 
     public function __construct(array $limiters)
     {
diff --git a/Tests/Session/Attribute/AttributeBagTest.php b/Tests/Session/Attribute/AttributeBagTest.php
@@ -21,12 +21,9 @@
  */
 class AttributeBagTest extends TestCase
 {
-    private $array = [];
+    private array $array = [];
 
-    /**
-     * @var AttributeBag
-     */
-    private $bag;
+    private ?AttributeBag $bag = null;
 
     protected function setUp(): void
     {
diff --git a/Tests/Session/Flash/AutoExpireFlashBagTest.php b/Tests/Session/Flash/AutoExpireFlashBagTest.php
@@ -21,12 +21,9 @@
  */
 class AutoExpireFlashBagTest extends TestCase
 {
-    /**
-     * @var \Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag
-     */
-    private $bag;
+    protected array $array = [];
 
-    protected $array = [];
+    private FlashBag $bag;
 
     protected function setUp(): void
     {
@@ -38,7 +35,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        $this->bag = null;
+        unset($this->bag);
         parent::tearDown();
     }
 
diff --git a/Tests/Session/Flash/FlashBagTest.php b/Tests/Session/Flash/FlashBagTest.php
@@ -21,12 +21,9 @@
  */
 class FlashBagTest extends TestCase
 {
-    /**
-     * @var \Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface
-     */
-    private $bag;
+    protected array $array = [];
 
-    protected $array = [];
+    private FlashBag $bag;
 
     protected function setUp(): void
     {
@@ -38,7 +35,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        $this->bag = null;
+        unset($this->bag);
         parent::tearDown();
     }
 
diff --git a/Tests/Session/SessionTest.php b/Tests/Session/SessionTest.php
@@ -17,8 +17,10 @@
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionBagProxy;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\MetadataBag;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
 
 /**
  * SessionTest.
@@ -29,28 +31,15 @@
  */
 class SessionTest extends TestCase
 {
-    /**
-     * @var \Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface
-     */
-    protected $storage;
-
-    /**
-     * @var \Symfony\Component\HttpFoundation\Session\SessionInterface
-     */
-    protected $session;
+    protected SessionStorageInterface $storage;
+    protected SessionInterface $session;
 
     protected function setUp(): void
     {
         $this->storage = new MockArraySessionStorage();
         $this->session = new Session($this->storage, new AttributeBag(), new FlashBag());
     }
 
-    protected function tearDown(): void
-    {
-        $this->storage = null;
-        $this->session = null;
-    }
-
     public function testStart()
     {
         $this->assertEquals('', $this->session->getId());
diff --git a/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php b/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
@@ -24,15 +24,8 @@ abstract class AbstractRedisSessionHandlerTestCase extends TestCase
 {
     protected const PREFIX = 'prefix_';
 
-    /**
-     * @var RedisSessionHandler
-     */
-    protected $storage;
-
-    /**
-     * @var \Redis|\RedisArray|\RedisCluster|\Predis\Client
-     */
-    protected $redisClient;
+    protected RedisSessionHandler $storage;
+    protected \Redis|Relay|\RedisArray|\RedisCluster|\Predis\Client $redisClient;
 
     abstract protected function createRedisClient(string $host): \Redis|Relay|\RedisArray|\RedisCluster|\Predis\Client;
 
@@ -58,14 +51,6 @@ protected function setUp(): void
         );
     }
 
-    protected function tearDown(): void
-    {
-        $this->redisClient = null;
-        $this->storage = null;
-
-        parent::tearDown();
-    }
-
     public function testOpenSession()
     {
         $this->assertTrue($this->storage->open('', ''));
diff --git a/Tests/Session/Storage/Handler/MarshallingSessionHandlerTest.php b/Tests/Session/Storage/Handler/MarshallingSessionHandlerTest.php
@@ -22,15 +22,8 @@
  */
 class MarshallingSessionHandlerTest extends TestCase
 {
-    /**
-     * @var MockObject|\SessionHandlerInterface
-     */
-    protected $handler;
-
-    /**
-     * @var MockObject|MarshallerInterface
-     */
-    protected $marshaller;
+    protected MockObject&\SessionHandlerInterface $handler;
+    protected MockObject&MarshallerInterface $marshaller;
 
     protected function setUp(): void
     {
diff --git a/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php b/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\MemcachedSessionHandler;
 
@@ -24,12 +25,8 @@ class MemcachedSessionHandlerTest extends TestCase
     private const PREFIX = 'prefix_';
     private const TTL = 1000;
 
-    /**
-     * @var MemcachedSessionHandler
-     */
-    protected $storage;
-
-    protected $memcached;
+    protected MemcachedSessionHandler $storage;
+    protected MockObject&\Memcached $memcached;
 
     protected function setUp(): void
     {
@@ -54,13 +51,6 @@ protected function setUp(): void
         );
     }
 
-    protected function tearDown(): void
-    {
-        $this->memcached = null;
-        $this->storage = null;
-        parent::tearDown();
-    }
-
     public function testOpenSession()
     {
         $this->assertTrue($this->storage->open('', ''));
diff --git a/Tests/Session/Storage/Handler/MigratingSessionHandlerTest.php b/Tests/Session/Storage/Handler/MigratingSessionHandlerTest.php
@@ -11,14 +11,15 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\MigratingSessionHandler;
 
 class MigratingSessionHandlerTest extends TestCase
 {
-    private $dualHandler;
-    private $currentHandler;
-    private $writeOnlyHandler;
+    private MigratingSessionHandler $dualHandler;
+    private MockObject&\SessionHandlerInterface $currentHandler;
+    private MockObject&\SessionHandlerInterface $writeOnlyHandler;
 
     protected function setUp(): void
     {
diff --git a/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -25,12 +25,9 @@
  */
 class MongoDbSessionHandlerTest extends TestCase
 {
-    /**
-     * @var MockObject&Client
-     */
-    private $mongo;
-    private $storage;
-    public $options;
+    public array $options;
+    private MockObject&Client $mongo;
+    private MongoDbSessionHandler $storage;
 
     protected function setUp(): void
     {
diff --git a/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -22,7 +22,7 @@
  */
 class PdoSessionHandlerTest extends TestCase
 {
-    private $dbFile;
+    private ?string $dbFile = null;
 
     protected function tearDown(): void
     {
@@ -404,9 +404,9 @@ private function createStream($content)
 
 class MockPdo extends \PDO
 {
-    public $prepareResult;
-    private $driverName;
-    private $errorMode;
+    public \Closure|\PDOStatement|false $prepareResult;
+    private ?string $driverName;
+    private bool|int $errorMode;
 
     public function __construct(string $driverName = null, int $errorMode = null)
     {
diff --git a/Tests/Session/Storage/MetadataBagTest.php b/Tests/Session/Storage/MetadataBagTest.php
@@ -21,12 +21,8 @@
  */
 class MetadataBagTest extends TestCase
 {
-    /**
-     * @var MetadataBag
-     */
-    protected $bag;
-
-    protected $array = [];
+    protected MetadataBag $bag;
+    protected array $array = [];
 
     protected function setUp(): void
     {
@@ -36,13 +32,6 @@ protected function setUp(): void
         $this->bag->initialize($this->array);
     }
 
-    protected function tearDown(): void
-    {
-        $this->array = [];
-        $this->bag = null;
-        parent::tearDown();
-    }
-
     public function testInitialize()
     {
         $sessionMetadata = [];
diff --git a/Tests/Session/Storage/MockArraySessionStorageTest.php b/Tests/Session/Storage/MockArraySessionStorageTest.php
@@ -23,22 +23,10 @@
  */
 class MockArraySessionStorageTest extends TestCase
 {
-    /**
-     * @var MockArraySessionStorage
-     */
-    private $storage;
-
-    /**
-     * @var AttributeBag
-     */
-    private $attributes;
-
-    /**
-     * @var FlashBag
-     */
-    private $flashes;
-
-    private $data;
+    private MockArraySessionStorage $storage;
+    private AttributeBag $attributes;
+    private FlashBag $flashes;
+    private array $data;
 
     protected function setUp(): void
     {
@@ -56,14 +44,6 @@ protected function setUp(): void
         $this->storage->setSessionData($this->data);
     }
 
-    protected function tearDown(): void
-    {
-        $this->data = null;
-        $this->flashes = null;
-        $this->attributes = null;
-        $this->storage = null;
-    }
-
     public function testStart()
     {
         $this->assertEquals('', $this->storage->getId());
diff --git a/Tests/Session/Storage/MockFileSessionStorageTest.php b/Tests/Session/Storage/MockFileSessionStorageTest.php
@@ -23,15 +23,9 @@
  */
 class MockFileSessionStorageTest extends TestCase
 {
-    /**
-     * @var string
-     */
-    private $sessionDir;
+    protected MockFileSessionStorage $storage;
 
-    /**
-     * @var MockFileSessionStorage
-     */
-    protected $storage;
+    private string $sessionDir;
 
     protected function setUp(): void
     {
@@ -45,8 +39,6 @@ protected function tearDown(): void
         if (is_dir($this->sessionDir)) {
             @rmdir($this->sessionDir);
         }
-        $this->sessionDir = null;
-        $this->storage = null;
     }
 
     public function testStart()
diff --git a/Tests/Session/Storage/NativeSessionStorageTest.php b/Tests/Session/Storage/NativeSessionStorageTest.php
diff --git a/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
diff --git a/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/Tests/Session/Storage/Proxy/AbstractProxyTest.php
diff --git a/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`class FakeFile extends OrigFile`
`17`	`17`	`{`
`18`		`- private $realpath;`
	`18`	`+ private string $realpath;`
`19`	`19`
`20`	`20`	`public function __construct(string $realpath, string $path)`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`*/`
`21`	`21`	`class FileTest extends TestCase`
`22`	`22`	`{`
`23`		`- protected $file;`
`24`		`-`
`25`	`23`	`public function testGetMimeTypeUsesMimeTypeGuessers()`
`26`	`24`	`{`
`27`	`25`	`$file = new File(__DIR__.'/Fixtures/test.gif');`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class MockAbstractRequestRateLimiter extends AbstractRequestRateLimiter`
`20`	`20`	`/**`
`21`	`21`	`* @var LimiterInterface[]`
`22`	`22`	`*/`
`23`		`- private $limiters;`
	`23`	`+ private array $limiters;`
`24`	`24`
`25`	`25`	`public function __construct(array $limiters)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,9 @@`
`21`	`21`	`*/`
`22`	`22`	`class AttributeBagTest extends TestCase`
`23`	`23`	`{`
`24`		`- private $array = [];`
	`24`	`+ private array $array = [];`
`25`	`25`
`26`		`- /**`
`27`		`- * @var AttributeBag`
`28`		`- */`
`29`		`- private $bag;`
	`26`	`+ private ?AttributeBag $bag = null;`
`30`	`27`
`31`	`28`	`protected function setUp(): void`
`32`	`29`	`{`