From d6389bf98dfd3653c9d87e864bef96512409a723 Mon Sep 17 00:00:00 2001 From: Mickael TONNELIER Date: Thu, 25 Mar 2021 14:21:23 +0100 Subject: [PATCH] issue 3 : add custom css resource for fixed conflict with the module DeveloperTools issue 4 : remove laminas-console dependency in composer --- assets/css/laminas-whoops.css | 3 +++ composer.json | 3 +-- src/Handler/PageHandler.php | 3 +++ src/Module.php | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 assets/css/laminas-whoops.css diff --git a/assets/css/laminas-whoops.css b/assets/css/laminas-whoops.css new file mode 100644 index 0000000..c16e0e1 --- /dev/null +++ b/assets/css/laminas-whoops.css @@ -0,0 +1,3 @@ +.Whoops pre.sf-dump { + background: initial; +} diff --git a/composer.json b/composer.json index b93003f..9d7ca26 100644 --- 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 index a3a60bb..ff6f60c 100644 --- 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 index a275121..5ed4d29 100644 --- 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);