diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Debug/VarDumper] minor cleanups

Browse Source
This commit is contained in:
Nicolas Grekas 2015-08-16 17:42:14 +02:00
parent f79c48718c
commit f1d379db7d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Debug/ErrorHandler.php
View File

@ -251,7 +251,7 @@ class ErrorHandler
public function throwAt($levels, $replace = false) public function throwAt($levels, $replace = false)
{ {
$prev = $this->thrownErrors; $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) { if (!$replace) {
$this->thrownErrors |= $prev; $this->thrownErrors |= $prev;
} }
@ -445,7 +445,7 @@ class ErrorHandler
} }
/** /**
* 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 \Exception|\Throwable $exception An exception to handle
* @param array $error An array as returned by error_get_last() * @param array $error An array as returned by error_get_last()

2
src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
View File

@ -42,7 +42,7 @@ class ExceptionCaster
public static function castError(\Error $e, array $a, Stub $stub, $isNested, $filter = 0) 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) public static function castException(\Exception $e, array $a, Stub $stub, $isNested, $filter = 0)