Fix missing imports

Author: wol-soft

src/Model/SchemaDefinition/SchemaDefinitionDictionary.php

@@ -180,8 +180,8 @@ protected function parseExternalFile(
 
         // set up a dummy schema to fetch the definitions from the external file
         $schema = new Schema(
+            $schemaProcessor->getCurrentClassPath(),
             'ExternalSchema',
-            '',
             new JsonSchema($jsonSchemaFilePath, $decodedJsonSchema),
             new self(dirname($jsonSchemaFilePath))
         );

src/PropertyProcessor/Property/ReferenceProcessor.php

@@ -35,8 +35,8 @@ public function process(string $propertyName, JsonSchema $propertySchema): Prope
                 if ($this->schema->getClassPath() !== $definition->getSchema()->getClassPath() ||
                     $this->schema->getClassName() !== $definition->getSchema()->getClassName() ||
                     (
-                        $this->schema->getClassPath() === 'ExternalSchema' &&
-                        $definition->getSchema()->getClassPath() === 'ExternalSchema'
+                        $this->schema->getClassName() === 'ExternalSchema' &&
+                        $definition->getSchema()->getClassName() === 'ExternalSchema'
                     )
                 ) {
                     $this->schema->addNamespaceTransferDecorator(

src/SchemaProcessor/SchemaProcessor.php

@@ -260,9 +260,24 @@ public function createMergedProperty(
 
             $this->transferPropertiesToMergedSchema($schema, $mergedPropertySchema, $compositionProperties);
 
+            // make sure the merged schema knows all imports of the parent schema
+            $mergedPropertySchema->addNamespaceTransferDecorator(new SchemaNamespaceTransferDecorator($schema));
+
             $this->generateClassFile($this->getCurrentClassPath(), $mergedClassName, $mergedPropertySchema);
         }
 
+        $mergedSchema = $this->processedMergedProperties[$schemaSignature]->getNestedSchema();
+        $schema->addUsedClass(
+            join(
+                '\\',
+                array_filter([
+                    $this->generatorConfiguration->getNamespacePrefix(),
+                    $mergedSchema->getClassPath(),
+                    $mergedSchema->getClassName(),
+                ])
+            )
+        );
+
         $property->addTypeHintDecorator(
             new CompositionTypeHintDecorator($this->processedMergedProperties[$schemaSignature])
         );
@@ -322,16 +337,7 @@ function () use ($property, $schema, $mergedPropertySchema): void {
                                 return false;
                             })
                         );
-
-                        // the parent schema needs to know about all imports of the nested classes as all properties
-                        // of the nested classes are available in the parent schema (combined schema merging)
-                        $schema->addNamespaceTransferDecorator(
-                            new SchemaNamespaceTransferDecorator($property->getNestedSchema())
-                        );
                     }
-
-                    // make sure the merged schema knows all imports of the parent schema
-                    $mergedPropertySchema->addNamespaceTransferDecorator(new SchemaNamespaceTransferDecorator($schema));
                 }
             );
         }