Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit38bc998

Browse files
fancywebnicolas-grekas
authored andcommitted
[DependencyInjection] Fix autocasting null env values to empty string with container.env_var_processors_locator
1 parent69e1127 commit38bc998

File tree

2 files changed

+32
-7
lines changed

2 files changed

+32
-7
lines changed

‎src/Symfony/Component/DependencyInjection/Container.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -391,13 +391,9 @@ protected function getEnv(string $name)
391391
$localName =$name;
392392
}
393393

394-
if ($processors->has($prefix)) {
395-
$processor =$processors->get($prefix);
396-
}else {
397-
$processor =newEnvVarProcessor($this);
398-
if (false ===$i) {
399-
$prefix ='';
400-
}
394+
$processor =$processors->has($prefix) ?$processors->get($prefix) :newEnvVarProcessor($this);
395+
if (false ===$i) {
396+
$prefix ='';
401397
}
402398

403399
$this->resolving[$envName] =true;

‎src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
usePHPUnit\Framework\TestCase;
1515
useSymfony\Component\DependencyInjection\Container;
1616
useSymfony\Component\DependencyInjection\ContainerInterface;
17+
useSymfony\Component\DependencyInjection\EnvVarProcessor;
1718
useSymfony\Component\DependencyInjection\Exception\InvalidArgumentException;
1819
useSymfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
1920
useSymfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
2021
useSymfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
2122
useSymfony\Component\DependencyInjection\ParameterBag\ParameterBag;
23+
useSymfony\Component\DependencyInjection\ServiceLocator;
2224
useSymfony\Contracts\Service\ResetInterface;
2325

2426
class ContainerTestextends TestCase
@@ -405,6 +407,33 @@ public function testRequestAnInternalSharedPrivateService()
405407
$c->get('internal_dependency');
406408
$c->get('internal');
407409
}
410+
411+
publicfunctiontestGetEnvDoesNotAutoCastNullWithDefaultEnvVarProcessor()
412+
{
413+
$container =newContainer();
414+
$container->setParameter('env(FOO)',null);
415+
$container->compile();
416+
417+
$r =new \ReflectionMethod($container,'getEnv');
418+
$r->setAccessible(true);
419+
$this->assertNull($r->invoke($container,'FOO'));
420+
}
421+
422+
publicfunctiontestGetEnvDoesNotAutoCastNullWithEnvVarProcessorsLocatorReturningDefaultEnvVarProcessor()
423+
{
424+
$container =newContainer();
425+
$container->setParameter('env(FOO)',null);
426+
$container->set('container.env_var_processors_locator',newServiceLocator([
427+
'string' =>staticfunction ()use ($container):EnvVarProcessor {
428+
returnnewEnvVarProcessor($container);
429+
},
430+
]));
431+
$container->compile();
432+
433+
$r =new \ReflectionMethod($container,'getEnv');
434+
$r->setAccessible(true);
435+
$this->assertNull($r->invoke($container,'FOO'));
436+
}
408437
}
409438

410439
class ProjectServiceContainerextends Container

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp