Skip to content

Commit d2dc3b2

Browse files
Merge branch '5.0' into 5.1
* 5.0: [SecurityBundle] Drop cache.security_expression_language definition if invalid [DI] disable preload.php on the CLI collect all transformation failures
2 parents d2013a7 + 73667a5 commit d2dc3b2

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,9 @@ public function process(ContainerBuilder $container)
3333
$definition->addMethodCall('registerProvider', [new Reference($id)]);
3434
}
3535
}
36+
37+
if (!$container->hasDefinition('cache.system')) {
38+
$container->removeDefinition('cache.security_expression_language');
39+
}
3640
}
3741
}

Resources/config/security.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<service id="security.user_checker" class="Symfony\Component\Security\Core\User\UserChecker" />
7474

7575
<service id="security.expression_language" class="Symfony\Component\Security\Core\Authorization\ExpressionLanguage">
76-
<argument type="service" id="cache.security_expression_language"></argument>
76+
<argument type="service" id="cache.security_expression_language" on-invalid="null" />
7777
</service>
7878

7979
<service id="security.authentication_utils" class="Symfony\Component\Security\Http\Authentication\AuthenticationUtils" public="true">

Tests/DependencyInjection/CompleteConfigurationTest.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function testUserProviders()
5656

5757
// chain provider
5858
$this->assertEquals([new IteratorArgument([
59-
new Reference('security.user.provider.concrete.service'),
59+
new Reference('user.manager'),
6060
new Reference('security.user.provider.concrete.basic'),
6161
])], $container->getDefinition('security.user.provider.concrete.chain')->getArguments());
6262
}
@@ -70,9 +70,9 @@ public function testFirewalls()
7070
foreach (array_keys($arguments[1]->getValues()) as $contextId) {
7171
$contextDef = $container->getDefinition($contextId);
7272
$arguments = $contextDef->getArguments();
73-
$listeners[] = array_map('strval', $arguments['index_0']->getValues());
73+
$listeners[] = array_map('strval', $arguments[0]->getValues());
7474

75-
$configDef = $container->getDefinition((string) $arguments['index_3']);
75+
$configDef = $container->getDefinition((string) $arguments[3]);
7676
$configs[] = array_values($configDef->getArguments());
7777
}
7878

@@ -87,6 +87,14 @@ public function testFirewalls()
8787
'security.user_checker',
8888
'.security.request_matcher.xmi9dcw',
8989
false,
90+
false,
91+
'',
92+
'',
93+
'',
94+
'',
95+
'',
96+
[],
97+
null,
9098
],
9199
[
92100
'secure',
@@ -637,6 +645,8 @@ protected function getContainer($file)
637645

638646
$container = new ContainerBuilder();
639647
$container->setParameter('kernel.debug', false);
648+
$container->setParameter('request_listener.http_port', 80);
649+
$container->setParameter('request_listener.https_port', 443);
640650

641651
$security = new SecurityExtension();
642652
$container->registerExtension($security);
@@ -645,7 +655,6 @@ protected function getContainer($file)
645655
$bundle->build($container); // Attach all default factories
646656
$this->getLoader($container)->load($file);
647657

648-
$container->getCompilerPassConfig()->setOptimizationPasses([]);
649658
$container->getCompilerPassConfig()->setRemovingPasses([]);
650659
$container->getCompilerPassConfig()->setAfterRemovingPasses([]);
651660
$container->compile();

0 commit comments

Comments
 (0)