Merge pull request #23 from php-api-clients/generate-nested-schemas-on-the-fly

Generate nested schemas on the fly

Author: WyriHaximus

openapi-client.yaml

@@ -1,3 +1,4 @@
-spec: https://raw.githubusercontent.com/github/rest-api-description/main/descriptions/api.github.com/api.github.com.yaml
+spec: https://raw.githubusercontent.com/octokit/webhooks/openapi/payload-schemas/openapi-schema.yml
+#spec: https://raw.githubusercontent.com/github/rest-api-description/main/descriptions/api.github.com/api.github.com.yaml
 namespace: ApiClients\Client\Github
 destination: generated

src/Generator/Schema.php

@@ -4,6 +4,7 @@
 
 use ApiClients\Tools\OpenApiClientGenerator\File;
 use cebe\openapi\spec\Schema as OpenAPiSchema;
+use Jawira\CaseConverter\Convert;
 use PhpParser\Builder\Param;
 use PhpParser\BuilderFactory;
 use PhpParser\Node;
@@ -75,9 +76,15 @@ public static function generate(string $name, string $namespace, string $classNa
                 )
             );
             if (is_string($property->type)) {
-                if ($property->type === 'array' && $property->items instanceof OpenAPiSchema && array_key_exists(spl_object_hash($property->items), $schemaClassNameMap)) {
-                    $docBlock[] = '@var array<\\' . $namespace . '\\' . $schemaClassNameMap[spl_object_hash($property->items)] . '>';
-                    $docBlock[] = '@\WyriHaximus\Hydrator\Attribute\HydrateArray(\\' . $namespace . '\\' . $schemaClassNameMap[spl_object_hash($property->items)] . '::class)';
+                if ($property->type === 'array' && $property->items instanceof OpenAPiSchema) {
+                    if (array_key_exists(spl_object_hash($property->items), $schemaClassNameMap)) {
+                        $docBlock[] = '@var array<\\' . $namespace . '\\' . $schemaClassNameMap[spl_object_hash($property->items)] . '>';
+                        $docBlock[] = '@\WyriHaximus\Hydrator\Attribute\HydrateArray(\\' . $namespace . '\\' . $schemaClassNameMap[spl_object_hash($property->items)] . '::class)';
+                    } elseif ($property->items->type === 'object') {
+                        yield from self::generate($name . '::' . $propertyName, $namespace . '\\' . $className, (new Convert($propertyName))->toPascal(), $property->items, $schemaClassNameMap);
+                        $docBlock[] = '@var array<\\' . $namespace . '\\' . $className . '\\' . (new Convert($propertyName))->toPascal() . '>';
+                        $docBlock[] = '@\WyriHaximus\Hydrator\Attribute\HydrateArray(\\' . $namespace . '\\' . $className . '\\' . (new Convert($propertyName))->toPascal() . '::class)';
+                    }
                 }
                 $t = str_replace([
                     'object',