Use UserException instead of ApplicationException (#238)

Author: vjik

config/web/di/application.php

@@ -25,9 +25,9 @@
                 'class' => MiddlewareDispatcher::class,
                 'withMiddlewares()' => [
                     [
-                        RequestBodyParser::class,
-                        ExceptionMiddleware::class,
                         ErrorCatcher::class,
+                        ExceptionMiddleware::class,
+                        RequestBodyParser::class,
                         Router::class,
                         NotFoundMiddleware::class,
                     ],

src/Exception/ApplicationException.php

@@ -4,13 +4,16 @@
 
 namespace App\Http;
 
-use App\Exception\ApplicationException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Throwable;
+use Yiisoft\ErrorHandler\Exception\UserException;
 use Yiisoft\Input\Http\InputValidationException;
 
+use function is_int;
+
 final readonly class ExceptionMiddleware implements MiddlewareInterface
 {
     public function __construct(
@@ -21,10 +24,17 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     {
         try {
             return $handler->handle($request);
-        } catch (ApplicationException $e) {
-            return $this->apiResponseFactory->fail($e->getMessage(), code: $e->getCode());
-        } catch (InputValidationException $e) {
-            return $this->apiResponseFactory->failValidation($e->getResult());
+        } catch (InputValidationException $exception) {
+            return $this->apiResponseFactory->failValidation($exception->getResult());
+        } catch (Throwable $exception) {
+            if (UserException::isUserException($exception)) {
+                $code = $exception->getCode();
+                return $this->apiResponseFactory->fail(
+                    $exception->getMessage(),
+                    code: is_int($code) ? $code : null,
+                );
+            }
+            throw $exception;
         }
     }
 }