From 522bd5d99de955f0a2a0f4a092b6caa46840ec9c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 8 Nov 2019 21:45:24 +0100 Subject: [PATCH] [DI] fix loading env while env loaders are loaded --- .../Component/DependencyInjection/EnvVarProcessor.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php index 6451ac9b0e9d3..724187b1dbfe7 100644 --- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php +++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php @@ -141,15 +141,20 @@ public function getEnv($prefix, $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) { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy