simplify debug error_reporting levels given php version > 5.3

Tobion · Tobion · commit b1c774f0f240 · 2015-12-09T01:47:17.000+01:00
diff --git a/src/Symfony/Component/Debug/Debug.php b/src/Symfony/Component/Debug/Debug.php
@@ -31,7 +31,7 @@ class Debug
      * @param int  $errorReportingLevel The level of error reporting you want
      * @param bool $displayErrors       Whether to display errors (for development) or just log them (for production)
      */
-    public static function enable($errorReportingLevel = null, $displayErrors = true)
+    public static function enable($errorReportingLevel = E_ALL, $displayErrors = true)
     {
         if (static::$enabled) {
             return;
@@ -42,7 +42,7 @@ public static function enable($errorReportingLevel = null, $displayErrors = true
         if (null !== $errorReportingLevel) {
             error_reporting($errorReportingLevel);
         } else {
-            error_reporting(-1);
+            error_reporting(E_ALL);
         }
 
         if ('cli' !== php_sapi_name()) {
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -113,8 +113,6 @@ public static function register(self $handler = null, $replace = true)
             register_shutdown_function(__CLASS__.'::handleFatalError');
         }
 
-        $levels = -1;
-
         if ($handlerIsNew = null === $handler) {
             $handler = new static();
         }
@@ -131,7 +129,7 @@ public static function register(self $handler = null, $replace = true)
             restore_error_handler();
         }
 
-        $handler->throwAt($levels & $handler->thrownErrors, true);
+        $handler->throwAt(E_ALL & $handler->thrownErrors, true);
 
         return $handler;
     }
@@ -151,7 +149,7 @@ public function __construct(BufferingLogger $bootstrappingLogger = null)
      * @param array|int       $levels  An array map of E_* to LogLevel::* or an integer bit field of E_* constants
      * @param bool            $replace Whether to replace or not any existing logger
      */
-    public function setDefaultLogger(LoggerInterface $logger, $levels = null, $replace = false)
+    public function setDefaultLogger(LoggerInterface $logger, $levels = E_ALL, $replace = false)
     {
         $loggers = array();
 
@@ -163,7 +161,7 @@ public function setDefaultLogger(LoggerInterface $logger, $levels = null, $repla
             }
         } else {
             if (null === $levels) {
-                $levels = E_ALL | E_STRICT;
+                $levels = E_ALL;
             }
             foreach ($this->loggers as $type => $log) {
                 if (($type & $levels) && (empty($log[0]) || $replace || $log[0] === $this->bootstrappingLogger)) {
@@ -255,7 +253,7 @@ public function setExceptionHandler(callable $handler = null)
     public function throwAt($levels, $replace = false)
     {
         $prev = $this->thrownErrors;
-        $this->thrownErrors = (E_ALL | E_STRICT) & ($levels | E_RECOVERABLE_ERROR | E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;
+        $this->thrownErrors = E_ALL & ($levels | E_RECOVERABLE_ERROR | E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;
         if (!$replace) {
             $this->thrownErrors |= $prev;
         }
diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
@@ -26,7 +26,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->errorReporting = error_reporting(E_ALL | E_STRICT);
+        $this->errorReporting = error_reporting(E_ALL);
         $this->loader = new ClassLoader();
         spl_autoload_register(array($this->loader, 'loadClass'), true, true);
         DebugClassLoader::enable();
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -45,12 +45,12 @@ class DebugHandlersListener implements EventSubscriberInterface
      * @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(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = null, $throwAt = -1, $scream = true, $fileLinkFormat = null)
+    public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = E_ALL, $throwAt = E_ALL, $scream = true, $fileLinkFormat = null)
     {
         $this->exceptionHandler = $exceptionHandler;
         $this->logger = $logger;
-        $this->levels = $levels;
-        $this->throwAt = is_numeric($throwAt) ? (int) $throwAt : (null === $throwAt ? null : ($throwAt ? -1 : null));
+        $this->levels = null === $levels ? E_ALL : $levels;
+        $this->throwAt = is_numeric($throwAt) ? (int) $throwAt : (null === $throwAt ? null : ($throwAt ? E_ALL : null));
         $this->scream = (bool) $scream;
         $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
     }
@@ -79,7 +79,7 @@ public function configure(Event $event = null)
                             $scream |= $type;
                         }
                     } else {
-                        $scream = null === $this->levels ? E_ALL | E_STRICT : $this->levels;
+                        $scream = $this->levels;
                     }
                     if ($this->scream) {
                         $handler->screamAt($scream);

Original file line number	Diff line number	Diff line change
`@@ -113,8 +113,6 @@ public static function register(self $handler = null, $replace = true)`
`113`	`113`	`register_shutdown_function(__CLASS__.'::handleFatalError');`
`114`	`114`	`}`
`115`	`115`
`116`		`- $levels = -1;`
`117`		`-`
`118`	`116`	`if ($handlerIsNew = null === $handler) {`
`119`	`117`	`$handler = new static();`
`120`	`118`	`}`
`@@ -131,7 +129,7 @@ public static function register(self $handler = null, $replace = true)`
`131`	`129`	`restore_error_handler();`
`132`	`130`	`}`
`133`	`131`
`134`		`- $handler->throwAt($levels & $handler->thrownErrors, true);`
	`132`	`+ $handler->throwAt(E_ALL & $handler->thrownErrors, true);`
`135`	`133`
`136`	`134`	`return $handler;`
`137`	`135`	`}`
`@@ -151,7 +149,7 @@ public function __construct(BufferingLogger $bootstrappingLogger = null)`
`151`	`149`	`* @param array\|int $levels An array map of E_* to LogLevel::* or an integer bit field of E_* constants`
`152`	`150`	`* @param bool $replace Whether to replace or not any existing logger`
`153`	`151`	`*/`
`154`		`- public function setDefaultLogger(LoggerInterface $logger, $levels = null, $replace = false)`
	`152`	`+ public function setDefaultLogger(LoggerInterface $logger, $levels = E_ALL, $replace = false)`
`155`	`153`	`{`
`156`	`154`	`$loggers = array();`
`157`	`155`
`@@ -163,7 +161,7 @@ public function setDefaultLogger(LoggerInterface $logger, $levels = null, $repla`
`163`	`161`	`}`
`164`	`162`	`} else {`
`165`	`163`	`if (null === $levels) {`
`166`		`- $levels = E_ALL \| E_STRICT;`
	`164`	`+ $levels = E_ALL;`
`167`	`165`	`}`
`168`	`166`	`foreach ($this->loggers as $type => $log) {`
`169`	`167`	`if (($type & $levels) && (empty($log[0]) \|\| $replace \|\| $log[0] === $this->bootstrappingLogger)) {`
`@@ -255,7 +253,7 @@ public function setExceptionHandler(callable $handler = null)`
`255`	`253`	`public function throwAt($levels, $replace = false)`
`256`	`254`	`{`
`257`	`255`	`$prev = $this->thrownErrors;`
`258`		`- $this->thrownErrors = (E_ALL \| E_STRICT) & ($levels \| E_RECOVERABLE_ERROR \| E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;`
	`256`	`+ $this->thrownErrors = E_ALL & ($levels \| E_RECOVERABLE_ERROR \| E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;`
`259`	`257`	`if (!$replace) {`
`260`	`258`	`$this->thrownErrors \|= $prev;`
`261`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase`
`26`	`26`
`27`	`27`	`protected function setUp()`
`28`	`28`	`{`
`29`		`- $this->errorReporting = error_reporting(E_ALL \| E_STRICT);`
	`29`	`+ $this->errorReporting = error_reporting(E_ALL);`
`30`	`30`	`$this->loader = new ClassLoader();`
`31`	`31`	`spl_autoload_register(array($this->loader, 'loadClass'), true, true);`
`32`	`32`	`DebugClassLoader::enable();`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ class DebugHandlersListener implements EventSubscriberInterface`
`45`	`45`	`* @param bool $scream Enables/disables screaming mode, where even silenced errors are logged`
`46`	`46`	`* @param string $fileLinkFormat The format for links to source files`
`47`	`47`	`*/`
`48`		`- public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = null, $throwAt = -1, $scream = true, $fileLinkFormat = null)`
	`48`	`+ public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = E_ALL, $throwAt = E_ALL, $scream = true, $fileLinkFormat = null)`
`49`	`49`	`{`
`50`	`50`	`$this->exceptionHandler = $exceptionHandler;`
`51`	`51`	`$this->logger = $logger;`
`52`		`- $this->levels = $levels;`
`53`		`- $this->throwAt = is_numeric($throwAt) ? (int) $throwAt : (null === $throwAt ? null : ($throwAt ? -1 : null));`
	`52`	`+ $this->levels = null === $levels ? E_ALL : $levels;`
	`53`	`+ $this->throwAt = is_numeric($throwAt) ? (int) $throwAt : (null === $throwAt ? null : ($throwAt ? E_ALL : null));`
`54`	`54`	`$this->scream = (bool) $scream;`
`55`	`55`	`$this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');`
`56`	`56`	`}`
`@@ -79,7 +79,7 @@ public function configure(Event $event = null)`
`79`	`79`	`$scream \|= $type;`
`80`	`80`	`}`
`81`	`81`	`} else {`
`82`		`- $scream = null === $this->levels ? E_ALL \| E_STRICT : $this->levels;`
	`82`	`+ $scream = $this->levels;`
`83`	`83`	`}`
`84`	`84`	`if ($this->scream) {`
`85`	`85`	`$handler->screamAt($scream);`