[HttpKernel] Prevent a fatal error when DebugHandlersListener is used…

… with a kernel with no terminateWithException() method
symfony · Feb 16, 2016 · 2849152 · 2849152
1 parent 1c79c7b
commit 2849152
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -93,7 +93,9 @@ public function configure(Event $event = null)
         }
         if (!$this->exceptionHandler) {
             if ($event instanceof KernelEvent) {
-                $this->exceptionHandler = array($event->getKernel(), 'terminateWithException');
+                if (method_exists($event->getKernel(), 'terminateWithException')) {
+                    $this->exceptionHandler = array($event->getKernel(), 'terminateWithException');
+                }
             } elseif ($event instanceof ConsoleEvent && $app = $event->getCommand()->getApplication()) {
                 $output = $event->getOutput();
                 if ($output instanceof ConsoleOutputInterface) {

diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/DebugHandlersListenerTest.php
@@ -21,7 +21,10 @@
 use Symfony\Component\Debug\ErrorHandler;
 use Symfony\Component\Debug\ExceptionHandler;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\KernelEvent;
 use Symfony\Component\HttpKernel\EventListener\DebugHandlersListener;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
@@ -62,6 +65,31 @@ public function testConfigure()
         $this->assertSame(array($logger, LogLevel::INFO), $loggers[E_DEPRECATED]);
     }
 
+    public function testConfigureForHttpKernelWithNoTerminateWithException()
+    {
+        $listener = new DebugHandlersListener(null);
+        $eHandler = new ErrorHandler();
+        $event = new KernelEvent(
+            $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'),
+            Request::create('/'),
+            HttpKernelInterface::MASTER_REQUEST
+        );
+
+        $exception = null;
+        $h = set_exception_handler(array($eHandler, 'handleException'));
+        try {
+            $listener->configure($event);
+        } catch (\Exception $exception) {
+        }
+        restore_exception_handler();
+
+        if (null !== $exception) {
+            throw $exception;
+        }
+
+        $this->assertNull($h);
+    }
+
     public function testConsoleEvent()
     {
         $dispatcher = new EventDispatcher();