[DI] fix dumping env vars
This commit is contained in:
parent
a580688ee5
commit
746a8d1a09
@ -1413,7 +1413,7 @@ EOF;
|
|||||||
$export = $this->exportParameters([$value]);
|
$export = $this->exportParameters([$value]);
|
||||||
$export = explode('0 => ', substr(rtrim($export, " ]\n"), 2, -1), 2);
|
$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]);
|
$dynamicPhp[$key] = sprintf('%scase %s: $value = %s; break;', $export[0], $this->export($key), $export[1]);
|
||||||
} else {
|
} else {
|
||||||
$php[] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
|
$php[] = sprintf('%s%s => %s,', $export[0], $this->export($key), $export[1]);
|
||||||
@ -1819,7 +1819,7 @@ EOF;
|
|||||||
return $dumpedValue;
|
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));
|
return sprintf('$this->parameters[%s]', $this->doExport($name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user