update jsonschema

apioo · Oct 9, 2024 · 5d54a09 · 5d54a09
1 parent bebcd79
commit 5d54a09
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/src/Generator/JsonSchema.php b/src/Generator/JsonSchema.php
@@ -117,15 +117,11 @@ protected function generateType(TypeInterface $type, DefinitionsInterface $defin
             }
 
             if ($parent instanceof ReferencePropertyType) {
-                $target = $parent->getTarget();
                 unset($data['parent']);
 
-                $parentType = $definitions->getType($target);
-                $parent = $this->generateType($parentType, $definitions, $parent->getTemplate());
-
                 return [
                     'allOf' => [
-                        $parent,
+                        $this->generateType($parent, $definitions, $template),
                         $data,
                     ]
                 ];
@@ -153,11 +149,19 @@ protected function generateType(TypeInterface $type, DefinitionsInterface $defin
 
             return $data;
         } elseif ($type instanceof ReferencePropertyType) {
-            [$ns, $name] = TypeUtil::split($type->getTarget());
+            $targetType = $definitions->getType($type->getTarget());
+            $hasGenerics = TypeUtil::contains($targetType, GenericPropertyType::class);
+
+            if ($hasGenerics) {
+                // in case the referenced type has generics we resolve
+                return $this->generateType($targetType, $definitions, $type->getTemplate());
+            } else {
+                [$ns, $name] = TypeUtil::split($type->getTarget());
 
-            return [
-                '$ref' => $this->refBase . $name
-            ];
+                return [
+                    '$ref' => $this->refBase . $name
+                ];
+            }
         } elseif ($type instanceof AnyPropertyType) {
             return (object) [];
         } elseif ($type instanceof GenericPropertyType) {

diff --git a/tests/Generator/resource/jsonschema/jsonschema_oop.json b/tests/Generator/resource/jsonschema/jsonschema_oop.json
@@ -46,15 +46,7 @@
     "Student": {
       "allOf": [
         {
-          "type": "object",
-          "properties": {
-            "firstName": {
-              "type": "string"
-            },
-            "parent": {
-              "$ref": "#/definitions/Human"
-            }
-          }
+          "$ref": "#/definitions/Human"
         },
         {
           "type": "object",