Merge pull request #5 from Ppito/develop

fixed issue 3 & 4
Ppito · Mar 25, 2021 · bda998b · bda998b
2 parents 5e6b640 + d6389bf
commit bda998b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/assets/css/laminas-whoops.css b/assets/css/laminas-whoops.css
@@ -0,0 +1,3 @@
+.Whoops pre.sf-dump {
+    background: initial;
+}
diff --git a/composer.json b/composer.json
@@ -16,11 +16,10 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.3 || ^8.0",
     "laminas/laminas-eventmanager": "^3.2",
     "laminas/laminas-servicemanager": "^3.4",
     "laminas/laminas-mvc": "^3.1",
-    "laminas/laminas-console": "^2.8",
     "filp/whoops": "^2.7"
   },
   "autoload": {

diff --git a/src/Handler/PageHandler.php b/src/Handler/PageHandler.php
@@ -42,6 +42,9 @@ public function configure(): void {
         $handler = $this->getHandler();
 
         $handler->setApplicationPaths([__FILE__]);
+        $handler->addResourcePath(__DIR__ . '/../../assets/');
+        $handler->addCustomCss('css/laminas-whoops.css');
+
 
         if (!isset($this->options['editor'])) {
             return;

diff --git a/src/Module.php b/src/Module.php
@@ -146,7 +146,7 @@ public function prepareException(MvcEvent $e) {
                     if ($response->isSuccess()) {
                         $response->setStatusCode(HttpResponse::STATUS_CODE_500);
                     }
-                } elseif ($response instanceof ConsoleResponse) {
+                } elseif (class_exists(ConsoleResponse::class) && $response instanceof ConsoleResponse) {
                     $statusCode = $response->getErrorLevel();
                     if ($statusCode === 0) {
                         $response->setErrorLevel(E_ERROR);