fix jsonschema generator

apioo · Oct 9, 2024 · c90334e · c90334e
1 parent 557c369
commit c90334e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/Generator/JsonSchema.php b/src/Generator/JsonSchema.php
@@ -123,6 +123,7 @@ protected function generateType(TypeInterface $type, DefinitionsInterface $defin
             }
         } elseif ($type instanceof MapTypeInterface) {
             $data = $type->toArray();
+            $data['type'] = 'object';
 
             if (isset($data['schema']) && $data['schema'] instanceof TypeInterface) {
                 $data['additionalProperties'] = $this->generateType($data['schema'], $definitions, $template);
@@ -132,6 +133,7 @@ protected function generateType(TypeInterface $type, DefinitionsInterface $defin
             return $data;
         } elseif ($type instanceof ArrayTypeInterface) {
             $data = $type->toArray();
+            $data['type'] = 'array';
 
             if (isset($data['schema']) && $data['schema'] instanceof TypeInterface) {
                 $data['items'] = $this->generateType($data['schema'], $definitions, $template);

diff --git a/tests/Generator/resource/jsonschema/jsonschema.json b/tests/Generator/resource/jsonschema/jsonschema.json
@@ -43,7 +43,7 @@
             }
         },
         "Meta": {
-            "type": "map",
+            "type": "object",
             "additionalProperties": {
                 "type": "string"
             }
@@ -56,19 +56,19 @@
                     "$ref": "#/definitions/Meta"
                 },
                 "inlineConfig": {
-                    "type": "map",
+                    "type": "object",
                     "additionalProperties": {
                         "type": "string"
                     }
                 },
                 "mapTags": {
-                    "type": "map",
+                    "type": "object",
                     "additionalProperties": {
                         "type": "string"
                     }
                 },
                 "mapReceiver": {
-                    "type": "map",
+                    "type": "object",
                     "additionalProperties": {
                         "$ref": "#/definitions/Author"
                     }
@@ -139,19 +139,19 @@
             "$ref": "#/definitions/Meta"
         },
         "inlineConfig": {
-            "type": "map",
+            "type": "object",
             "additionalProperties": {
                 "type": "string"
             }
         },
         "mapTags": {
-            "type": "map",
+            "type": "object",
             "additionalProperties": {
                 "type": "string"
             }
         },
         "mapReceiver": {
-            "type": "map",
+            "type": "object",
             "additionalProperties": {
                 "$ref": "#/definitions/Author"
             }

diff --git a/tests/Generator/resource/jsonschema/jsonschema_complex.json b/tests/Generator/resource/jsonschema/jsonschema_complex.json
@@ -321,14 +321,14 @@
       "properties": {
         "import": {
           "description": "",
-          "type": "map",
+          "type": "object",
           "additionalProperties": {
             "type": "string"
           }
         },
         "definitions": {
           "description": "",
-          "type": "map",
+          "type": "object",
           "additionalProperties": {
             "$ref": "#/definitions/DefinitionType"
           }
@@ -383,7 +383,7 @@
             },
             "properties": {
               "description": "",
-              "type": "map",
+              "type": "object",
               "additionalProperties": {
                 "$ref": "#/definitions/PropertyType"
               }
@@ -394,14 +394,14 @@
             },
             "mapping": {
               "description": "In case a discriminator property was set it is possible to specify a mapping. The key is the type name and the value the concrete value which is mapped to the type",
-              "type": "map",
+              "type": "object",
               "additionalProperties": {
                 "type": "string"
               }
             },
             "template": {
               "description": "In case the parent type contains generics it is possible to set a concrete type for each generic type",
-              "type": "map",
+              "type": "object",
               "additionalProperties": {
                 "type": "string"
               }
@@ -416,14 +416,14 @@
   "properties": {
     "import": {
       "description": "",
-      "type": "map",
+      "type": "object",
       "additionalProperties": {
         "type": "string"
       }
     },
     "definitions": {
       "description": "",
-      "type": "map",
+      "type": "object",
       "additionalProperties": {
         "$ref": "#/definitions/DefinitionType"
       }