From 09d92ebab65c8cb10510f839adb30c9e2697423f Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Fri, 11 Dec 2020 11:04:41 +0200
Subject: [PATCH] Fixed wrong (but working) method call for Whoops

---
 system/src/Grav/Common/Errors/Errors.php          | 15 +++++++++------
 .../src/Grav/Common/Errors/SimplePageHandler.php  |  3 ++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/system/src/Grav/Common/Errors/Errors.php b/system/src/Grav/Common/Errors/Errors.php
index 7aebd0aaa..0b27667e0 100644
--- a/system/src/Grav/Common/Errors/Errors.php
+++ b/system/src/Grav/Common/Errors/Errors.php
@@ -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) {
diff --git a/system/src/Grav/Common/Errors/SimplePageHandler.php b/system/src/Grav/Common/Errors/SimplePageHandler.php
index f0e8b51cf..eba0f47fc 100644
--- a/system/src/Grav/Common/Errors/SimplePageHandler.php
+++ b/system/src/Grav/Common/Errors/SimplePageHandler.php
@@ -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"
             );
         }