Add a failing test for nullable values (#12)

Fix #11

Author: lezhnev74

composer.lock

@@ -260,14 +260,7 @@ private function validateRequest(ServerRequestInterface &$request, string $path,
                 switch ($mediaType) {
                     case 'application/json':
                         if (!empty($requestBodyData)) {
-                            $objectErrors = $this->validateObject($requestMediaType->schema, $requestBodyData);
-                            foreach ($objectErrors as $error) {
-                                if (!('error_type' == $error['code']
-                                    && 'null' == $error['used']
-                                    && SchemaHelper::isNullable($requestMediaType->schema, explode('.', $error['name'])))) {
-                                    $errors[] = $error;
-                                }
-                            }
+                            $errors = $this->validateObject($requestMediaType->schema, $requestBodyData);
                         }
                         break;
                     case 'multipart/form-data':
@@ -364,7 +357,7 @@ private function validateObject(array $schema, array $value) : array
         }
         $validator = new Validator();
         $validator->setFormats($this->formatContainer);
-        $schema = SchemaHelper::mergeAllOf($schema);
+        $schema = SchemaHelper::openApiToJsonSchema($schema);
         try {
             $value  = json_decode(json_encode($value));
             $schema = json_decode(json_encode($schema));

src/OpenApiValidation.php

@@ -13,20 +13,7 @@
 
 class Schema
 {
-    public static function addRecursive(array $schema, string $attribute, $value) : array
-    {
-        if (($schema['type'] ?? null) === 'object') {
-            $schema[$attribute] = $value;
-        }
-        foreach ($schema as $attr => $val) {
-            if (is_array($val)) {
-                $schema[$attr] = self::addRecursive($schema[$attr], $attribute, $value);
-            }
-        }
-        return $schema;
-    }
-
-    public static function mergeAllOf(array $schema) : array
+    public static function openApiToJsonSchema(array $schema) : array
     {
         if (isset($schema['allOf']) && is_array($schema['allOf'])) {
             $allOf = $schema['allOf'];
@@ -38,9 +25,13 @@ public static function mergeAllOf(array $schema) : array
             }
             $schema = \Ckr\Util\ArrayMerger::doMerge($schema, $merged);
         }
+        if ($schema['nullable'] ?? false) {
+            unset($schema['nullable']);
+            $schema['type'] = [$schema['type'], 'null'];
+        }
         foreach ($schema as $attr => $val) {
             if (is_array($val)) {
-                $schema[$attr] = self::mergeAllOf($val);
+                $schema[$attr] = self::openApiToJsonSchema($val);
             }
         }
         return $schema;
@@ -94,9 +85,4 @@ public static function getFormats(array $schema) : array
         $callback($schema, $formats);
         return $formats;
     }
-
-    public static function isNullable(array $schema, array $path) : bool
-    {
-        return true;
-    }
 }

src/OpenApiValidation/Helpers/Schema.php

@@ -116,4 +116,16 @@ public function testResponseInvalidHeaderFormat()
         $this->assertSame('string', $error['used']);
         $this->assertSame('header', $error['in']);
     }
+
+    public function testResponseWithNullableBodyAttributes()
+    {
+        $response = $this->response('get', '/response/nullable', [
+            'customHandler' => function ($request, ResponseInterface $response) {
+                return $response->withJson(['ok' => null]);
+            },
+        ]);
+        $json = $this->json($response);
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(null, $json['ok']);
+    }
 }

tests/ResponsesTest.php

@@ -657,6 +657,28 @@
                     }
                 }
             }
+        },
+        "/response/nullable": {
+            "get": {
+                "operationId": "getNullableResponse",
+                "responses": {
+                    "200": {
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "type": "object",
+                                    "properties": {
+                                        "ok": {
+                                            "type": "boolean",
+                                            "nullable": true
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 }