Merge branch '5.4' into 6.0

derrabus · derrabus · commit f563d84fda56 · 2021-11-04T18:14:40.000+01:00
* 5.4: (27 commits)
  feat: add completion for DebugAutowiring search argument
  [Routing] Add support for aliasing routes
  [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait`
  Fix CS
  [Console] Open CompleteCommand for custom outputs
  [Intl] Update the ICU data to 70.1
  [Messenger] Add completion for failed messages commands.
  Fix tests
  Fixing missing full_stack variable that's needed by toolbar.html.twig
  [PropertyInfo] Bump phpstan/phpdoc-parser
  [Security] Backport type fixes
  [VarExporter] escape unicode chars involved in directionality
  [Framework] Add completion to debug:container
  [Messenger] Add completion to command messenger:consume
  [Intl] Update the ICU data to 70.1
  Fix more generic types
  Default access_decision_manager.strategy option with merge.
  Fix typos
  Update validators.ca.xlf
  Add missing Validator translations for Estonian
  ...

Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/Firewall/ContextListener.php b/Firewall/ContextListener.php
@@ -53,7 +53,7 @@ class ContextListener extends AbstractListener
     private ?\Closure $sessionTrackerEnabler;
 
     /**
-     * @param iterable<int, UserProviderInterface> $userProviders
+     * @param iterable<mixed, UserProviderInterface> $userProviders
      */
     public function __construct(TokenStorageInterface $tokenStorage, iterable $userProviders, string $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, AuthenticationTrustResolverInterface $trustResolver = null, callable $sessionTrackerEnabler = null)
     {
diff --git a/FirewallMap.php b/FirewallMap.php
@@ -24,8 +24,14 @@
  */
 class FirewallMap implements FirewallMapInterface
 {
+    /**
+     * @var list<array{RequestMatcherInterface, list<callable>, ExceptionListener|null, LogoutListener|null}>
+     */
     private array $map = [];
 
+    /**
+     * @param list<callable> $listeners
+     */
     public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = [], ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null)
     {
         $this->map[] = [$requestMatcher, $listeners, $exceptionListener, $logoutListener];
diff --git a/FirewallMapInterface.php b/FirewallMapInterface.php
@@ -35,7 +35,7 @@ interface FirewallMapInterface
      * If there is no logout listener, the third element of the outer array
      * must be null.
      *
-     * @return array{list<callable>, ExceptionListener, LogoutListener}
+     * @return array{iterable<mixed, callable>, ExceptionListener, LogoutListener}
      */
     public function getListeners(Request $request);
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class ContextListener extends AbstractListener`
`53`	`53`	`private ?\Closure $sessionTrackerEnabler;`
`54`	`54`
`55`	`55`	`/**`
`56`		`- * @param iterable<int, UserProviderInterface> $userProviders`
	`56`	`+ * @param iterable<mixed, UserProviderInterface> $userProviders`
`57`	`57`	`*/`
`58`	`58`	`public function __construct(TokenStorageInterface $tokenStorage, iterable $userProviders, string $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, AuthenticationTrustResolverInterface $trustResolver = null, callable $sessionTrackerEnabler = null)`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,14 @@`
`24`	`24`	`*/`
`25`	`25`	`class FirewallMap implements FirewallMapInterface`
`26`	`26`	`{`
	`27`	`+ /**`
	`28`	`+ * @var list<array{RequestMatcherInterface, list<callable>, ExceptionListener\|null, LogoutListener\|null}>`
	`29`	`+ */`
`27`	`30`	`private array $map = [];`
`28`	`31`
	`32`	`+ /**`
	`33`	`+ * @param list<callable> $listeners`
	`34`	`+ */`
`29`	`35`	`public function add(RequestMatcherInterface $requestMatcher = null, array $listeners = [], ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null)`
`30`	`36`	`{`
`31`	`37`	`$this->map[] = [$requestMatcher, $listeners, $exceptionListener, $logoutListener];`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ interface FirewallMapInterface`
`35`	`35`	`* If there is no logout listener, the third element of the outer array`
`36`	`36`	`* must be null.`
`37`	`37`	`*`
`38`		`- * @return array{list<callable>, ExceptionListener, LogoutListener}`
	`38`	`+ * @return array{iterable<mixed, callable>, ExceptionListener, LogoutListener}`
`39`	`39`	`*/`
`40`	`40`	`public function getListeners(Request $request);`
`41`	`41`	`}`