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

Commit73f1ac5

Browse files
[DI] Fix tracking of env vars in exceptions
1 parentca5b15a commit73f1ac5

File tree

2 files changed

+52
-10
lines changed

2 files changed

+52
-10
lines changed

‎src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,26 @@ public function process(ContainerBuilder $container)
5252
}
5353
$config =$resolvingBag->resolveValue($config);
5454

55-
$tmpContainer =newContainerBuilder($resolvingBag);
56-
$tmpContainer->setResourceTracking($container->isTrackingResources());
57-
$tmpContainer->addObjectResource($extension);
58-
if ($extensioninstanceof ConfigurationExtensionInterface &&null !==$configuration =$extension->getConfiguration($config,$tmpContainer)) {
59-
$tmpContainer->addObjectResource($configuration);
60-
}
55+
try {
56+
$tmpContainer =newContainerBuilder($resolvingBag);
57+
$tmpContainer->setResourceTracking($container->isTrackingResources());
58+
$tmpContainer->addObjectResource($extension);
59+
if ($extensioninstanceof ConfigurationExtensionInterface &&null !==$configuration =$extension->getConfiguration($config,$tmpContainer)) {
60+
$tmpContainer->addObjectResource($configuration);
61+
}
6162

62-
foreach ($exprLangProvidersas$provider) {
63-
$tmpContainer->addExpressionLanguageProvider($provider);
64-
}
63+
foreach ($exprLangProvidersas$provider) {
64+
$tmpContainer->addExpressionLanguageProvider($provider);
65+
}
6566

66-
$extension->load($config,$tmpContainer);
67+
$extension->load($config,$tmpContainer);
68+
}catch (\Exception$e) {
69+
if ($resolvingBaginstanceof MergeExtensionConfigurationParameterBag) {
70+
$container->getParameterBag()->mergeEnvPlaceholders($resolvingBag);
71+
}
72+
73+
throw$e;
74+
}
6775

6876
if ($resolvingBaginstanceof MergeExtensionConfigurationParameterBag) {
6977
// don't keep track of env vars that are *overridden* when configs are merged

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,22 @@ public function testOverriddenEnvsAreMerged()
8484
$this->assertSame(array('BAZ','FOO'),array_keys($container->getParameterBag()->getEnvPlaceholders()));
8585
$this->assertSame(array('BAZ' =>1,'FOO' =>0),$container->getEnvCounters());
8686
}
87+
88+
publicfunctiontestThrowingExtensionsGetMergedBag()
89+
{
90+
$container =newContainerBuilder();
91+
$container->registerExtension(newThrowingExtension());
92+
$container->prependExtensionConfig('throwing',array('bar' =>'%env(FOO)%'));
93+
94+
try {
95+
$pass =newMergeExtensionConfigurationPass();
96+
$pass->process($container);
97+
$this->fail('An exception should have been thrown.');
98+
}catch (\Exception$e) {
99+
}
100+
101+
$this->assertSame(array('FOO'),array_keys($container->getParameterBag()->getEnvPlaceholders()));
102+
}
87103
}
88104

89105
class FooConfigurationimplements ConfigurationInterface
@@ -125,3 +141,21 @@ public function load(array $configs, ContainerBuilder $container)
125141
}
126142
}
127143
}
144+
145+
class ThrowingExtensionextends Extension
146+
{
147+
publicfunctiongetAlias()
148+
{
149+
return'throwing';
150+
}
151+
152+
publicfunctiongetConfiguration(array$config,ContainerBuilder$container)
153+
{
154+
returnnewFooConfiguration();
155+
}
156+
157+
publicfunctionload(array$configs,ContainerBuilder$container)
158+
{
159+
thrownew \Exception();
160+
}
161+
}

0 commit comments

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