[Security] Move configuration of collectors to PHP

Judicael · Judicael RUFFIEUX · commit 2176ed23b15b · 2020-06-15T15:56:59.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -135,7 +135,7 @@ public function load(array $configs, ContainerBuilder $container)
             $phpLoader->load('templating_twig.php');
         }
 
-        $loader->load('collectors.xml');
+        $phpLoader->load('collectors.php');
         $loader->load('guard.xml');
 
         if ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {
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

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function load(array $configs, ContainerBuilder $container)`
`135`	`135`	`$phpLoader->load('templating_twig.php');`
`136`	`136`	`}`
`137`	`137`
`138`		`- $loader->load('collectors.xml');`
	`138`	`+ $phpLoader->load('collectors.php');`
`139`	`139`	`$loader->load('guard.xml');`
`140`	`140`
`141`	`141`	`if ($container->hasParameter('kernel.debug') && $container->getParameter('kernel.debug')) {`