[Debug/VarDumper] minor cleanups

symfony · Aug 17, 2015 · f1d379d · f1d379d
1 parent f79c487
commit f1d379d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -251,7 +251,7 @@ public function setExceptionHandler($handler)
     public function throwAt($levels, $replace = false)
     {
         $prev = $this->thrownErrors;
-        $this->thrownErrors = ($levels | E_RECOVERABLE_ERROR | E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;
+        $this->thrownErrors = (E_ALL | E_STRICT) & ($levels | E_RECOVERABLE_ERROR | E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;
         if (!$replace) {
             $this->thrownErrors |= $prev;
         }
@@ -445,7 +445,7 @@ public function handleError($type, $message, $file, $line, array $context, array
     }
 
     /**
-     * Handles an exception by logging then forwarding it to an other handler.
+     * Handles an exception by logging then forwarding it to another handler.
      *
      * @param \Exception|\Throwable $exception An exception to handle
      * @param array                 $error     An array as returned by error_get_last()

diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -42,7 +42,7 @@ class ExceptionCaster
 
     public static function castError(\Error $e, array $a, Stub $stub, $isNested, $filter = 0)
     {
-        return $e instanceof \Exception ? $a : self::filterExceptionArray($a, "\0Error\0", $filter);
+        return self::filterExceptionArray($a, "\0Error\0", $filter);
     }
 
     public static function castException(\Exception $e, array $a, Stub $stub, $isNested, $filter = 0)