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

Author: derrabus

Firewall.php

@@ -12,9 +12,11 @@
 namespace Symfony\Component\Security\Http;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Security\Http\Firewall\ExceptionListener;
 use Symfony\Component\Security\Http\Firewall\FirewallListenerInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
@@ -32,6 +34,10 @@ class Firewall implements EventSubscriberInterface
 {
     private FirewallMapInterface $map;
     private EventDispatcherInterface $dispatcher;
+
+    /**
+     * @var \SplObjectStorage<Request, ExceptionListener>
+     */
     private \SplObjectStorage $exceptionListeners;
 
     public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher)

Firewall/ContextListener.php

@@ -53,7 +53,7 @@ class ContextListener extends AbstractListener
     private ?\Closure $sessionTrackerEnabler;
 
     /**
-     * @param iterable|UserProviderInterface[] $userProviders
+     * @param iterable<int, UserProviderInterface> $userProviders
      */
     public function __construct(TokenStorageInterface $tokenStorage, iterable $userProviders, string $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, AuthenticationTrustResolverInterface $trustResolver = null, callable $sessionTrackerEnabler = null)
     {

FirewallMapInterface.php

@@ -12,6 +12,8 @@
 namespace Symfony\Component\Security\Http;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Http\Firewall\ExceptionListener;
+use Symfony\Component\Security\Http\Firewall\LogoutListener;
 
 /**
  * This interface must be implemented by firewall maps.
@@ -33,7 +35,7 @@ interface FirewallMapInterface
      * If there is no logout listener, the third element of the outer array
      * must be null.
      *
-     * @return array of the format [[AuthenticationListener], ExceptionListener, LogoutListener]
+     * @return array{list<callable>, ExceptionListener, LogoutListener}
      */
     public function getListeners(Request $request);
 }