Fix EnvVar not loaded when Loader requires an env var

jderusse · jderusse · commit c371297c64c1 · 2020-01-15T23:49:33.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -22,6 +22,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
 {
     private $container;
     private $loaders;
+    private $loadedLoaderIndex = 0;
     private $loadedVars = [];
 
     /**
@@ -30,8 +31,7 @@ class EnvVarProcessor implements EnvVarProcessorInterface
     public function __construct(ContainerInterface $container, \Traversable $loaders = null)
     {
         $this->container = $container;
-        $this->loaders = new \IteratorIterator($loaders ?? new \ArrayIterator());
-        $this->loaders = $this->loaders->getInnerIterator();
+        $this->loaders = $loaders ?? new \ArrayIterator();
     }
 
     /**
@@ -145,11 +145,22 @@ public function getEnv($prefix, $name, \Closure $getEnv)
             $this->loaders = new \ArrayIterator();
 
             try {
-                while ((false === $env || null === $env) && $loaders->valid()) {
-                    $loader = $loaders->current();
-                    $loaders->next();
+                $index = 0;
+                $ended = true;
+                foreach ($loaders as $loader) {
+                    if ($index++ < $this->loadedLoaderIndex) {
+                        continue;
+                    }
                     $this->loadedVars[] = $vars = $loader->loadEnvVars();
+                    $this->loadedLoaderIndex = $index;
                     $env = $vars[$name] ?? false;
+                    if (false !== $env) {
+                        $ended = false;
+                        break;
+                    }
+                }
+                if ($ended) {
+                    $loaders = new \ArrayIterator();
                 }
             } catch (ParameterCircularReferenceException $e) {
                 // skip loaders that need an env var that is not defined
