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

DataCollector/RequestDataCollector.php

@@ -31,6 +31,9 @@
  */
 class RequestDataCollector extends DataCollector implements EventSubscriberInterface, LateDataCollectorInterface
 {
+    /**
+     * @var \SplObjectStorage<Request, callable>
+     */
     private \SplObjectStorage $controllers;
     private array $sessionUsages = [];
     private ?RequestStack $requestStack;

DataCollector/RouterDataCollector.php

@@ -22,7 +22,7 @@
 class RouterDataCollector extends DataCollector
 {
     /**
-     * @var \SplObjectStorage
+     * @var \SplObjectStorage<Request, callable>
      */
     protected $controllers;
 

EventListener/ProfilerListener.php

@@ -12,12 +12,14 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestMatcherInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\Event\TerminateEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpKernel\Profiler\Profile;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
 
 /**
@@ -34,9 +36,11 @@ class ProfilerListener implements EventSubscriberInterface
     private bool $onlyException;
     private bool $onlyMainRequests;
     private ?\Throwable $exception = null;
+    /** @var \SplObjectStorage<Request, Profile> */
     private \SplObjectStorage $profiles;
     private RequestStack $requestStack;
     private ?string $collectParameter;
+    /** @var \SplObjectStorage<Request, Request|null> */
     private \SplObjectStorage $parents;
 
     /**

HttpCache/Store.php

@@ -25,11 +25,9 @@
 class Store implements StoreInterface
 {
     protected $root;
+    /** @var \SplObjectStorage<Request, string> */
     private \SplObjectStorage $keyCache;
-
-    /**
-     * @var array<string, resource>
-     */
+    /** @var array<string, resource> */
     private array $locks = [];
 
     /**

KernelInterface.php

@@ -27,7 +27,7 @@ interface KernelInterface extends HttpKernelInterface
     /**
      * Returns an array of bundles to register.
      *
-     * @return iterable|BundleInterface[]
+     * @return iterable<BundleInterface>
      */
     public function registerBundles(): iterable;