bug #52966 [FrameworkBundle] Fix profiling command in web context (HeahDude)

nicolas-grekas · nicolas-grekas · commit f0099d9a0f7d · 2023-12-09T13:02:13.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [FrameworkBundle] Fix profiling command in web context | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #52925 | License | MIT Commits ------- 8a1ced3 [FrameworkBundle] Fix profiling command in web context
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/ConsoleProfilerListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/ConsoleProfilerListener.php
@@ -42,6 +42,7 @@ public function __construct(
         private readonly Profiler $profiler,
         private readonly RequestStack $requestStack,
         private readonly Stopwatch $stopwatch,
+        private readonly bool $cliMode,
         private readonly UrlGeneratorInterface $urlGenerator,
     ) {
         $this->profiles = new \SplObjectStorage();
@@ -59,6 +60,10 @@ public static function getSubscribedEvents(): array
 
     public function initialize(ConsoleCommandEvent $event): void
     {
+        if (!$this->cliMode) {
+            return;
+        }
+
         $input = $event->getInput();
         if (!$input->hasOption('profile') || !$input->getOption('profile')) {
             $this->profiler->disable();
@@ -78,12 +83,16 @@ public function initialize(ConsoleCommandEvent $event): void
 
     public function catch(ConsoleErrorEvent $event): void
     {
+        if (!$this->cliMode) {
+            return;
+        }
+
         $this->error = $event->getError();
     }
 
     public function profile(ConsoleTerminateEvent $event): void
     {
-        if (!$this->profiler->isEnabled()) {
+        if (!$this->cliMode || !$this->profiler->isEnabled()) {
             return;
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.php
@@ -43,6 +43,7 @@
                 service('profiler'),
                 service('.virtual_request_stack'),
                 service('debug.stopwatch'),
+                param('kernel.runtime_mode.cli'),
                 service('router'),
             ])
             ->tag('kernel.event_subscriber')
