8000 Use new security.firewalls instead of a tag · symfony/symfony@88d92a2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 88d92a2

Browse files
schebscheb
committed
Use new security.firewalls instead of a tag
1 parent 394deb5 commit 88d92a2

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ class UnusedTagsPass implements CompilerPassInterface
7373
'routing.loader',
7474
'routing.route_loader',
7575
'security.expression_language_provider',
76-
'security.firewall_map_context',
7776
'security.remember_me_aware',
7877
'security.voter',
7978
'serializer.encoder',

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/SortFirewallListenersPass.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@ class SortFirewallListenersPass implements CompilerPassInterface
2828
{
2929
public function process(ContainerBuilder $container): void
3030
{
31-
$taggedServices = $container->findTaggedServiceIds('security.firewall_map_context');
32-
foreach ($taggedServices as $serviceId => $attributes) {
33-
$firewallContextDefinition = $container->getDefinition($serviceId);
31+
if (!$container->hasParameter('security.firewalls')) {
32+
return;
33+
}
34+
35+
foreach ($container->getParameter('security.firewalls') as $firewallName) {
36+
$firewallContextDefinition = $container->getDefinition('security.firewall.map.context.'.$firewallName);
3437
$this->sortFirewallContextListeners($firewallContextDefinition, $container);
3538
}
3639
}

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ private function createFirewalls(array $config, ContainerBuilder $container)
286286
->replaceArgument(1, $exceptionListener)
287287
->replaceArgument(2, $logoutListener)
288288
->replaceArgument(3, new Reference($configId))
289-
->addTag('security.firewall_map_context')
290289
;
291290

292291
$contextRefs[$contextId] = new Reference($contextId);

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/SortFirewallListenersPassTest.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class SortFirewallListenersPassTest extends TestCase
2424
public function testSortFirewallListeners()
2525
{
2626
$container = new ContainerBuilder();
27+
$container->setParameter('security.firewalls', ['main']);
2728

2829
$container->register('listener_priority_minus1', FirewallListenerPriorityMinus1::class);
2930
$container->register('listener_priority_1', FirewallListenerPriority1::class);

0 commit comments

Comments
 (0)
0