[EventDispatcher] Add types to private properties

derrabus · derrabus · commit bd5556f8ba29 · 2021-07-01T12:30:10.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -32,20 +32,18 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
     protected $logger;
     protected $stopwatch;
 
-    private $callStack;
-    private $dispatcher;
-    private $wrappedListeners;
-    private $orphanedEvents;
-    private $requestStack;
-    private $currentRequestHash = '';
+    private ?\SplObjectStorage $callStack = null;
+    private EventDispatcherInterface $dispatcher;
+    private array $wrappedListeners = [];
+    private array $orphanedEvents = [];
+    private ?RequestStack $requestStack;
+    private string $currentRequestHash = '';
 
     public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null, RequestStack $requestStack = null)
     {
         $this->dispatcher = $dispatcher;
         $this->stopwatch = $stopwatch;
         $this->logger = $logger;
-        $this->wrappedListeners = [];
-        $this->orphanedEvents = [];
         $this->requestStack = $requestStack;
     }
 
diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
@@ -21,26 +21,24 @@
  */
 final class WrappedListener
 {
-    private $listener;
-    private $optimizedListener;
-    private $name;
-    private $called;
-    private $stoppedPropagation;
-    private $stopwatch;
-    private $dispatcher;
-    private $pretty;
-    private $stub;
-    private $priority;
-    private static $hasClassStub;
+    private string|array|object $listener;
+    private ?\Closure $optimizedListener;
+    private string $name;
+    private bool $called = false;
+    private bool $stoppedPropagation = false;
+    private Stopwatch $stopwatch;
+    private ?EventDispatcherInterface $dispatcher;
+    private string $pretty;
+    private ClassStub|string $stub;
+    private ?int $priority = null;
+    private static bool $hasClassStub;
 
     public function __construct(callable|array $listener, ?string $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null)
     {
         $this->listener = $listener;
         $this->optimizedListener = $listener instanceof \Closure ? $listener : (\is_callable($listener) ? \Closure::fromCallable($listener) : null);
         $this->stopwatch = $stopwatch;
         $this->dispatcher = $dispatcher;
-        $this->called = false;
-        $this->stoppedPropagation = false;
 
         if (\is_array($listener)) {
             $this->name = \is_object($listener[0]) ? get_debug_type($listener[0]) : $listener[0];
@@ -66,12 +64,10 @@ public function __construct(callable|array $listener, ?string $name, Stopwatch $
             $this->name = $name;
         }
 
-        if (null === self::$hasClassStub) {
-            self::$hasClassStub = class_exists(ClassStub::class);
-        }
+        self::$hasClassStub ??= class_exists(ClassStub::class);
     }
 
-    public function getWrappedListener()
+    public function getWrappedListener(): callable|array
     {
         return $this->listener;
     }
@@ -93,9 +89,7 @@ public function getPretty(): string
 
     public function getInfo(string $eventName): array
     {
-        if (null === $this->stub) {
-            $this->stub = self::$hasClassStub ? new ClassStub($this->pretty.'()', $this->listener) : $this->pretty.'()';
-        }
+        $this->stub ??= self::$hasClassStub ? new ClassStub($this->pretty.'()', $this->listener) : $this->pretty.'()';
 
         return [
             'event' => $eventName,
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/AddEventAliasesPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/AddEventAliasesPass.php
@@ -21,7 +21,7 @@
  */
 class AddEventAliasesPass implements CompilerPassInterface
 {
-    private $eventAliases;
+    private array $eventAliases;
 
     public function __construct(array $eventAliases)
     {
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -25,10 +25,10 @@
  */
 class RegisterListenersPass implements CompilerPassInterface
 {
-    private $hotPathEvents = [];
-    private $hotPathTagName;
-    private $noPreloadEvents = [];
-    private $noPreloadTagName;
+    private array $hotPathEvents = [];
+    private string $hotPathTagName;
+    private array $noPreloadEvents = [];
+    private string $noPreloadTagName;
 
     /**
      * @return $this
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -31,9 +31,9 @@
  */
 class EventDispatcher implements EventDispatcherInterface
 {
-    private $listeners = [];
-    private $sorted = [];
-    private $optimized;
+    private array $listeners = [];
+    private array $sorted = [];
+    private array $optimized;
 
     public function __construct()
     {
@@ -49,7 +49,7 @@ public function dispatch(object $event, string $eventName = null): object
     {
         $eventName = $eventName ?? \get_class($event);
 
-        if (null !== $this->optimized) {
+        if (isset($this->optimized)) {
             $listeners = $this->optimized[$eventName] ?? (empty($this->listeners[$eventName]) ? [] : $this->optimizeListeners($eventName));
         } else {
             $listeners = $this->getListeners($eventName);
diff --git a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
@@ -18,7 +18,7 @@
  */
 class ImmutableEventDispatcher implements EventDispatcherInterface
 {
-    private $dispatcher;
+    private EventDispatcherInterface $dispatcher;
 
     public function __construct(EventDispatcherInterface $dispatcher)
     {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class AddEventAliasesPass implements CompilerPassInterface`
`23`	`23`	`{`
`24`		`- private $eventAliases;`
	`24`	`+ private array $eventAliases;`
`25`	`25`
`26`	`26`	`public function __construct(array $eventAliases)`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@`
`31`	`31`	`*/`
`32`	`32`	`class EventDispatcher implements EventDispatcherInterface`
`33`	`33`	`{`
`34`		`- private $listeners = [];`
`35`		`- private $sorted = [];`
`36`		`- private $optimized;`
	`34`	`+ private array $listeners = [];`
	`35`	`+ private array $sorted = [];`
	`36`	`+ private array $optimized;`
`37`	`37`
`38`	`38`	`public function __construct()`
`39`	`39`	`{`
`@@ -49,7 +49,7 @@ public function dispatch(object $event, string $eventName = null): object`
`49`	`49`	`{`
`50`	`50`	`$eventName = $eventName ?? \get_class($event);`
`51`	`51`
`52`		`- if (null !== $this->optimized) {`
	`52`	`+ if (isset($this->optimized)) {`
`53`	`53`	`$listeners = $this->optimized[$eventName] ?? (empty($this->listeners[$eventName]) ? [] : $this->optimizeListeners($eventName));`
`54`	`54`	`} else {`
`55`	`55`	`$listeners = $this->getListeners($eventName);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`class ImmutableEventDispatcher implements EventDispatcherInterface`
`20`	`20`	`{`
`21`		`- private $dispatcher;`
	`21`	`+ private EventDispatcherInterface $dispatcher;`
`22`	`22`
`23`	`23`	`public function __construct(EventDispatcherInterface $dispatcher)`
`24`	`24`	`{`