Merge branch '6.4' into 7.0

* 6.4:
  Use typed properties in tests as much as possible

Author: nicolas-grekas

Tests/EventDispatcherTest.php

@@ -23,25 +23,15 @@ class EventDispatcherTest extends TestCase
     private const postFoo = 'post.foo';
     private const preBar = 'pre.bar';
 
-    /**
-     * @var EventDispatcher
-     */
-    private $dispatcher;
-
-    private $listener;
+    private EventDispatcher $dispatcher;
+    private TestEventListener $listener;
 
     protected function setUp(): void
     {
         $this->dispatcher = $this->createEventDispatcher();
         $this->listener = new TestEventListener();
     }
 
-    protected function tearDown(): void
-    {
-        $this->dispatcher = null;
-        $this->listener = null;
-    }
-
     protected function createEventDispatcher()
     {
         return new EventDispatcher();
@@ -446,9 +436,9 @@ public function __invoke()
 
 class TestEventListener
 {
-    public $name;
-    public $preFooInvoked = false;
-    public $postFooInvoked = false;
+    public string $name;
+    public bool $preFooInvoked = false;
+    public bool $postFooInvoked = false;
 
     /* Listener methods */
 
@@ -473,9 +463,9 @@ public function __invoke()
 
 class TestWithDispatcher
 {
-    public $name;
-    public $dispatcher;
-    public $invoked = false;
+    public ?string $name = null;
+    public ?EventDispatcher $dispatcher = null;
+    public bool $invoked = false;
 
     public function foo($e, $name, $dispatcher)
     {

Tests/GenericEventTest.php

@@ -19,31 +19,15 @@
  */
 class GenericEventTest extends TestCase
 {
-    /**
-     * @var GenericEvent
-     */
-    private $event;
-
-    private $subject;
+    private GenericEvent $event;
+    private \stdClass $subject;
 
-    /**
-     * Prepares the environment before running a test.
-     */
     protected function setUp(): void
     {
         $this->subject = new \stdClass();
         $this->event = new GenericEvent($this->subject, ['name' => 'Event']);
     }
 
-    /**
-     * Cleans up the environment after running a test.
-     */
-    protected function tearDown(): void
-    {
-        $this->subject = null;
-        $this->event = null;
-    }
-
     public function testConstruct()
     {
         $this->assertEquals($this->event, new GenericEvent($this->subject, ['name' => 'Event']));

Tests/ImmutableEventDispatcherTest.php

@@ -23,15 +23,8 @@
  */
 class ImmutableEventDispatcherTest extends TestCase
 {
-    /**
-     * @var MockObject&EventDispatcherInterface
-     */
-    private $innerDispatcher;
-
-    /**
-     * @var ImmutableEventDispatcher
-     */
-    private $dispatcher;
+    private MockObject&EventDispatcherInterface $innerDispatcher;
+    private ImmutableEventDispatcher $dispatcher;
 
     protected function setUp(): void
     {