Merge branch '5.4' into 6.0

* 5.4: [Console] Restore psr/log >= 3.0 conflict [Security] Make the abstract Voter class implement CacheableVoterInterface Add generic types to traversable implementations [Security] Fix TypeError message [Security] Fix deprecation layer [FrameworkBundle] Add completion for workflow:dump Fix cancel button Fix misleading error on missing provider with authenticator manager Don't limit retries of toolbar loading
symfony · Nov 3, 2021 · a0bf29b · a0bf29b
2 parents 838fec1 + 39b14b5
commit a0bf29b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Debug/TraceableEventDispatcher.php b/Debug/TraceableEventDispatcher.php
@@ -32,6 +32,9 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
     protected $logger;
     protected $stopwatch;
 
+    /**
+     * @var \SplObjectStorage<WrappedListener, array{string, string}>|null
+     */
     private ?\SplObjectStorage $callStack = null;
     private EventDispatcherInterface $dispatcher;
     private array $wrappedListeners = [];

diff --git a/GenericEvent.php b/GenericEvent.php
@@ -19,6 +19,9 @@
  * Encapsulates events thus decoupling the observer from the subject they encapsulate.
  *
  * @author Drak <drak@zikula.org>
+ *
+ * @implements \ArrayAccess<string, mixed>
+ * @implements \IteratorAggregate<string, mixed>
  */
 class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
 {