From 59bc880ef9338aafe00f17e3885649ead1f567b9 Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Fri, 30 Aug 2024 11:23:39 +0300 Subject: [PATCH] Issue #311: Upgraded dot-errorhandler to 4.x Signed-off-by: alexmerlin --- composer.json | 2 +- config/autoload/error-handling.global.php | 4 ++-- config/config.php | 1 - src/User/src/Service/UserService.php | 2 +- test/Unit/User/Service/UserServiceTest.php | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 4815dfa..e9a78c4 100644 --- a/composer.json +++ b/composer.json @@ -55,7 +55,7 @@ "dotkernel/dot-cli": "^3.5.0", "dotkernel/dot-data-fixtures": "^1.2.2", "dotkernel/dot-dependency-injection": "^1.0", - "dotkernel/dot-errorhandler": "^3.3.2", + "dotkernel/dot-errorhandler": "^4.0.0", "dotkernel/dot-mail": "^4.1.1", "dotkernel/dot-response-header": "^3.2.3", "laminas/laminas-component-installer": "^3.4.0", diff --git a/config/autoload/error-handling.global.php b/config/autoload/error-handling.global.php index 77425f7..cf4044f 100644 --- a/config/autoload/error-handling.global.php +++ b/config/autoload/error-handling.global.php @@ -3,8 +3,8 @@ declare(strict_types=1); use Api\App\Service\ErrorReportServiceInterface; -use Laminas\Log\Formatter\Json; -use Laminas\Log\Logger; +use Dot\Log\Formatter\Json; +use Dot\Log\Logger; return [ 'dot-errorhandler' => [ diff --git a/config/config.php b/config/config.php index 42959d6..8f83808 100644 --- a/config/config.php +++ b/config/config.php @@ -25,7 +25,6 @@ Laminas\Filter\ConfigProvider::class, Laminas\HttpHandlerRunner\ConfigProvider::class, Laminas\Hydrator\ConfigProvider::class, - Laminas\Log\ConfigProvider::class, Laminas\Mail\ConfigProvider::class, Laminas\Paginator\ConfigProvider::class, Laminas\Validator\ConfigProvider::class, diff --git a/src/User/src/Service/UserService.php b/src/User/src/Service/UserService.php index a8b41d5..a08b171 100644 --- a/src/User/src/Service/UserService.php +++ b/src/User/src/Service/UserService.php @@ -18,9 +18,9 @@ use Api\User\Repository\UserRepository; use Api\User\Repository\UserResetPasswordRepository; use Dot\DependencyInjection\Attribute\Inject; +use Dot\Log\LoggerInterface; use Dot\Mail\Exception\MailException; use Dot\Mail\Service\MailService; -use Laminas\Log\LoggerInterface; use Mezzio\Template\TemplateRendererInterface; use RuntimeException; diff --git a/test/Unit/User/Service/UserServiceTest.php b/test/Unit/User/Service/UserServiceTest.php index b80ff88..3fa30cb 100644 --- a/test/Unit/User/Service/UserServiceTest.php +++ b/test/Unit/User/Service/UserServiceTest.php @@ -16,9 +16,9 @@ use Api\User\Repository\UserResetPasswordRepository; use Api\User\Service\UserRoleService; use Api\User\Service\UserService as Subject; +use Dot\Log\LoggerInterface; use Dot\Mail\Service\MailService; use Exception; -use Laminas\Log\LoggerInterface; use Mezzio\Template\TemplateRendererInterface; use PHPUnit\Framework\TestCase;