Add generic types to traversable implementations

derrabus · derrabus · commit d6e26c788bf8 · 2021-11-03T10:24:47.000+01:00
diff --git a/CacheWarmer/ExpressionCacheWarmer.php b/CacheWarmer/ExpressionCacheWarmer.php
@@ -21,7 +21,7 @@ class ExpressionCacheWarmer implements CacheWarmerInterface
     private $expressionLanguage;
 
     /**
-     * @param iterable|Expression[] $expressions
+     * @param iterable<int, Expression> $expressions
      */
     public function __construct(iterable $expressions, ExpressionLanguage $expressionLanguage)
     {
diff --git a/DependencyInjection/MainConfiguration.php b/DependencyInjection/MainConfiguration.php
@@ -42,7 +42,7 @@ class MainConfiguration implements ConfigurationInterface
     private $userProviderFactories;
 
     /**
-     * @param (SecurityFactoryInterface|AuthenticatorFactoryInterface)[] $factories
+     * @param array<int, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
      */
     public function __construct(array $factories, array $userProviderFactories)
     {
@@ -219,6 +219,9 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
+    /**
+     * @param array<int, SecurityFactoryInterface|AuthenticatorFactoryInterface> $factories
+     */
     private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $factories)
     {
         $firewallNodeBuilder = $rootNode
diff --git a/DependencyInjection/SecurityExtension.php b/DependencyInjection/SecurityExtension.php
@@ -1188,7 +1188,7 @@ private function isValidIp(string $cidr): bool
     }
 
     /**
-     * @return (AuthenticatorFactoryInterface|SecurityFactoryInterface)[]
+     * @return array<int, SecurityFactoryInterface|AuthenticatorFactoryInterface>
      */
     private function getSortedFactories(): array
     {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ExpressionCacheWarmer implements CacheWarmerInterface`
`21`	`21`	`private $expressionLanguage;`
`22`	`22`
`23`	`23`	`/**`
`24`		`- * @param iterable\|Expression[] $expressions`
	`24`	`+ * @param iterable<int, Expression> $expressions`
`25`	`25`	`*/`
`26`	`26`	`public function __construct(iterable $expressions, ExpressionLanguage $expressionLanguage)`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class MainConfiguration implements ConfigurationInterface`
`42`	`42`	`private $userProviderFactories;`
`43`	`43`
`44`	`44`	`/**`
`45`		`- * @param (SecurityFactoryInterface\|AuthenticatorFactoryInterface)[] $factories`
	`45`	`+ * @param array<int, SecurityFactoryInterface\|AuthenticatorFactoryInterface> $factories`
`46`	`46`	`*/`
`47`	`47`	`public function __construct(array $factories, array $userProviderFactories)`
`48`	`48`	`{`
`@@ -219,6 +219,9 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)`
`219`	`219`	`;`
`220`	`220`	`}`
`221`	`221`
	`222`	`+ /**`
	`223`	`+ * @param array<int, SecurityFactoryInterface\|AuthenticatorFactoryInterface> $factories`
	`224`	`+ */`
`222`	`225`	`private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $factories)`
`223`	`226`	`{`
`224`	`227`	`$firewallNodeBuilder = $rootNode`
Original file line number	Diff line number	Diff line change
`@@ -1188,7 +1188,7 @@ private function isValidIp(string $cidr): bool`
`1188`	`1188`	`}`
`1189`	`1189`
`1190`	`1190`	`/**`
`1191`		`- * @return (AuthenticatorFactoryInterface\|SecurityFactoryInterface)[]`
	`1191`	`+ * @return array<int, SecurityFactoryInterface\|AuthenticatorFactoryInterface>`
`1192`	`1192`	`*/`
`1193`	`1193`	`private function getSortedFactories(): array`
`1194`	`1194`	`{`