Replace ExceptionMiddleware to ExceptionResponder (#241)

vjik · web-flow · commit c858f3339a06 · 2025-09-18T23:56:09.000+03:00
diff --git a/composer.json b/composer.json
@@ -48,6 +48,7 @@
         "yiisoft/error-handler": "^4.3",
         "yiisoft/http": "^1.2",
         "yiisoft/hydrator": "^1.6.1",
+        "yiisoft/injector": "^1.2",
         "yiisoft/input-http": "^1.0.1",
         "yiisoft/log": "^2.1.1",
         "yiisoft/log-target-file": "^3.0",
diff --git a/config/web/di/application.php b/config/web/di/application.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use App\Http\ExceptionMiddleware;
+use App\Http\ExceptionResponderFactory;
 use App\Http\NotFoundMiddleware;
 use Yiisoft\DataResponse\Formatter\JsonDataResponseFormatter;
 use Yiisoft\DataResponse\Formatter\XmlDataResponseFormatter;
@@ -35,7 +35,7 @@
                             'application/json' => new JsonDataResponseFormatter(),
                         ]),
                         ErrorCatcher::class,
-                        ExceptionMiddleware::class,
+                        static fn(ExceptionResponderFactory $factory) => $factory->create(),
                         RequestBodyParser::class,
                         Router::class,
                         NotFoundMiddleware::class,
diff --git a/src/Http/ExceptionMiddleware.php b/src/Http/ExceptionMiddleware.php
diff --git a/src/Http/ExceptionResponderFactory.php b/src/Http/ExceptionResponderFactory.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http;
+
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Throwable;
+use Yiisoft\ErrorHandler\Exception\UserException;
+use Yiisoft\ErrorHandler\Middleware\ExceptionResponder;
+use Yiisoft\Injector\Injector;
+use Yiisoft\Input\Http\InputValidationException;
+
+final readonly class ExceptionResponderFactory
+{
+    public function __construct(
+        private ResponseFactoryInterface $responseFactory,
+        private ApiResponseFactory $apiResponseFactory,
+        private Injector $injector,
+    ) {}
+
+    public function create(): ExceptionResponder
+    {
+        return new ExceptionResponder(
+            [
+                InputValidationException::class => $this->inputValidationException(...),
+                Throwable::class => $this->throwable(...),
+            ],
+            $this->responseFactory,
+            $this->injector,
+        );
+    }
+
+    private function inputValidationException(InputValidationException $exception): ResponseInterface
+    {
+        return $this->apiResponseFactory->failValidation($exception->getResult());
+    }
+
+    private function throwable(Throwable $exception): ResponseInterface
+    {
+        if (UserException::isUserException($exception)) {
+            $code = $exception->getCode();
+            return $this->apiResponseFactory->fail(
+                $exception->getMessage(),
+                code: is_int($code) ? $code : null,
+            );
+        }
+        throw $exception;
+    }
+}
