From 850afbb194e64230fa8e3242ea3cdcda933c462f Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 24 Oct 2023 17:10:17 +0200 Subject: [PATCH] re-introduce conflict rule with WebProfilerBundle < 6.4 --- .../FrameworkExtension.php | 3 +-- .../Resources/config/collectors.php | 4 ++++ .../Resources/config/console_debug.php | 21 ------------------- .../Bundle/FrameworkBundle/composer.json | 2 +- 4 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/config/console_debug.php diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index d8913ba6cd274..132904c303f1d 100644 --- 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 index 5788db71f6bc0..aa6d4e33c3466 100644 --- 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 deleted file mode 100644 index 07cdcf688a01b..0000000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console_debug.php +++ /dev/null @@ -1,21 +0,0 @@ - - * - * 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\Console\DataCollector\CommandDataCollector; - -return static function (ContainerConfigurator $container) { - $container->services() - ->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/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 93b769709240a..7d9bf9cdb2c94 100644 --- 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": {