bug #52274 [FrameworkBundle] re-introduce conflict rule with WebProfilerBundle < 6.4 (xabbuh)

fabpot · fabpot · commit b3bfc6deb87d · 2023-10-24T23:42:43.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [FrameworkBundle] re-introduce conflict rule with WebProfilerBundle < 6.4 | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #52271 | License | MIT Commits ------- 850afbb re-introduce conflict rule with WebProfilerBundle < 6.4
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -861,7 +861,6 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
         $loader->load('profiling.php');
         $loader->load('collectors.php');
         $loader->load('cache_debug.php');
-        $loader->load('console_debug.php');
 
         if ($this->isInitializedConfigEnabled('form')) {
             $loader->load('form_debug.php');
@@ -923,7 +922,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
             $container->removeDefinition('console_profiler_listener');
         }
 
-        if (!$container->getParameter('kernel.debug') || !class_exists(CliRequest::class) || !class_exists(CommandDataCollector::class)) {
+        if (!class_exists(CommandDataCollector::class)) {
             $container->removeDefinition('.data_collector.command');
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector;
+use Symfony\Component\Console\DataCollector\CommandDataCollector;
 use Symfony\Component\HttpKernel\DataCollector\AjaxDataCollector;
 use Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector;
 use Symfony\Component\HttpKernel\DataCollector\EventDataCollector;
@@ -74,5 +75,8 @@
         ->set('data_collector.router', RouterDataCollector::class)
             ->tag('kernel.event_listener', ['event' => KernelEvents::CONTROLLER, 'method' => 'onKernelController'])
             ->tag('data_collector', ['template' => '@WebProfiler/Collector/router.html.twig', 'id' => 'router', 'priority' => 285])
+
+        ->set('.data_collector.command', CommandDataCollector::class)
+            ->tag('data_collector', ['template' => '@WebProfiler/Collector/command.html.twig', 'id' => 'command', 'priority' => 335])
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console_debug.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console_debug.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -101,7 +101,7 @@
         "symfony/twig-bridge": "<5.4",
         "symfony/twig-bundle": "<5.4",
         "symfony/validator": "<6.4",
-        "symfony/web-profiler-bundle": "<5.4",
+        "symfony/web-profiler-bundle": "<6.4",
         "symfony/workflow": "<6.4"
     },
     "autoload": {

Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,6 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $`
`861`	`861`	`$loader->load('profiling.php');`
`862`	`862`	`$loader->load('collectors.php');`
`863`	`863`	`$loader->load('cache_debug.php');`
`864`		`- $loader->load('console_debug.php');`
`865`	`864`
`866`	`865`	`if ($this->isInitializedConfigEnabled('form')) {`
`867`	`866`	`$loader->load('form_debug.php');`
`@@ -923,7 +922,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $`
`923`	`922`	`$container->removeDefinition('console_profiler_listener');`
`924`	`923`	`}`
`925`	`924`
`926`		`- if (!$container->getParameter('kernel.debug') \|\| !class_exists(CliRequest::class) \|\| !class_exists(CommandDataCollector::class)) {`
	`925`	`+ if (!class_exists(CommandDataCollector::class)) {`
`927`	`926`	`$container->removeDefinition('.data_collector.command');`
`928`	`927`	`}`
`929`	`928`	`}`