[Debug] make screaming configurable

nicolas-grekas · nicolas-grekas · commit af0ecf41f81c · 2014-09-30T12:43:47.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -27,21 +27,25 @@ class DebugHandlersListener implements EventSubscriberInterface
     private $exceptionHandler;
     private $logger;
     private $levels;
-    private $debug;
+    private $throw;
+    private $scream;
+    private $fileLinkFormat;
 
     /**
      * @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
+     * @param bool                 $throw            Enables/disables throwing on PHP errors
+     * @param bool                 $scream           Enables/disables screaming mode, where even silenced errors are logged
      * @param string               $fileLinkFormat   The format for links to source files
      */
-    public function __construct($exceptionHandler, LoggerInterface $logger = null, $levels = null, $debug = true, $fileLinkFormat = null)
+    public function __construct($exceptionHandler, LoggerInterface $logger = null, $levels = null, $throw = true, $scream = true, $fileLinkFormat = null)
     {
         $this->exceptionHandler = $exceptionHandler;
         $this->logger = $logger;
         $this->levels = $levels;
-        $this->debug = $debug;
+        $this->throw = $throw;
+        $this->scream = $scream;
         $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
     }
 
@@ -52,18 +56,19 @@ public function configure()
             $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;
+                    $levels = 0;
                     foreach ($this->levels as $type => $log) {
-                        $scream |= $type;
+                        $levels |= $type;
                     }
-                    $this->levels = $scream;
+                } else {
+                    $levels = null === $this->levels ? E_ALL | E_STRICT : $this->levels;
+                }
+                $handler->throwAt($this->throw ? $levels : ($handler->throwAt(0) & ~$levels));
+                if ($this->scream) {
+                    $handler->screamAt($levels);
                 }
-                $handler->screamAt($this->levels);
             }
             $this->logger = $this->levels = null;
         }
