Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit a867160554ef · 2019-11-08T22:16:29.000+01:00
* 4.4:
  [DI] fix loading env while env loaders are loaded
diff --git a/EnvVarProcessor.php b/EnvVarProcessor.php
@@ -141,15 +141,20 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
                 }
             }
 
+            $loaders = $this->loaders;
+            $this->loaders = new \ArrayIterator();
+
             try {
-                while ((false === $env || null === $env) && $this->loaders->valid()) {
-                    $loader = $this->loaders->current();
-                    $this->loaders->next();
+                while ((false === $env || null === $env) && $loaders->valid()) {
+                    $loader = $loaders->current();
+                    $loaders->next();
                     $this->loadedVars[] = $vars = $loader->loadEnvVars();
                     $env = $vars[$name] ?? false;
                 }
             } catch (ParameterCircularReferenceException $e) {
                 // skip loaders that need an env var that is not defined
+            } finally {
+                $this->loaders = $loaders;
             }
 
             if (false === $env || null === $env) {

Original file line number	Diff line number	Diff line change
`@@ -141,15 +141,20 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ $loaders = $this->loaders;`
	`145`	`+ $this->loaders = new \ArrayIterator();`
	`146`	`+`
`144`	`147`	`try {`
`145`		`- while ((false === $env \|\| null === $env) && $this->loaders->valid()) {`
`146`		`- $loader = $this->loaders->current();`
`147`		`- $this->loaders->next();`
	`148`	`+ while ((false === $env \|\| null === $env) && $loaders->valid()) {`
	`149`	`+ $loader = $loaders->current();`
	`150`	`+ $loaders->next();`
`148`	`151`	`$this->loadedVars[] = $vars = $loader->loadEnvVars();`
`149`	`152`	`$env = $vars[$name] ?? false;`
`150`	`153`	`}`
`151`	`154`	`} catch (ParameterCircularReferenceException $e) {`
`152`	`155`	`// skip loaders that need an env var that is not defined`
	`156`	`+ } finally {`
	`157`	`+ $this->loaders = $loaders;`
`153`	`158`	`}`
`154`	`159`
`155`	`160`	`if (false === $env \|\| null === $env) {`