Change ResultTransformerInterface

- Added optional ValidationException to extract the error message and error code from the exception

Author: odan

src/Exception/ValidationException.php

@@ -7,7 +7,7 @@
 use Throwable;
 
 /**
- * Exception.
+ * Validation Exception.
  */
 final class ValidationException extends DomainException
 {
@@ -19,14 +19,14 @@ final class ValidationException extends DomainException
     /**
      * Construct the exception.
      *
-     * @param ValidationResult $validationResult The validation result object
      * @param string $message The Exception message to throw
+     * @param ValidationResult $validationResult The validation result object
      * @param int $code The Exception code
      * @param Throwable|null $previous The previous throwable used for the exception chaining
      */
     public function __construct(
+        string $message,
         ValidationResult $validationResult,
-        string $message = '',
         int $code = 0,
         Throwable $previous = null
     ) {

src/Middleware/ValidationExceptionMiddleware.php

@@ -65,7 +65,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 ->withStatus(422)
                 ->withHeader('Content-Type', 'application/json');
 
-            $data = $this->transformer->transform($exception->getValidationResult());
+            $data = $this->transformer->transform($exception->getValidationResult(), $exception);
             $content = $this->encoder->encode($data);
             $response->getBody()->write($content);
 

src/Transformer/ErrorDetailsResultTransformer.php

@@ -2,6 +2,7 @@
 
 namespace Selective\Validation\Transformer;
 
+use Selective\Validation\Exception\ValidationException;
 use Selective\Validation\ValidationError;
 use Selective\Validation\ValidationResult;
 
@@ -29,21 +30,22 @@ public function __construct(string $detailsName = 'details')
      * Transform the given ValidationResult into an array.
      *
      * @param ValidationResult $validationResult The validation result
+     * @param ValidationException|null $exception The validation exception
      *
      * @return array<mixed> The transformed result
      */
-    public function transform(ValidationResult $validationResult): array
+    public function transform(ValidationResult $validationResult, ValidationException $exception = null): array
     {
         $error = [];
 
-        $code = $validationResult->getCode();
-        if ($code !== null) {
-            $error['code'] = $code;
-        }
+        if ($exception !== null) {
+            if ($exception->getMessage()) {
+                $error['message'] = $exception->getMessage();
+            }
 
-        $message = $validationResult->getMessage();
-        if ($message !== null) {
-            $error['message'] = $message;
+            if ($exception->getCode()) {
+                $error['code'] = $exception->getCode();
+            }
         }
 
         $errors = $validationResult->getErrors();

src/Transformer/ResultTransformerInterface.php

@@ -2,6 +2,7 @@
 
 namespace Selective\Validation\Transformer;
 
+use Selective\Validation\Exception\ValidationException;
 use Selective\Validation\ValidationResult;
 
 /**
@@ -13,8 +14,9 @@ interface ResultTransformerInterface
      * Transform the given ValidationResult into an array.
      *
      * @param ValidationResult $validationResult The validation result
+     * @param ValidationException|null $exception The validation exception
      *
      * @return array<mixed> The transformed result
      */
-    public function transform(ValidationResult $validationResult): array;
+    public function transform(ValidationResult $validationResult, ValidationException $exception = null): array;
 }