Merge pull request #278 from dotkernel/issue-277

Issue #277: Upgraded `dot-errorhandler` to version `4.x`
dotkernel · Sep 4, 2024 · 821facb · 821facb
2 parents 5da427a + 5fbd665
commit 821facb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "dotkernel/dot-controller": "^3.4.3",
         "dotkernel/dot-data-fixtures": "^1.1.3",
         "dotkernel/dot-dependency-injection": "^1.0",
-        "dotkernel/dot-errorhandler": "^3.3.2",
+        "dotkernel/dot-errorhandler": "^4.0.0",
         "dotkernel/dot-flashmessenger": "^3.4.2",
         "dotkernel/dot-geoip": "^3.6.0",
         "dotkernel/dot-helpers": "^3.4.2",

diff --git a/config/autoload/error-handling.global.php b/config/autoload/error-handling.global.php
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Laminas\Log\Formatter\Json;
-use Laminas\Log\Logger;
+use Dot\Log\Formatter\Json;
+use Dot\Log\Logger;
 
 return [
     'dot-errorhandler' => [

diff --git a/src/Admin/src/Controller/AdminController.php b/src/Admin/src/Controller/AdminController.php
@@ -24,14 +24,14 @@
 use Dot\Controller\AbstractActionController;
 use Dot\DependencyInjection\Attribute\Inject;
 use Dot\FlashMessenger\FlashMessengerInterface;
+use Dot\Log\Logger;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Authentication\AuthenticationServiceInterface;
 use Laminas\Authentication\Exception\ExceptionInterface;
 use Laminas\Diactoros\Response\HtmlResponse;
 use Laminas\Diactoros\Response\JsonResponse;
 use Laminas\Diactoros\Response\RedirectResponse;
-use Laminas\Log\Logger;
 use MaxMind\Db\Reader\InvalidDatabaseException;
 use Mezzio\Router\RouterInterface;
 use Mezzio\Template\TemplateRendererInterface;

diff --git a/test/Unit/Admin/Controller/AdminControllerTest.php b/test/Unit/Admin/Controller/AdminControllerTest.php
@@ -10,8 +10,8 @@
 use Admin\App\Plugin\FormsPlugin;
 use AdminTest\Unit\UnitTest;
 use Dot\FlashMessenger\FlashMessengerInterface;
+use Dot\Log\Logger;
 use Laminas\Authentication\AuthenticationServiceInterface;
-use Laminas\Log\Logger;
 use Mezzio\Router\RouterInterface;
 use Mezzio\Template\TemplateRendererInterface;
 use PHPUnit\Framework\MockObject\Exception;
@@ -26,7 +26,8 @@ public function testWillCreate(): void
         $logger          = new Logger([
             'writers' => [
                 'FileWriter' => [
-                    'name' => 'null',
+                    'name'     => 'null',
+                    'priority' => Logger::ALERT,
                 ],
             ],
         ]);