Use new security.firewalls instead of a tag

scheb · scheb · commit 88d92a2e9ea0 · 2020-06-24T19:03:22.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -73,7 +73,6 @@ class UnusedTagsPass implements CompilerPassInterface
         'routing.loader',
         'routing.route_loader',
         'security.expression_language_provider',
-        'security.firewall_map_context',
         'security.remember_me_aware',
         'security.voter',
         'serializer.encoder',
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/SortFirewallListenersPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/SortFirewallListenersPass.php
@@ -28,9 +28,12 @@ class SortFirewallListenersPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        $taggedServices = $container->findTaggedServiceIds('security.firewall_map_context');
-        foreach ($taggedServices as $serviceId => $attributes) {
-            $firewallContextDefinition = $container->getDefinition($serviceId);
+        if (!$container->hasParameter('security.firewalls')) {
+            return;
+        }
+
+        foreach ($container->getParameter('security.firewalls') as $firewallName) {
+            $firewallContextDefinition = $container->getDefinition('security.firewall.map.context.'.$firewallName);
             $this->sortFirewallContextListeners($firewallContextDefinition, $container);
         }
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -286,7 +286,6 @@ private function createFirewalls(array $config, ContainerBuilder $container)
                 ->replaceArgument(1, $exceptionListener)
                 ->replaceArgument(2, $logoutListener)
                 ->replaceArgument(3, new Reference($configId))
-                ->addTag('security.firewall_map_context')
             ;
 
             $contextRefs[$contextId] = new Reference($contextId);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/SortFirewallListenersPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/SortFirewallListenersPassTest.php
@@ -24,6 +24,7 @@ class SortFirewallListenersPassTest extends TestCase
     public function testSortFirewallListeners()
     {
         $container = new ContainerBuilder();
+        $container->setParameter('security.firewalls', ['main']);
 
         $container->register('listener_priority_minus1', FirewallListenerPriorityMinus1::class);
         $container->register('listener_priority_1', FirewallListenerPriority1::class);

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,12 @@ class SortFirewallListenersPass implements CompilerPassInterface`
`28`	`28`	`{`
`29`	`29`	`public function process(ContainerBuilder $container): void`
`30`	`30`	`{`
`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);`
`34`	`37`	`$this->sortFirewallContextListeners($firewallContextDefinition, $container);`
`35`	`38`	`}`
`36`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,6 @@ private function createFirewalls(array $config, ContainerBuilder $container)`
`286`	`286`	`->replaceArgument(1, $exceptionListener)`
`287`	`287`	`->replaceArgument(2, $logoutListener)`
`288`	`288`	`->replaceArgument(3, new Reference($configId))`
`289`		`- ->addTag('security.firewall_map_context')`
`290`	`289`	`;`
`291`	`290`
`292`	`291`	`$contextRefs[$contextId] = new Reference($contextId);`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ class SortFirewallListenersPassTest extends TestCase`
`24`	`24`	`public function testSortFirewallListeners()`
`25`	`25`	`{`
`26`	`26`	`$container = new ContainerBuilder();`
	`27`	`+ $container->setParameter('security.firewalls', ['main']);`
`27`	`28`
`28`	`29`	`$container->register('listener_priority_minus1', FirewallListenerPriorityMinus1::class);`
`29`	`30`	`$container->register('listener_priority_1', FirewallListenerPriority1::class);`