Use typed properties in tests as much as possible

Author: nicolas-grekas

Test/FormIntegrationTestCase.php

@@ -20,10 +20,7 @@
  */
 abstract class FormIntegrationTestCase extends TestCase
 {
-    /**
-     * @var FormFactoryInterface
-     */
-    protected $factory;
+    protected FormFactoryInterface $factory;
 
     protected function setUp(): void
     {

Tests/AbstractRequestHandlerTestCase.php

@@ -29,25 +29,16 @@
  */
 abstract class AbstractRequestHandlerTestCase extends TestCase
 {
-    /**
-     * @var RequestHandlerInterface
-     */
-    protected $requestHandler;
-
-    /**
-     * @var FormFactory
-     */
-    protected $factory;
-
+    protected RequestHandlerInterface $requestHandler;
+    protected FormFactory $factory;
     protected $request;
-
-    protected $serverParams;
+    protected ServerParams $serverParams;
 
     protected function setUp(): void
     {
         $this->serverParams = new class() extends ServerParams {
-            public $contentLength;
-            public $postMaxSize = '';
+            public ?int $contentLength = null;
+            public string $postMaxSize = '';
 
             public function getContentLength(): ?int
             {

Tests/ChoiceList/AbstractChoiceListTestCase.php

@@ -19,90 +19,23 @@
  */
 abstract class AbstractChoiceListTestCase extends TestCase
 {
-    /**
-     * @var ChoiceListInterface
-     */
-    protected $list;
-
-    /**
-     * @var array
-     */
-    protected $choices;
-
-    /**
-     * @var array
-     */
-    protected $values;
-
-    /**
-     * @var array
-     */
-    protected $structuredValues;
-
-    /**
-     * @var array
-     */
-    protected $keys;
-
-    /**
-     * @var mixed
-     */
-    protected $choice1;
-
-    /**
-     * @var mixed
-     */
-    protected $choice2;
-
-    /**
-     * @var mixed
-     */
-    protected $choice3;
-
-    /**
-     * @var mixed
-     */
-    protected $choice4;
-
-    /**
-     * @var string
-     */
-    protected $value1;
-
-    /**
-     * @var string
-     */
-    protected $value2;
-
-    /**
-     * @var string
-     */
-    protected $value3;
-
-    /**
-     * @var string
-     */
-    protected $value4;
-
-    /**
-     * @var string
-     */
-    protected $key1;
-
-    /**
-     * @var string
-     */
-    protected $key2;
-
-    /**
-     * @var string
-     */
-    protected $key3;
-
-    /**
-     * @var string
-     */
-    protected $key4;
+    protected ChoiceListInterface $list;
+    protected array $choices;
+    protected array $values;
+    protected array $structuredValues;
+    protected array $keys;
+    protected mixed $choice1;
+    protected mixed $choice2;
+    protected mixed $choice3;
+    protected mixed $choice4;
+    protected string $value1;
+    protected string $value2;
+    protected string $value3;
+    protected string $value4;
+    protected string $key1;
+    protected string $key2;
+    protected string $key3;
+    protected string $key4;
 
     protected function setUp(): void
     {

Tests/ChoiceList/ArrayChoiceListTest.php

@@ -19,7 +19,7 @@
  */
 class ArrayChoiceListTest extends AbstractChoiceListTestCase
 {
-    private $object;
+    private \stdClass $object;
 
     protected function setUp(): void
     {

Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php

@@ -28,10 +28,7 @@
  */
 class CachingFactoryDecoratorTest extends TestCase
 {
-    /**
-     * @var CachingFactoryDecorator
-     */
-    private $factory;
+    private CachingFactoryDecorator $factory;
 
     protected function setUp(): void
     {

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -27,24 +27,12 @@
 
 class DefaultChoiceListFactoryTest extends TestCase
 {
-    private $obj1;
-
-    private $obj2;
-
-    private $obj3;
-
-    private $obj4;
-
-    private $obj5;
-
-    private $obj6;
-
-    private $list;
-
-    /**
-     * @var DefaultChoiceListFactory
-     */
-    private $factory;
+    private \stdClass $obj1;
+    private \stdClass $obj2;
+    private \stdClass $obj3;
+    private \stdClass $obj4;
+    private ArrayChoiceList $list;
+    private DefaultChoiceListFactory $factory;
 
     public function getValue($object)
     {
@@ -208,9 +196,9 @@ public function testCreateFromChoicesGroupedValuesAsClosure()
     public function testCreateFromFilteredChoices()
     {
         $list = $this->factory->createListFromChoices(
-            ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4, 'E' => $this->obj5, 'F' => $this->obj6],
+            ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4, 'E' => null, 'F' => null],
             null,
-            fn ($choice) => $choice !== $this->obj5 && $choice !== $this->obj6
+            fn ($choice) => null !== $choice
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -222,11 +210,11 @@ public function testCreateFromChoicesGroupedAndFiltered()
             [
                 'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
                 'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
-                'Group 3' => ['E' => $this->obj5, 'F' => $this->obj6],
+                'Group 3' => ['E' => null, 'F' => null],
                 'Group 4' => [/* empty group should be filtered */],
             ],
             null,
-            fn ($choice) => $choice !== $this->obj5 && $choice !== $this->obj6
+            fn ($choice) => null !== $choice
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -238,11 +226,11 @@ public function testCreateFromChoicesGroupedAndFilteredTraversable()
             new \ArrayIterator([
                 'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
                 'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
-                'Group 3' => ['E' => $this->obj5, 'F' => $this->obj6],
+                'Group 3' => ['E' => null, 'F' => null],
                 'Group 4' => [/* empty group should be filtered */],
             ]),
             null,
-            fn ($choice) => $choice !== $this->obj5 && $choice !== $this->obj6
+            fn ($choice) => null !== $choice
         );
 
         $this->assertObjectListWithGeneratedValues($list);
@@ -1026,7 +1014,7 @@ private function assertGroupedViewWithChoiceDuplication($view)
 
 class DefaultChoiceListFactoryTest_Castable
 {
-    private $property;
+    private string $property;
 
     public function __construct($property)
     {

Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php

@@ -25,10 +25,7 @@
  */
 class PropertyAccessDecoratorTest extends TestCase
 {
-    /**
-     * @var PropertyAccessDecorator
-     */
-    private $factory;
+    private PropertyAccessDecorator $factory;
 
     protected function setUp(): void
     {

Tests/ChoiceList/Loader/CallbackChoiceLoaderTest.php

@@ -21,30 +21,11 @@
  */
 class CallbackChoiceLoaderTest extends TestCase
 {
-    /**
-     * @var \Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader
-     */
-    private static $loader;
-
-    /**
-     * @var callable
-     */
-    private static $value;
-
-    /**
-     * @var array
-     */
-    private static $choices;
-
-    /**
-     * @var string[]
-     */
-    private static $choiceValues;
-
-    /**
-     * @var \Symfony\Component\Form\ChoiceList\LazyChoiceList
-     */
-    private static $lazyChoiceList;
+    private static CallbackChoiceLoader $loader;
+    private static \Closure $value;
+    private static array $choices;
+    private static array $choiceValues = ['choice_one', 'choice_two'];
+    private static LazyChoiceList $lazyChoiceList;
 
     public static function setUpBeforeClass(): void
     {
@@ -54,7 +35,6 @@ public static function setUpBeforeClass(): void
             (object) ['value' => 'choice_one'],
             (object) ['value' => 'choice_two'],
         ];
-        self::$choiceValues = ['choice_one', 'choice_two'];
         self::$lazyChoiceList = new LazyChoiceList(self::$loader, self::$value);
     }
 
@@ -106,13 +86,4 @@ public function testLoadValuesForChoicesLoadsChoiceListOnFirstCall()
             'Choice list should not be reloaded.'
         );
     }
-
-    public static function tearDownAfterClass(): void
-    {
-        self::$loader = null;
-        self::$value = null;
-        self::$choices = [];
-        self::$choiceValues = [];
-        self::$lazyChoiceList = null;
-    }
 }

Tests/ChoiceList/Loader/IntlCallbackChoiceLoaderTest.php

@@ -22,30 +22,11 @@
  */
 class IntlCallbackChoiceLoaderTest extends TestCase
 {
-    /**
-     * @var \Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader
-     */
-    private static $loader;
-
-    /**
-     * @var callable
-     */
-    private static $value;
-
-    /**
-     * @var array
-     */
-    private static $choices;
-
-    /**
-     * @var string[]
-     */
-    private static $choiceValues;
-
-    /**
-     * @var \Symfony\Component\Form\ChoiceList\LazyChoiceList
-     */
-    private static $lazyChoiceList;
+    private static IntlCallbackChoiceLoader $loader;
+    private static \Closure $value;
+    private static array $choices;
+    private static array $choiceValues = ['choice_one', 'choice_two'];
+    private static LazyChoiceList $lazyChoiceList;
 
     public static function setUpBeforeClass(): void
     {
@@ -55,7 +36,6 @@ public static function setUpBeforeClass(): void
             (object) ['value' => 'choice_one'],
             (object) ['value' => 'choice_two'],
         ];
-        self::$choiceValues = ['choice_one', 'choice_two'];
         self::$lazyChoiceList = new LazyChoiceList(self::$loader, self::$value);
     }
 
@@ -101,13 +81,4 @@ public function testLoadValuesForChoicesLoadsChoiceListOnFirstCall()
             'Choice list should not be reloaded.'
         );
     }
-
-    public static function tearDownAfterClass(): void
-    {
-        self::$loader = null;
-        self::$value = null;
-        self::$choices = [];
-        self::$choiceValues = [];
-        self::$lazyChoiceList = null;
-    }
 }