geckon01/whoops
1
0
Fork 0
mirror of https://github.com/filp/whoops.git synced 2026-08-31 12:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make PrettyPageHandler more easily extendable (#517)

Browse Source 
separate code and frames extraction
This commit is contained in:
Julián Gutiérrez
2017-08-03 20:23:40 +02:00
committed by Denis Sokolov
parent 324905f307
commit ffbbd2c06c
1 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Whoops/Handler/PrettyPageHandler.php
+43 -21
View File
@@ -176,27 +176,8 @@ class PrettyPageHandler extends Handler
}
$inspector = $this->getInspector();
$frames = $inspector->getFrames();
$code = $inspector->getException()->getCode();
if ($inspector->getException() instanceof \ErrorException) {
// ErrorExceptions wrap the php-error types within the "severity" property
$code = Misc::translateErrorCode($inspector->getException()->getSeverity());
}
// Detect frames that belong to the application.
if ($this->applicationPaths) {
/* @var \Whoops\Exception\Frame $frame */
foreach ($frames as $frame) {
foreach ($this->applicationPaths as $path) {
if (substr($frame->getFile(), 0, strlen($path)) === $path) {
$frame->setApplication(true);
break;
}
}
}
}
$frames = $this->getExceptionFrames();
$code = $this->getExceptionCode();
// List of variables that will be passed to the layout template.
$vars = [
@@ -268,6 +249,47 @@ class PrettyPageHandler extends Handler
return Handler::QUIT;
}
/**
* Get the stack trace frames of the exception that is currently being handled.
*
* @return \Whoops\Exception\FrameCollection;
*/
protected function getExceptionFrames()
{
$frames = $this->getInspector()->getFrames();
if ($this->getApplicationPaths()) {
foreach ($frames as $frame) {
foreach ($this->getApplicationPaths() as $path) {
if (strpos($frame->getFile(), $path) === 0) {
$frame->setApplication(true);
break;
}
}
}
}
return $frames;
}
/**
* Get the code of the exception that is currently being handled.
*
* @return string
*/
protected function getExceptionCode()
{
$exception = $this->getException();
$code = $exception->getCode();
if ($exception instanceof \ErrorException) {
// ErrorExceptions wrap the php-error types within the 'severity' property
$code = Misc::translateErrorCode($exception->getSeverity());
}
return (string) $code;
}
/**
* @return string
*/