[HttpKernel] fix registering DebugHandlersListener regardless of the PHP_SAPI

nicolas-grekas · nicolas-grekas · commit 0bb63672cb24 · 2020-02-14T11:01:23.000+01:00
diff --git a/EventListener/DebugHandlersListener.php b/EventListener/DebugHandlersListener.php
@@ -65,6 +65,9 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $
      */
     public function configure(Event $event = null)
     {
+        if ($event instanceof ConsoleEvent && !\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
+            return;
+        }
         if (!$event instanceof KernelEvent ? !$this->firstCall : !$event->isMasterRequest()) {
             return;
         }
@@ -148,7 +151,7 @@ public static function getSubscribedEvents()
     {
         $events = [KernelEvents::REQUEST => ['configure', 2048]];
 
-        if ('cli' === \PHP_SAPI && \defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
+        if (\defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
             $events[ConsoleEvents::COMMAND] = ['configure', 2048];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,9 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $`
`65`	`65`	`*/`
`66`	`66`	`public function configure(Event $event = null)`
`67`	`67`	`{`
	`68`	`+ if ($event instanceof ConsoleEvent && !\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {`
	`69`	`+ return;`
	`70`	`+ }`
`68`	`71`	`if (!$event instanceof KernelEvent ? !$this->firstCall : !$event->isMasterRequest()) {`
`69`	`72`	`return;`
`70`	`73`	`}`
`@@ -148,7 +151,7 @@ public static function getSubscribedEvents()`
`148`	`151`	`{`
`149`	`152`	`$events = [KernelEvents::REQUEST => ['configure', 2048]];`
`150`	`153`
`151`		`- if ('cli' === \PHP_SAPI && \defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {`
	`154`	`+ if (\defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {`
`152`	`155`	`$events[ConsoleEvents::COMMAND] = ['configure', 2048];`
`153`	`156`	`}`
`154`	`157`