Sync Security\ExpressionLanguage constructor with parent

kor3k · nicolas-grekas · commit fc11cec4a3ec · 2025-01-07T11:50:39.000+01:00
change typehint array -&gt; iterable
diff --git a/ExpressionLanguage.php b/ExpressionLanguage.php
@@ -27,8 +27,12 @@
  */
 class ExpressionLanguage extends BaseExpressionLanguage
 {
-    public function __construct(?CacheItemPoolInterface $cache = null, array $providers = [], ?callable $serviceCompiler = null, ?\Closure $getEnv = null)
+    public function __construct(?CacheItemPoolInterface $cache = null, iterable $providers = [], ?callable $serviceCompiler = null, ?\Closure $getEnv = null)
     {
+        if (!\is_array($providers)) {
+            $providers = iterator_to_array($providers, false);
+        }
+
         // prepend the default provider to let users override it easily
         array_unshift($providers, new ExpressionLanguageProvider($serviceCompiler, $getEnv));
 

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,12 @@`
`27`	`27`	`*/`
`28`	`28`	`class ExpressionLanguage extends BaseExpressionLanguage`
`29`	`29`	`{`
`30`		`- public function __construct(?CacheItemPoolInterface $cache = null, array $providers = [], ?callable $serviceCompiler = null, ?\Closure $getEnv = null)`
	`30`	`+ public function __construct(?CacheItemPoolInterface $cache = null, iterable $providers = [], ?callable $serviceCompiler = null, ?\Closure $getEnv = null)`
`31`	`31`	`{`
	`32`	`+ if (!\is_array($providers)) {`
	`33`	`+ $providers = iterator_to_array($providers, false);`
	`34`	`+ }`
	`35`	`+`
`32`	`36`	`// prepend the default provider to let users override it easily`
`33`	`37`	`array_unshift($providers, new ExpressionLanguageProvider($serviceCompiler, $getEnv));`
`34`	`38`