Skip to content

Commit a0bf29b

Browse files
committed
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
2 parents 838fec1 + 39b14b5 commit a0bf29b

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Debug/TraceableEventDispatcher.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa
3232
protected $logger;
3333
protected $stopwatch;
3434

35+
/**
36+
* @var \SplObjectStorage<WrappedListener, array{string, string}>|null
37+
*/
3538
private ?\SplObjectStorage $callStack = null;
3639
private EventDispatcherInterface $dispatcher;
3740
private array $wrappedListeners = [];

GenericEvent.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
* Encapsulates events thus decoupling the observer from the subject they encapsulate.
2020
*
2121
* @author Drak <[email protected]>
22+
*
23+
* @implements \ArrayAccess<string, mixed>
24+
* @implements \IteratorAggregate<string, mixed>
2225
*/
2326
class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
2427
{

0 commit comments

Comments
 (0)