[Debug] update FrameworkBundle and HttpKernel for new ErrorHandler

Author: nicolas-grekas

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.6.0
+-----
+
+ * deprecated `Symfony\Component\HttpKernel\EventListener\ErrorsLoggerListener`, use `Symfony\Component\HttpKernel\EventListener\DebugHandlersListener` instead
+
 2.5.0
 -----
 

EventListener/DebugHandlersListener.php

@@ -11,33 +11,72 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-use Symfony\Component\Debug\ExceptionHandler;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Debug\ErrorHandler;
+use Symfony\Component\Debug\AbstractExceptionHandler;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
- * Configures the ExceptionHandler.
+ * Configures errors and exceptions handlers.
  *
  * @author Nicolas Grekas <[email protected]>
  */
 class DebugHandlersListener implements EventSubscriberInterface
 {
     private $exceptionHandler;
+    private $logger;
+    private $levels;
+    private $debug;
 
-    public function __construct($exceptionHandler)
+    /**
+     * @param callable             $exceptionHandler A handler that will be called on Exception
+     * @param LoggerInterface|null $logger           A PSR-3 logger
+     * @param array|int            $levels           An array map of E_* to LogLevel::* or an integer bit field of E_* constants
+     * @param bool                 $debug            Enables/disables debug mode
+     */
+    public function __construct($exceptionHandler, LoggerInterface $logger = null, $levels = null, $debug = true)
     {
         if (is_callable($exceptionHandler)) {
             $this->exceptionHandler = $exceptionHandler;
         }
+        $this->logger = $logger;
+        $this->levels = $levels;
+        $this->debug = $debug;
     }
 
     public function configure()
     {
+        if ($this->logger) {
+            $handler = set_error_handler('var_dump', 0);
+            $handler = is_array($handler) ? $handler[0] : null;
+            restore_error_handler();
+            if ($handler instanceof ErrorHandler) {
+                if ($this->debug) {
+                    $handler->throwAt(-1);
+                }
+                $handler->setDefaultLogger($this->logger, $this->levels);
+                if (is_array($this->levels)) {
+                    $scream = 0;
+                    foreach ($this->levels as $type => $log) {
+                        $scream |= $type;
+                    }
+                    $this->levels = $scream;
+                }
+                $handler->screamAt($this->levels);
+            }
+            $this->logger = $this->levels = null;
+        }
         if ($this->exceptionHandler) {
             $handler = set_exception_handler('var_dump');
             $handler = is_array($handler) ? $handler[0] : null;
             restore_exception_handler();
-            if ($handler instanceof ExceptionHandler) {
+            if ($handler instanceof ErrorHandler) {
+                $h = $handler->setExceptionHandler('var_dump') ?: $this->exceptionHandler;
+                $handler->setExceptionHandler($h);
+                $handler = is_array($h) ? $h[0] : null;
+            }
+            if ($handler instanceof AbstractExceptionHandler) {
                 $handler->setHandler($this->exceptionHandler);
             }
             $this->exceptionHandler = null;

EventListener/ErrorsLoggerListener.php

@@ -21,6 +21,8 @@
  *
  * @author Colin Frei <[email protected]>
  * @author Konstantin Myakshin <[email protected]>
+ *
+ * @deprecated since 2.6, to be removed in 3.0. Use DebugHandlersListener instead.
  */
 class ErrorsLoggerListener implements EventSubscriberInterface
 {

composer.json

@@ -19,7 +19,7 @@
         "php": ">=5.3.3",
         "symfony/event-dispatcher": "~2.5",
         "symfony/http-foundation": "~2.4",
-        "symfony/debug": "~2.5",
+        "symfony/debug": "~2.6",
         "psr/log": "~1.0"
     },
     "require-dev": {