Register SecurityRoleHierarchyDumpCommand in the service container

damienfern · damienfern · commit 1375f50a0202 · 2025-09-04T17:33:54.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/SecurityRoleHierarchyDumpCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/SecurityRoleHierarchyDumpCommand.php
@@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $direction = $input->getOption('direction');
 
         if (!MermaidDirectionEnum::tryFrom($direction)) {
-            $io->getErrorStyle()->writeln(\sprintf('<error>Invalid direction, available options are "%s"</error>',  implode('"', $this->getAvailableDirections())));
+            $io->getErrorStyle()->writeln(\sprintf('<error>Invalid direction, available options are "%s"</error>', implode('"', $this->getAvailableDirections())));
 
             return Command::FAILURE;
         }
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterSecurityRoleHierarchyDumpCommandPass.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Compiler/RegisterSecurityRoleHierarchyDumpCommandPass.php
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -186,6 +186,10 @@ public function load(array $configs, ContainerBuilder $container): void
             $container->getDefinition('security.command.user_password_hash')->replaceArgument(1, array_keys($config['password_hashers']));
         }
 
+        if ($container->hasDefinition('security.role_hierarchy')) {
+            $loader->load('security_role_hierarchy_dump_command.php');
+        }
+
         $container->registerForAutoconfiguration(VoterInterface::class)
             ->addTag('security.voter');
     }
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_role_hierarchy_dump_command.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_role_hierarchy_dump_command.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Bundle\SecurityBundle\Command\SecurityRoleHierarchyDumpCommand;
+
+return static function (ContainerConfigurator $container): void {
+    $container->services()
+        ->set('security.command.role_hierarchy_dump', SecurityRoleHierarchyDumpCommand::class)
+            ->args([
+                service('security.role_hierarchy'),
+            ])
+            ->tag('console.command')
+    ;
+};
diff --git a/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php b/src/Symfony/Bundle/SecurityBundle/SecurityBundle.php
@@ -20,7 +20,6 @@
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterEntryPointPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterGlobalSecurityEventListenersPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterLdapLocatorPass;
-use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterSecurityRoleHierarchyDumpCommandPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterTokenUsageTrackingPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\ReplaceDecoratedRememberMeHandlerPass;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\SortFirewallListenersPass;
@@ -108,7 +107,5 @@ public function build(ContainerBuilder $container): void
 
         // must be registered before DecoratorServicePass
         $container->addCompilerPass(new MakeFirewallsEventDispatcherTraceablePass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 10);
-
-        $container->addCompilerPass(new RegisterSecurityRoleHierarchyDumpCommandPass());
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterSecurityRoleHierarchyDumpCommandPassTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Compiler/RegisterSecurityRoleHierarchyDumpCommandPassTest.php
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -141,6 +141,24 @@ public function testSwitchUserNotStatelessOnStatelessFirewall()
         $this->assertTrue($container->getDefinition('security.authentication.switchuser_listener.some_firewall')->getArgument(9));
     }
 
+    public function testRoleHierarchyDumpCommandIsRegisteredWithRoleHierarchy()
+    {
+        $container = $this->getRawContainer();
+        $container->loadFromExtension('security', [
+            'role_hierarchy' => [
+                'ROLE_ADMIN' => ['ROLE_USER'],
+                'ROLE_SUPER_ADMIN' => ['ROLE_ADMIN', 'ROLE_ALLOWED_TO_SWITCH'],
+            ],
+            'firewalls' => [
+                'some_firewall' => [
+                ],
+            ],
+        ]);
+        $container->compile();
+
+        $this->assertTrue($container->hasDefinition('security.command.role_hierarchy_dump'));
+    }
+
     public function testPerListenerProvider()
     {
         $container = $this->getRawContainer();

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`71`	`71`	`$direction = $input->getOption('direction');`
`72`	`72`
`73`	`73`	`if (!MermaidDirectionEnum::tryFrom($direction)) {`
`74`		`- $io->getErrorStyle()->writeln(\sprintf('<error>Invalid direction, available options are "%s"</error>', implode('"', $this->getAvailableDirections())));`
	`74`	`+ $io->getErrorStyle()->writeln(\sprintf('<error>Invalid direction, available options are "%s"</error>', implode('"', $this->getAvailableDirections())));`
`75`	`75`
`76`	`76`	`return Command::FAILURE;`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,10 @@ public function load(array $configs, ContainerBuilder $container): void`
`186`	`186`	`$container->getDefinition('security.command.user_password_hash')->replaceArgument(1, array_keys($config['password_hashers']));`
`187`	`187`	`}`
`188`	`188`
	`189`	`+ if ($container->hasDefinition('security.role_hierarchy')) {`
	`190`	`+ $loader->load('security_role_hierarchy_dump_command.php');`
	`191`	`+ }`
	`192`	`+`
`189`	`193`	`$container->registerForAutoconfiguration(VoterInterface::class)`
`190`	`194`	`->addTag('security.voter');`
`191`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterEntryPointPass;`
`21`	`21`	`use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterGlobalSecurityEventListenersPass;`
`22`	`22`	`use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterLdapLocatorPass;`
`23`		`-use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterSecurityRoleHierarchyDumpCommandPass;`
`24`	`23`	`use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\RegisterTokenUsageTrackingPass;`
`25`	`24`	`use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\ReplaceDecoratedRememberMeHandlerPass;`
`26`	`25`	`use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\SortFirewallListenersPass;`
`@@ -108,7 +107,5 @@ public function build(ContainerBuilder $container): void`
`108`	`107`
`109`	`108`	`// must be registered before DecoratorServicePass`
`110`	`109`	`$container->addCompilerPass(new MakeFirewallsEventDispatcherTraceablePass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 10);`
`111`		`-`
`112`		`- $container->addCompilerPass(new RegisterSecurityRoleHierarchyDumpCommandPass());`
`113`	`110`	`}`
`114`	`111`	`}`