Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-07 11:56:36 +02:00
Code Issues Packages Projects Releases Activity

Fixed wrong (but working) method call for Whoops

Browse Source
This commit is contained in:
Matias Griese
2020-12-11 11:04:41 +02:00
parent 2777bedb51
commit 09d92ebab6
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
system/src/Grav/Common/Errors/Errors.php
View File

@@ -11,7 +11,10 @@ namespace Grav\Common\Errors;
use Exception;
use Grav\Common\Grav;
use Whoops;
use Whoops\Handler\JsonResponseHandler;
use Whoops\Handler\PrettyPageHandler;
use Whoops\Run;
use Whoops\Util\Misc;
use function is_int;
/**
@@ -31,7 +34,7 @@ class Errors
// Setup Whoops-based error handler
$system = new SystemFacade;
$whoops = new Whoops\Run($system);
$whoops = new Run($system);
$verbosity = 1;
@@ -45,7 +48,7 @@ class Errors
switch ($verbosity) {
case 1:
$error_page = new Whoops\Handler\PrettyPageHandler;
$error_page = new PrettyPageHandler();
$error_page->setPageTitle('Crikey! There was an error...');
$error_page->addResourcePath(GRAV_ROOT . '/system/assets');
$error_page->addCustomCss('whoops.css');
@@ -59,13 +62,13 @@ class Errors
break;
}
if (Whoops\Util\Misc::isAjaxRequest() || $jsonRequest) {
$whoops->prependHandler(new Whoops\Handler\JsonResponseHandler);
if ($jsonRequest || Misc::isAjaxRequest()) {
$whoops->prependHandler(new JsonResponseHandler());
}
if (isset($config['log']) && $config['log']) {
$logger = $grav['log'];
$whoops->prependHandler(function ($exception, $inspector, $run) use ($logger) {
$whoops->pushHandler(function ($exception, $inspector, $run) use ($logger) {
try {
$logger->addCritical($exception->getMessage() . ' - Trace: ' . $exception->getTraceAsString());
} catch (Exception $e) {

3
system/src/Grav/Common/Errors/SimplePageHandler.php
View File

@@ -9,6 +9,7 @@
namespace Grav\Common\Errors;
use InvalidArgumentException;
use RuntimeException;
use Whoops\Handler\Handler;
use Whoops\Util\Misc;
@@ -102,7 +103,7 @@ class SimplePageHandler extends Handler
public function addResourcePath($path)
{
if (!is_dir($path)) {
throw new \InvalidArgumentException(
throw new InvalidArgumentException(
"'{$path}' is not a valid directory"
);
}