Added debug argument to decide if debug page should be shown or not

yceruto · yceruto · commit c749df40df63 · 2020-01-26T15:23:53.000-05:00
diff --git a/src/Symfony/Component/ErrorHandler/Debug.php b/src/Symfony/Component/ErrorHandler/Debug.php
@@ -31,6 +31,6 @@ public static function enable(): ErrorHandler
 
         DebugClassLoader::enable();
 
-        return ErrorHandler::register(new ErrorHandler(new BufferingLogger()));
+        return ErrorHandler::register(new ErrorHandler(new BufferingLogger(), true));
     }
 }
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -92,6 +92,7 @@ class ErrorHandler
     private $screamedErrors = 0x55; // E_ERROR + E_CORE_ERROR + E_COMPILE_ERROR + E_PARSE
     private $loggedErrors = 0;
     private $traceReflector;
+    private $debug;
 
     private $isRecursive = 0;
     private $isRoot = false;
@@ -107,7 +108,7 @@ class ErrorHandler
     /**
      * Registers the error handler.
      */
-    public static function register(self $handler = null, bool $replace = true): self
+    public static function register(self $handler = null, bool $replace = true, bool $debug = false): self
     {
         if (null === self::$reservedMemory) {
             self::$reservedMemory = str_repeat('x', 10240);
@@ -116,6 +117,7 @@ public static function register(self $handler = null, bool $replace = true): sel
 
         if ($handlerIsNew = null === $handler) {
             $handler = new static();
+            $handler->debug = $debug;
         }
 
         if (null === $prev = set_error_handler([$handler, 'handleError'])) {
@@ -180,14 +182,15 @@ public static function call(callable $function, ...$arguments)
         }
     }
 
-    public function __construct(BufferingLogger $bootstrappingLogger = null)
+    public function __construct(BufferingLogger $bootstrappingLogger = null, bool $debug = false)
     {
         if ($bootstrappingLogger) {
             $this->bootstrappingLogger = $bootstrappingLogger;
             $this->setDefaultLogger($bootstrappingLogger);
         }
         $this->traceReflector = new \ReflectionProperty('Exception', 'trace');
         $this->traceReflector->setAccessible(true);
+        $this->debug = $debug;
     }
 
     /**
@@ -697,7 +700,7 @@ public static function handleFatalError(array $error = null): void
      */
     private function renderException(\Throwable $exception): void
     {
-        $renderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliErrorRenderer() : new HtmlErrorRenderer(0 !== $this->scopedErrors);
+        $renderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliErrorRenderer() : new HtmlErrorRenderer($this->debug);
 
         $exception = $renderer->render($exception);
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ public static function enable(): ErrorHandler`
`31`	`31`
`32`	`32`	`DebugClassLoader::enable();`
`33`	`33`
`34`		`- return ErrorHandler::register(new ErrorHandler(new BufferingLogger()));`
	`34`	`+ return ErrorHandler::register(new ErrorHandler(new BufferingLogger(), true));`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ class ErrorHandler`
`92`	`92`	`private $screamedErrors = 0x55; // E_ERROR + E_CORE_ERROR + E_COMPILE_ERROR + E_PARSE`
`93`	`93`	`private $loggedErrors = 0;`
`94`	`94`	`private $traceReflector;`
	`95`	`+ private $debug;`
`95`	`96`
`96`	`97`	`private $isRecursive = 0;`
`97`	`98`	`private $isRoot = false;`
`@@ -107,7 +108,7 @@ class ErrorHandler`
`107`	`108`	`/**`
`108`	`109`	`* Registers the error handler.`
`109`	`110`	`*/`
`110`		`- public static function register(self $handler = null, bool $replace = true): self`
	`111`	`+ public static function register(self $handler = null, bool $replace = true, bool $debug = false): self`
`111`	`112`	`{`
`112`	`113`	`if (null === self::$reservedMemory) {`
`113`	`114`	`self::$reservedMemory = str_repeat('x', 10240);`
`@@ -116,6 +117,7 @@ public static function register(self $handler = null, bool $replace = true): sel`
`116`	`117`
`117`	`118`	`if ($handlerIsNew = null === $handler) {`
`118`	`119`	`$handler = new static();`
	`120`	`+ $handler->debug = $debug;`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`if (null === $prev = set_error_handler([$handler, 'handleError'])) {`
`@@ -180,14 +182,15 @@ public static function call(callable $function, ...$arguments)`
`180`	`182`	`}`
`181`	`183`	`}`
`182`	`184`
`183`		`- public function __construct(BufferingLogger $bootstrappingLogger = null)`
	`185`	`+ public function __construct(BufferingLogger $bootstrappingLogger = null, bool $debug = false)`
`184`	`186`	`{`
`185`	`187`	`if ($bootstrappingLogger) {`
`186`	`188`	`$this->bootstrappingLogger = $bootstrappingLogger;`
`187`	`189`	`$this->setDefaultLogger($bootstrappingLogger);`
`188`	`190`	`}`
`189`	`191`	`$this->traceReflector = new \ReflectionProperty('Exception', 'trace');`
`190`	`192`	`$this->traceReflector->setAccessible(true);`
	`193`	`+ $this->debug = $debug;`
`191`	`194`	`}`
`192`	`195`
`193`	`196`	`/**`
`@@ -697,7 +700,7 @@ public static function handleFatalError(array $error = null): void`
`697`	`700`	`*/`
`698`	`701`	`private function renderException(\Throwable $exception): void`
`699`	`702`	`{`
`700`		`- $renderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliErrorRenderer() : new HtmlErrorRenderer(0 !== $this->scopedErrors);`
	`703`	`+ $renderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliErrorRenderer() : new HtmlErrorRenderer($this->debug);`
`701`	`704`
`702`	`705`	`$exception = $renderer->render($exception);`
`703`	`706`