diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "bug #29409 Fix env fallback to an unresolved variable (jderusse)"

Browse Source 
This reverts commit ab95ae3f7a, reversing
changes made to 8a6090793b.
This commit is contained in:
Nicolas Grekas 2018-12-17 15:44:10 +01:00
parent 5dd8a0ca98
commit 64e2449f8e
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View File

@ -1534,15 +1534,11 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
return $value;
}
$envPlaceholders = $bag->getEnvPlaceholders();
if (isset($envPlaceholders[$name][$value])) {
$bag = new ParameterBag($bag->all());
return $bag->unescapeValue($bag->get("env($name)"));
}
foreach ($envPlaceholders as $env => $placeholders) {
foreach ($bag->getEnvPlaceholders() as $env => $placeholders) {
if (isset($placeholders[$value])) {
return $this->getEnv($env);
$bag = new ParameterBag($bag->all());
return $bag->unescapeValue($bag->get("env($name)"));
}
}

14
src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
View File

@ -738,20 +738,6 @@ class ContainerBuilderTest extends TestCase
$this->assertSame('someFooBar', $container->getParameter('baz'));
}
public function testFallbackEnv()
{
putenv('DUMMY_FOO=foo');
$container = new ContainerBuilder();
$container->setParameter('foo', '%env(DUMMY_FOO)%');
$container->setParameter('bar', 'bar%env(default:foo:DUMMY_BAR)%');
$container->compile(true);
putenv('DUMMY_FOO');
$this->assertSame('barfoo', $container->getParameter('bar'));
}
public function testCastEnv()
{
$container = new ContainerBuilder();