Allow also simple lists as result

Don't enforce the result to be a json only having objects, also allow
lists

Author: usox

src/Dispatch/MethodDispatcher.php

@@ -64,12 +64,9 @@ public function dispatch(
 
         $response = $handler->handle($request, $input->parameter);
 
-        /** @var stdClass $decodedResponse */
-        $decodedResponse = (object) Helper::toJSON($response);
-
         $this->methodValidator->validateOutput(
             $schemaContent,
-            $decodedResponse
+            Helper::toJSON($response)
         );
 
         return $response;

src/Dispatch/MethodValidator.php

@@ -14,8 +14,10 @@
 
 final class MethodValidator implements MethodValidatorInterface
 {
-    public function __construct(private Validator $schemaValidator, private ErrorFormatter $errorFormatter)
-    {
+    public function __construct(
+        private Validator $schemaValidator,
+        private ErrorFormatter $errorFormatter
+    ) {
     }
 
     /**
@@ -45,21 +47,30 @@ public function validateInput(
      */
     public function validateOutput(
         stdClass $methodSchemaContent,
-        stdClass $output
+        $output
     ): void {
         if (property_exists($methodSchemaContent->properties, 'response') === true) {
+            $data = new stdClass();
+            $data->data = $output;
+
+            // Wrap the response schema
+            $response = (object) [
+                'type' => 'object',
+                'properties' => (object) [
+                    'data' => $methodSchemaContent->properties->response,
+                ],
+                'required' => ['data']
+            ];
+
             // Validate the response against the response definition in method schema
             $validationResult = $this->schemaValidator->validate(
-                $output,
-                $methodSchemaContent->properties->response
+                $data,
+                $response
             );
 
+            $error = $validationResult->error();
             // Throw exception if the input does not validate against the basic request schema
-            if ($validationResult->isValid() === false) {
-
-                /** @var ValidationError $error */
-                $error = $validationResult->error();
-
+            if ($error !== null) {
                 throw new ResponseMalformedException(
                     'Internal Server Error',
                     StatusCode::INTERNAL_SERVER_ERROR,

src/Dispatch/MethodValidatorInterface.php

@@ -17,10 +17,12 @@ public function validateInput(
     ): void;
 
     /**
+     * @param stdClass|array<mixed> $output
+     *
      * @throws ResponseMalformedException
      */
     public function validateOutput(
         stdClass $methodSchemaContent,
-        stdClass $output
+        $output
     ): void;
 }

tests/Dispatch/MethodValidatorTest.php

@@ -52,7 +52,7 @@ public function testValidateInputThrowsExceptionIfInputDoesNotValidate(): void
             ->with(
                 $parameter,
                 Mockery::on(static function ($value) use ($schemaParameter): bool {
-                    return (array) $value === $schemaParameter;
+                    return json_encode($value) === json_encode($schemaParameter);
                 })
             )
             ->once()
@@ -115,18 +115,24 @@ public function testValidateOutputThrowsExceptionIfOutputDoesNotValidate(): void
 
         $this->schemaValidator->shouldReceive('validate')
             ->with(
-                $output,
+                Mockery::on(static function ($value) use ($output): bool {
+                    return json_encode($value) === json_encode(['data' => $output]);
+                }),
                 Mockery::on(static function ($value) use ($schemaParameter): bool {
-                    return (array) $value === $schemaParameter;
+                    $schemaParameter = [
+                        'type' => 'object',
+                        'properties' => [
+                            'data' => $schemaParameter,
+                        ],
+                        'required' => ['data']
+
+                    ];
+                    return json_encode($value) === json_encode($schemaParameter);
                 })
             )
             ->once()
             ->andReturn($validationResult);
 
-        $validationResult->shouldReceive('isValid')
-            ->withNoArgs()
-            ->once()
-            ->andReturnFalse();
         $validationResult->shouldReceive('error')
             ->withNoArgs()
             ->once()
@@ -153,18 +159,28 @@ public function testValidateOutputValidates(): void
 
         $this->schemaValidator->shouldReceive('validate')
             ->with(
-                $output,
+                Mockery::on(static function ($value) use ($output): bool {
+                    return json_encode($value) === json_encode(['data' => $output]);
+                }),
                 Mockery::on(static function ($value) use ($schemaParameter): bool {
-                    return (array) $value === $schemaParameter;
+                    $schemaParameter = [
+                        'type' => 'object',
+                        'properties' => [
+                            'data' => $schemaParameter,
+                        ],
+                        'required' => ['data']
+
+                    ];
+                    return json_encode($value) === json_encode($schemaParameter);
                 })
             )
             ->once()
             ->andReturn($validationResult);
 
-        $validationResult->shouldReceive('isValid')
+        $validationResult->shouldReceive('error')
             ->withNoArgs()
             ->once()
-            ->andReturnTrue();
+            ->andReturnNull();
 
         $this->subject->validateOutput(
             $content,