Fix #31

Author: hkarlstrom

src/OpenApiValidation.php

@@ -204,7 +204,7 @@ public function validateResponseBody(ResponseInterface &$response, string $path,
         if (null === $responseBodyData && $responseSchema) {
             return [['name' => 'responseBody', 'code' => 'error_required']];
         }
-        $errors = $this->validateObject($responseSchema, $responseBodyData);
+        $errors = $this->validateObject($responseSchema, json_encode($responseBodyData, JSON_PRESERVE_ZERO_FRACTION));
         if ($this->options['stripResponse']) {
             $notAdditionalOrNullErrors = [];
             foreach ($errors as $error) {
@@ -250,7 +250,14 @@ public function validateRequest(ServerRequestInterface &$request, string $path,
         if ($requestBody && $requestMediaType = $requestBody->getContent($mediaType)) {
             if (null === $requestBodyData && $requestBody->required) {
                 $errors[] = ['name' => 'requestBody', 'code' => 'error_required'];
-            } elseif ($requestBodyData && $this->isJsonMediaType($mediaType)) {
+            } elseif (null !== $requestBodyData && $this->isJsonMediaType($mediaType)) {
+
+                if (empty($requestBodyData)) {
+                    // We don't know if the empty request body was an array [] or a object {}, both are decoded to [] by json_decode
+                    $requestBodyData = $request->getBody();
+                } else {
+                    $requestBodyData = json_encode($requestBodyData, JSON_PRESERVE_ZERO_FRACTION);
+                }
                 $errors = array_merge($errors, $this->validateObject($requestMediaType->schema, $requestBodyData));
             } elseif ('multipart/form-data' === $mediaType) {
                 $errors = array_merge($errors, $this->validateFormData($requestMediaType->schema, $requestMediaType->encoding, $request));
@@ -364,7 +371,7 @@ private function validateProperties(array $properties) : ?array
         return $errors;
     }
 
-    private function validateObject(array $schema, array $value) : array
+    private function validateObject(array $schema, string $value) : array
     {
         $errors = [];
         foreach (SchemaHelper::getFormats($schema) as $f) {
@@ -374,7 +381,7 @@ private function validateObject(array $schema, array $value) : array
         $validator->setFormats($this->formatContainer);
         $schema = SchemaHelper::openApiToJsonSchema($schema);
         try {
-            $value  = json_decode(json_encode($value, JSON_PRESERVE_ZERO_FRACTION));
+            $value  = json_decode($value);
             $schema = json_decode(json_encode($schema, JSON_PRESERVE_ZERO_FRACTION));
             $result = $validator->dataValidation($value, $schema, 99);
         } catch (Exception $e) {

tests/BaseTest.php

@@ -39,7 +39,11 @@ protected function response(string $method, string $uri, array $args = []) : Res
         ]);
         $request = Request::createFromEnvironment($env);
         if (isset($args['body'])) {
-            $request->getBody()->write(json_encode($args['body']));
+            if (is_array($args['body'])) {
+                $request->getBody()->write(json_encode($args['body']));
+            } else {
+                $request->getBody()->write($args['body']);
+            }
             $request->getBody()->rewind();
             $request = $request->withHeader('Content-Type', $args['bodyContentType'] ?? 'application/json');
         }

tests/RequestBodyTest.php

@@ -188,9 +188,17 @@ public function testHashMapObject()
 
     public function testEmptyBody()
     {
-        $response = $this->response('post', '/request/body/empty/required', ['body' => []]);
+        $response = $this->response('post', '/request/body/empty/required');
         $json     = $this->json($response);
-        $this->assertTrue($json['ok']);
-        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(400, $response->getStatusCode());
+        $this->assertSame('requestBody', $json['errors'][0]['name']);
+        $this->assertSame('error_required', $json['errors'][0]['code']);
+
+        $response = $this->response('post', '/request/body/empty/required', ['body' => '{}']);
+        $json     = $this->json($response);
+        $this->assertSame(400, $response->getStatusCode());
+        $this->assertSame('foo', $json['errors'][0]['name']);
+        $this->assertSame('error_required', $json['errors'][0]['code']);
+        $this->assertSame('body', $json['errors'][0]['in']);
     }
 }

tests/testapi.json

@@ -249,6 +249,7 @@
                         "application/json": {
                             "schema": {
                                 "type": "object",
+                                "required":["foo"],
                                 "properties": {
                                     "foo": {
                                         "type": "string"
@@ -280,6 +281,7 @@
                         "application/json": {
                             "schema": {
                                 "type": "object",
+                                "required":["foo"],
                                 "properties": {
                                     "foo": {
                                         "type": "string"