Merge pull request #161 from php-api-clients/several-bug-fixes

Several bug fixes

Author: WyriHaximus

src/Generator.php

@@ -84,7 +84,7 @@ public function __construct(
         $this->forceGeneration = is_string(getenv('FORCE_GENERATION')) && strlen(getenv('FORCE_GENERATION')) > 0;
 
         $this->statusOutput = new StatusOutput(
-            ! (new CiDetector())->isCiDetected(),
+            false,//! (new CiDetector())->isCiDetected(),
             new Step('hash_current_spec', 'Hashing current spec', false),
             new Step('loading_state', 'Loading state', false),
             new Step('loading_spec', 'Loading spec', false),
@@ -284,10 +284,8 @@ private function all(string $configurationLocation): iterable
     {
         $schemaRegistry = new SchemaRegistry(
             $this->configuration->namespace,
-            false,
-            false,
-            //            $this->configuration->schemas->allowDuplication ?? false,
-            //            $this->configuration->schemas->useAliasesForDuplication ?? false,
+                        $this->configuration->schemas->allowDuplication ?? false,
+                        $this->configuration->schemas->useAliasesForDuplication ?? false,
         );
         $schemas                 = [];
         $throwableSchemaRegistry = new ThrowableSchema();
@@ -737,19 +735,17 @@ private function subSplitClient(
 
         $this->statusOutput->itemForStep('generating_schemas', count($schemas));
         foreach ($schemas as $schema) {
+            yield from Schema::generate(
+                $this->configuration->subSplit->subSplitsDestination . DIRECTORY_SEPARATOR . $this->splitPathPrefix($this->configuration->subSplit->sectionPackage, 'common') . $this->configuration->destination->source,
+                $schema,
+                [...$schemaRegistry->aliasesForClassName($schema->className->relative)],
+            );
+
             if ($throwableSchemaRegistry->has($schema->className->relative)) {
                 yield from Error::generate(
                     $this->configuration->subSplit->subSplitsDestination . DIRECTORY_SEPARATOR . $this->splitPathPrefix($this->configuration->subSplit->sectionPackage, 'common') . $this->configuration->destination->source,
                     $schema,
                 );
-            } else {
-                $aliases = [...$schemaRegistry->aliasesForClassName($schema->className->relative)];
-
-                yield from Schema::generate(
-                    $this->configuration->subSplit->subSplitsDestination . DIRECTORY_SEPARATOR . $this->splitPathPrefix($this->configuration->subSplit->sectionPackage, count($aliases) > 0 ? 'common' : $sortedSchemas[$schema->className->relative]['section']) . $this->configuration->destination->source,
-                    $schema,
-                    $aliases,
-                );
             }
 
             $this->statusOutput->advanceStep('generating_schemas');

src/Generator/Schema.php

@@ -44,8 +44,8 @@ public static function generate(string $pathPrefix, Representation\Schema $schem
         $className = $schema->className;
         if (count($aliases) > 0) {
             $className = ClassString::factory(
-                $className->namespace,
-                'Schema\\AliasAbstract\\Abstract' . md5(json_encode($schema->schema->getSerializableData())),
+                $className->baseNamespaces,
+                'Schema\\AliasAbstract\\Tiet' . implode('\\Tiet', str_split(strtoupper(md5(json_encode($schema->schema->getSerializableData()))), 8)),
             );
             $aliases[] = $schema->className;
         }
@@ -133,6 +133,19 @@ public static function generate(string $pathPrefix, Representation\Schema $schem
             $types = [];
             if ($property->type->type === 'union' && is_array($property->type->payload)) {
                 $types[] = self::buildUnionType($property->type);
+                $schemaClasses = [...self::getUnionTypeSchemas($property->type)];
+
+                if (count($schemaClasses) > 0) {
+                    $castToUnionToType = ClassString::factory($schema->className->baseNamespaces, Utils::className('Attribute\\CastUnionToType\\' . $schema->className->relative . '\\' . $property->name));
+
+                    yield from CastUnionToType::generate($pathPrefix, $castToUnionToType, ...$schemaClasses);
+
+                    $constructorParam->addAttribute(
+                        new Node\Attribute(
+                            new Node\Name($castToUnionToType->fullyQualified->source),
+                        ),
+                    );
+                }
             }
 
             if ($property->type->type === 'array' && ! is_string($property->type->payload)) {
@@ -196,7 +209,11 @@ public static function generate(string $pathPrefix, Representation\Schema $schem
                 $nullable = count($types) > 1 || count(explode('|', implode('|', $types))) > 1 ? 'null|' : '?';
             }
 
-            $constructor->addParam($constructorParam->setType($nullable . implode('|', $types)));
+            if (count($types) > 0) {
+                $constructorParam->setType($nullable . implode('|', $types));
+            }
+
+            $constructor->addParam($constructorParam);
         }
 
         if (count($constructDocBlock) > 0) {
@@ -211,7 +228,7 @@ public static function generate(string $pathPrefix, Representation\Schema $schem
             $aliasTms   = $factory->namespace($alias->namespace->source);
             $aliasClass = $factory->class($alias->className)->makeFinal()->makeReadonly()->extend($className->relative);
 
-            yield new File($pathPrefix, $alias->className, $aliasTms->addStmt($aliasClass)->getNode());
+            yield new File($pathPrefix, $alias->relative, $aliasTms->addStmt($aliasClass)->getNode());
         }
     }
 

src/Registry/Schema.php

@@ -85,13 +85,13 @@ public function get(openAPISchema $schema, string $fallbackName): string
         $className = Utils::fixKeyword($fallbackName);
 
         if ($this->allowDuplicatedSchemas && $this->useAliasesForDuplication && array_key_exists($json, $this->json)) {
-            $this->aliasses[$this->json[$json]][] = ClassString::factory($this->baseNamespaces, 'Schema\\' . $className);
+            $this->aliasses['Schema\\' . $this->json[$json]][] = ClassString::factory($this->baseNamespaces, 'Schema\\' . $className);
 
             return $className;
         }
 
         if ($this->allowDuplicatedSchemas && $this->useAliasesForDuplication && array_key_exists($json, $this->unknownSchemasJson)) {
-            $this->aliasses[$this->unknownSchemasJson[$json]][] = ClassString::factory($this->baseNamespaces, 'Schema\\' . $className);
+            $this->aliasses['Schema\\' . $this->unknownSchemasJson[$json]][] = ClassString::factory($this->baseNamespaces, 'Schema\\' . $className);
 
             return $className;
         }
@@ -133,6 +133,6 @@ public function aliasesForClassName(string $classname): iterable
             return;
         }
 
-        yield from array_unique($this->aliasses[$classname]);
+        yield from $this->aliasses[$classname];
     }
 }