symfony · Tobion · Jun 15, 2020 · Jun 11, 2020 · Jun 11, 2020 · Jun 11, 2020
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -135,8 +135,8 @@ public function load(array $configs, ContainerBuilder $container)
             $phpLoader->load('templating_twig.php');
         }
 
-        $loader->load('collectors.xml');
-        $loader->load('guard.xml');
+        $phpLoader->load('collectors.php');
+        $phpLoader->load('guard.php');
 
         if ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
             $loader->load('security_debug.xml');
@@ -177,7 +177,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if (class_exists(Application::class)) {
-            $loader->load('console.xml');
+            $phpLoader->load('console.php');
             $container->getDefinition('security.command.user_password_encoder')->replaceArgument(1, array_keys($config['encoders']));
         }
 

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.php
@@ -0,0 +1,33 @@
+<?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\DataCollector\SecurityDataCollector;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('data_collector.security', SecurityDataCollector::class)
+            ->args([
+                service('security.untracked_token_storage'),
+                service('security.role_hierarchy'),
+                service('security.logout_url_generator'),
+                service('security.access.decision_manager'),
+                service('security.firewall.map'),
+                service('debug.security.firewall')->nullOnInvalid(),
+            ])
+            ->tag('data_collector', [
+                'template' => '@Security/Collector/security.html.twig',
+                'id' => 'security',
+                'priority' => 270,
+            ])
+    ;
+};
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/collectors.xml
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/console.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/console.php
@@ -0,0 +1,25 @@
+<?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\UserPasswordEncoderCommand;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('security.command.user_password_encoder', UserPasswordEncoderCommand::class)
+            ->args([
+                service('security.encoder_factory'),
+                abstract_arg('encoders user classes'),
+            ])
+            ->tag('console.command', ['command' => 'security:encode-password'])
+    ;
+};
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.php b/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.php
@@ -0,0 +1,51 @@
+<?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\Component\Security\Guard\Firewall\GuardAuthenticationListener;
+use Symfony\Component\Security\Guard\GuardAuthenticatorHandler;
+use Symfony\Component\Security\Guard\Provider\GuardAuthenticationProvider;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        ->set('security.authentication.guard_handler', GuardAuthenticatorHandler::class)
+            ->args([
+                service('security.token_storage'),
+                service('event_dispatcher')->nullOnInvalid(),
+                abstract_arg('stateless firewall keys'),
+            ])
+            ->call('setSessionAuthenticationStrategy', [service('security.authentication.session_strategy')])
+
+        ->alias(GuardAuthenticatorHandler::class, 'security.authentication.guard_handler')
+
+        ->set('security.authentication.provider.guard', GuardAuthenticationProvider::class)
+            ->abstract()
+            ->args([
+                abstract_arg('Authenticators'),
+                abstract_arg('User Provider'),
+                abstract_arg('Provider-shared Key'),
+                abstract_arg('User Checker'),
+                service('security.password_encoder'),
+            ])
+
+        ->set('security.authentication.listener.guard', GuardAuthenticationListener::class)
+            ->abstract()
+            ->args([
+                service('security.authentication.guard_handler'),
+                service('security.authentication.manager'),
+                abstract_arg('Provider-shared Key'),
+                abstract_arg('Authenticators'),
+                service('logger')->nullOnInvalid(),
+            ])
+            ->tag('monolog.logger', ['channel' => 'security'])
+    ;
+};
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/guard.xml