[DependencyInjection] resolve env variables

jderusse · jderusse · commit c61768001ab8 · 2019-04-08T09:10:02.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -461,7 +461,7 @@ protected function load($file)
      *
      * @throws EnvNotFoundException When the environment variable is not found and has no default value
      */
-    protected function getEnv($name)
+    public function getEnv($name)
     {
         if (isset($this->resolving[$envName = "env($name)"])) {
             throw new ParameterCircularReferenceException(array_keys($this->resolving));
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1569,7 +1569,7 @@ public static function hash($value)
     /**
      * {@inheritdoc}
      */
-    protected function getEnv($name)
+    public function getEnv($name)
     {
         $value = parent::getEnv($name);
         $bag = $this->getParameterBag();
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -140,7 +140,17 @@ public function getEnv($prefix, $name, \Closure $getEnv)
                 if (!isset($match[1])) {
                     return '%';
                 }
-                $value = $this->container->getParameter($match[1]);
+
+                $subEnv = $match[1];
+                if ($container instanceof Container) {
+                    if (0 === strpos($subEnv, 'env(') && ')' === substr($subEnv, -1) && 'env()' !== $subEnv) {
+                        $subEnv = substr($subEnv, 4, -1);
+                    }
+
+                    $value = $this->container->getEnv($subEnv);
+                } else {
+                    $value = $this->container->getParameter($subEnv);
+                }
                 if (!is_scalar($value)) {
                     throw new RuntimeException(sprintf('Parameter "%s" found when resolving env var "%s" must be scalar, "%s" given.', $match[1], $name, \gettype($value)));
                 }

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ protected function load($file)`
`461`	`461`	`*`
`462`	`462`	`* @throws EnvNotFoundException When the environment variable is not found and has no default value`
`463`	`463`	`*/`
`464`		`- protected function getEnv($name)`
	`464`	`+ public function getEnv($name)`
`465`	`465`	`{`
`466`	`466`	`if (isset($this->resolving[$envName = "env($name)"])) {`
`467`	`467`	`throw new ParameterCircularReferenceException(array_keys($this->resolving));`
Original file line number	Diff line number	Diff line change
`@@ -1569,7 +1569,7 @@ public static function hash($value)`
`1569`	`1569`	`/**`
`1570`	`1570`	`* {@inheritdoc}`
`1571`	`1571`	`*/`
`1572`		`- protected function getEnv($name)`
	`1572`	`+ public function getEnv($name)`
`1573`	`1573`	`{`
`1574`	`1574`	`$value = parent::getEnv($name);`
`1575`	`1575`	`$bag = $this->getParameterBag();`