geckon01/whoops
1
0
Fork 0
mirror of https://github.com/filp/whoops.git synced 2026-09-14 11:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/move-is-level-fatal' of https://github.com/Vmak11/whoops into bugfix/fix-issue-with-stacktrace

Browse Source 
Conflicts:
	src/Whoops/Exception/Inspector.php
	src/Whoops/Run.php
This commit is contained in:
Adam Vercimak
2015-08-12 09:17:07 -05:00
parent 12cbfd0aff 70a23b9317
commit e9742f909f
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Whoops/Exception/Inspector.php
+2 -2
View File
@@ -7,7 +7,7 @@
namespace Whoops\Exception;
use Exception;
use Whoops\Run;
use Whoops\Util\Misc;
class Inspector
{
@@ -160,7 +160,7 @@ class Inspector
return $traces;
}
if (!Run::isLevelFatal($e->getCode())) {
if (!Misc::isLevelFatal($e->getSeverity())) {
return $traces;
}
src/Whoops/Run.php
+2 -12
View File
@@ -13,6 +13,7 @@ use Whoops\Exception\Inspector;
use Whoops\Handler\CallbackHandler;
use Whoops\Handler\Handler;
use Whoops\Handler\HandlerInterface;
use Whoops\Util\Misc;
class Run
{
@@ -346,7 +347,7 @@ class Run
$this->canThrowExceptions = false;
$error = error_get_last();
if ($error && $this->isLevelFatal($error['type'])) {
if ($error && Misc::isLevelFatal($error['type'])) {
// If there was a fatal error,
// it was not handled in handleError yet.
$this->handleError(
@@ -394,15 +395,4 @@ class Run
return $this;
}
public static function isLevelFatal($level)
{
$errors = E_ERROR;
$errors |= E_PARSE;
$errors |= E_CORE_ERROR;
$errors |= E_CORE_WARNING;
$errors |= E_COMPILE_ERROR;
$errors |= E_COMPILE_WARNING;
return ($level & $errors) > 0;
}
}
src/Whoops/Util/Misc.php
+17
View File
@@ -41,4 +41,21 @@ class Misc
}
return "E_UNKNOWN";
}
/**
* Determine if an error level is fatal (halts execution)
*
* @param int $level
* @return boolean
*/
public static function isLevelFatal($level)
{
$errors = E_ERROR;
$errors |= E_PARSE;
$errors |= E_CORE_ERROR;
$errors |= E_CORE_WARNING;
$errors |= E_COMPILE_ERROR;
$errors |= E_COMPILE_WARNING;
return ($level & $errors) > 0;
}
}