Fix stripos(array, string) bug with array env vars

Thomason, James · Thomason, James · commit bf5577515873 · 2018-05-14T13:36:44.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1408,16 +1408,18 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
         }
         $envPlaceholders = $bag instanceof EnvPlaceholderParameterBag ? $bag->getEnvPlaceholders() : $this->envPlaceholders;
 
+        $completed = false;
         foreach ($envPlaceholders as $env => $placeholders) {
             foreach ($placeholders as $placeholder) {
-                if (false !== stripos($value, $placeholder)) {
+                if (\is_string($value) && false !== stripos($value, $placeholder)) {
                     if (true === $format) {
                         $resolved = $bag->escapeValue($this->getEnv($env));
                     } else {
                         $resolved = sprintf($format, $env);
                     }
                     if ($placeholder === $value) {
                         $value = $resolved;
+                        $completed = true;
                     } else {
                         if (!is_string($resolved) && !is_numeric($resolved)) {
                             throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "env(%s)" of type %s inside string value "%s".', $env, gettype($resolved), $value));
@@ -1426,6 +1428,10 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs
                     }
                     $usedEnvs[$env] = $env;
                     $this->envCounters[$env] = isset($this->envCounters[$env]) ? 1 + $this->envCounters[$env] : 1;
+
+                    if ($completed) {
+                        break 2;
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1408,16 +1408,18 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs`
`1408`	`1408`	`}`
`1409`	`1409`	`$envPlaceholders = $bag instanceof EnvPlaceholderParameterBag ? $bag->getEnvPlaceholders() : $this->envPlaceholders;`
`1410`	`1410`
	`1411`	`+ $completed = false;`
`1411`	`1412`	`foreach ($envPlaceholders as $env => $placeholders) {`
`1412`	`1413`	`foreach ($placeholders as $placeholder) {`
`1413`		`- if (false !== stripos($value, $placeholder)) {`
	`1414`	`+ if (\is_string($value) && false !== stripos($value, $placeholder)) {`
`1414`	`1415`	`if (true === $format) {`
`1415`	`1416`	`$resolved = $bag->escapeValue($this->getEnv($env));`
`1416`	`1417`	`} else {`
`1417`	`1418`	`$resolved = sprintf($format, $env);`
`1418`	`1419`	`}`
`1419`	`1420`	`if ($placeholder === $value) {`
`1420`	`1421`	`$value = $resolved;`
	`1422`	`+ $completed = true;`
`1421`	`1423`	`} else {`
`1422`	`1424`	`if (!is_string($resolved) && !is_numeric($resolved)) {`
`1423`	`1425`	`throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "env(%s)" of type %s inside string value "%s".', $env, gettype($resolved), $value));`
`@@ -1426,6 +1428,10 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs`
`1426`	`1428`	`}`
`1427`	`1429`	`$usedEnvs[$env] = $env;`
`1428`	`1430`	`$this->envCounters[$env] = isset($this->envCounters[$env]) ? 1 + $this->envCounters[$env] : 1;`
	`1431`	`+`
	`1432`	`+ if ($completed) {`
	`1433`	`+ break 2;`
	`1434`	`+ }`
`1429`	`1435`	`}`
`1430`	`1436`	`}`
`1431`	`1437`	`}`