bug #38544 [DI] fix dumping env vars (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 75b3d179f9ab · 2020-10-13T13:09:41.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [DI] fix dumping env vars | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Forgotten in #35029 For 4.4 to reduce merge conflicts (it doesn't allow the new chars in 4.4 anyway, #35029 is still needed) Commits ------- 746a8d1 [DI] fix dumping env vars
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1413,7 +1413,7 @@ private function addDefaultParametersMethod(): string
             $export = $this->exportParameters([$value]);
             $export = explode('0 => ', substr(rtrim($export, " ]\n"), 2, -1), 2);
 
-            if (preg_match("/\\\$this->(?:getEnv\('(?:\w++:)*+\w++'\)|targetDir\.'')/", $export[1])) {
+            if (preg_match("/\\\$this->(?:getEnv\('(?:[-.\w]*+:)*+\w++'\)|targetDir\.'')/", $export[1])) {
                 $dynamicPhp[$key] = sprintf('%scase %s: $value = %s; break;', $export[0], $this->export($key), $export[1]);
             } else {
                 $php[] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
@@ -1819,7 +1819,7 @@ private function dumpParameter(string $name): string
                 return $dumpedValue;
             }
 
-            if (!preg_match("/\\\$this->(?:getEnv\('(?:\w++:)*+\w++'\)|targetDir\.'')/", $dumpedValue)) {
+            if (!preg_match("/\\\$this->(?:getEnv\('(?:[-.\w]*+:)*+\w++'\)|targetDir\.'')/", $dumpedValue)) {
                 return sprintf('$this->parameters[%s]', $this->doExport($name));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1413,7 +1413,7 @@ private function addDefaultParametersMethod(): string`
`1413`	`1413`	`$export = $this->exportParameters([$value]);`
`1414`	`1414`	`$export = explode('0 => ', substr(rtrim($export, " ]\n"), 2, -1), 2);`
`1415`	`1415`
`1416`		`- if (preg_match("/\\\$this->(?:getEnv\('(?:\w++:)*+\w++'\)\|targetDir\.'')/", $export[1])) {`
	`1416`	`+ if (preg_match("/\\\$this->(?:getEnv\('(?:[-.\w]+:)+\w++'\)\|targetDir\.'')/", $export[1])) {`
`1417`	`1417`	`$dynamicPhp[$key] = sprintf('%scase %s: $value = %s; break;', $export[0], $this->export($key), $export[1]);`
`1418`	`1418`	`} else {`
`1419`	`1419`	`$php[] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);`
`@@ -1819,7 +1819,7 @@ private function dumpParameter(string $name): string`
`1819`	`1819`	`return $dumpedValue;`
`1820`	`1820`	`}`
`1821`	`1821`
`1822`		`- if (!preg_match("/\\\$this->(?:getEnv\('(?:\w++:)*+\w++'\)\|targetDir\.'')/", $dumpedValue)) {`
	`1822`	`+ if (!preg_match("/\\\$this->(?:getEnv\('(?:[-.\w]+:)+\w++'\)\|targetDir\.'')/", $dumpedValue)) {`
`1823`	`1823`	`return sprintf('$this->parameters[%s]', $this->doExport($name));`
`1824`	`1824`	`}`
`1825`	`1825`	`}`