Simplify Swagger2 nested model fix to keep items with $ref

The SDK generator parser looks for items.$ref to resolve sub_schema. Keep the items approach but remove the incorrect type: object.
Use allOf wrapping for nested model $ref in spec output
2026-05-26 13:51:13 +00:00 · 2026-04-02 23:32:52 +05:30 · 2026-04-02 23:31:06 +05:30 · 2026-04-02 23:29:14 +05:30
2 changed files with 13 additions and 1 deletions
@@ -931,7 +931,16 @@ class OpenAPI3 extends Format
                    }
                }
                if ($items) {
-                    $output['components']['schemas'][$model->getType()]['properties'][$name]['items'] = $items;
+                    if (!empty($rule['nestedModel']) && !$rule['array']) {
+                        $existing = $output['components']['schemas'][$model->getType()]['properties'][$name];
+                        unset($existing['type']);
+                        $output['components']['schemas'][$model->getType()]['properties'][$name] = \array_merge(
+                            $existing,
+                            ['allOf' => [$items]]
+                        );
+                    } else {
+                        $output['components']['schemas'][$model->getType()]['properties'][$name]['items'] = $items;
+                    }
                }
                if ($rule['type'] === 'enum' && !empty($rule['enum'])) {
                    if ($rule['array']) {
@@ -924,6 +924,9 @@ class Swagger2 extends Format
                    }
                }
                if ($items) {
+                    if (!empty($rule['nestedModel']) && !$rule['array']) {
+                        unset($output['definitions'][$model->getType()]['properties'][$name]['type']);
+                    }
                    $output['definitions'][$model->getType()]['properties'][$name]['items'] = $items;
                }
                if ($rule['type'] === 'enum' && !empty($rule['enum'])) {