Fix more generic types

Signed-off-by: Alexander M. Turek <me@derrabus.de>

Author: derrabus

CacheWarmer/ExpressionCacheWarmer.php

@@ -21,7 +21,7 @@ class ExpressionCacheWarmer implements CacheWarmerInterface
     private $expressionLanguage;
 
     /**
-     * @param iterable<int, Expression> $expressions
+     * @param iterable<mixed, Expression> $expressions
      */
     public function __construct(iterable $expressions, ExpressionLanguage $expressionLanguage)
     {

DependencyInjection/MainConfiguration.php

@@ -42,7 +42,7 @@ class MainConfiguration implements ConfigurationInterface
     private $userProviderFactories;
 
     /**
-     * @param array<int, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
+     * @param array<array-key, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
      */
     public function __construct(array $factories, array $userProviderFactories)
     {
@@ -220,7 +220,7 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
     }
 
     /**
-     * @param array<int, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
+     * @param array<array-key, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
      */
     private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $factories)
     {

DependencyInjection/SecurityExtension.php

@@ -63,9 +63,9 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
     private $requestMatchers = [];
     private $expressions = [];
     private $contextListeners = [];
-    /** @var array<array{0: int, 1: AuthenticatorFactoryInterface|SecurityFactoryInterface}> */
+    /** @var list<array{int, AuthenticatorFactoryInterface|SecurityFactoryInterface}> */
     private $factories = [];
-    /** @var (AuthenticatorFactoryInterface|SecurityFactoryInterface)[] */
+    /** @var list<AuthenticatorFactoryInterface|SecurityFactoryInterface> */
     private $sortedFactories = [];
     private $userProviderFactories = [];
     private $statelessFirewallKeys = [];

Security/FirewallContext.php

@@ -27,6 +27,9 @@ class FirewallContext
     private $logoutListener;
     private $config;
 
+    /**
+     * @param iterable<mixed, callable> $listeners
+     */
     public function __construct(iterable $listeners, ExceptionListener $exceptionListener = null, LogoutListener $logoutListener = null, FirewallConfig $config = null)
     {
         $this->listeners = $listeners;
@@ -40,6 +43,9 @@ public function getConfig()
         return $this->config;
     }
 
+    /**
+     * @return iterable<mixed, callable>
+     */
     public function getListeners(): iterable
     {
         return $this->listeners;