[Debug] fix and enhance exception messages

Author: nicolas-grekas

EventListener/DebugHandlersListener.php

@@ -13,7 +13,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Debug\ErrorHandler;
-use Symfony\Component\Debug\AbstractExceptionHandler;
+use Symfony\Component\Debug\ExceptionHandler;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
@@ -37,9 +37,7 @@ class DebugHandlersListener implements EventSubscriberInterface
      */
     public function __construct($exceptionHandler, LoggerInterface $logger = null, $levels = null, $debug = true)
     {
-        if (is_callable($exceptionHandler)) {
-            $this->exceptionHandler = $exceptionHandler;
-        }
+        $this->exceptionHandler = $exceptionHandler;
         $this->logger = $logger;
         $this->levels = $levels;
         $this->debug = $debug;
@@ -76,7 +74,7 @@ public function configure()
                 $handler->setExceptionHandler($h);
                 $handler = is_array($h) ? $h[0] : null;
             }
-            if ($handler instanceof AbstractExceptionHandler) {
+            if ($handler instanceof ExceptionHandler) {
                 $handler->setHandler($this->exceptionHandler);
             }
             $this->exceptionHandler = null;

Tests/EventListener/DebugHandlersListenerTest.php

@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\EventListener;
+
+use Psr\Log\LogLevel;
+use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\Debug\ExceptionHandler;
+use Symfony\Component\HttpKernel\EventListener\DebugHandlersListener;
+
+/**
+ * DebugHandlersListenerTest
+ *
+ * @author Nicolas Grekas <[email protected]>
+ */
+class DebugHandlersListenerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testConfigure()
+    {
+        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $userHandler = function() {};
+        $listener = new DebugHandlersListener($userHandler, $logger);
+        $xHandler = new ExceptionHandler();
+        $eHandler = new ErrorHandler();
+        $eHandler->setExceptionHandler(array($xHandler, 'handle'));
+
+        $exception = null;
+        set_error_handler(array($eHandler, 'handleError'));
+        set_exception_handler(array($eHandler, 'handleException'));
+        try {
+            $listener->configure();
+        } catch (\Exception $exception) {
+        }
+        restore_exception_handler();
+        restore_error_handler();
+
+        if (null !== $exception) {
+            throw $exception;
+        }
+
+        $this->assertSame($userHandler, $xHandler->setHandler('var_dump'));
+
+        $loggers = $eHandler->setLoggers(array());
+
+        $this->assertArrayHasKey(E_DEPRECATED, $loggers);
+        $this->assertSame(array($logger, LogLevel::INFO), $loggers[E_DEPRECATED]);
+    }
+}