Compose properties into a single model providing access to all available properties if one of the composing definitions [allOf, anyOf, oneOf] is used.

Remove SchemaPropertyProcessors and start directly with an object property. If a generation process for an object is started the object is represented by the BaseProcessor.

Extend README with a small description how this stuff works (to be extended)

Author: wol-soft

README.md

@@ -38,6 +38,8 @@ $generator = new Generator(
 
 $generator->generateModels(__DIR__ . '/schema', __DIR__ . '/result');
 ```
+
+The generator will check the given source directory recursive and convert all found *.json files to models. All JSON-Schema files inside the source directory must provide a schema of an object.
 ## Configuring using the GeneratorConfiguration ##
 
 The *GeneratorConfiguration* object offers the following methods to configure the generator in a fluid interface:
@@ -49,10 +51,19 @@ Method | Configuration | Example | Default
 ``` setPrettyPrint(bool $prettyPrint) ``` | If set to false, the generated model classes won't follow coding gudelines (but the generation is faster). If enabled the package [Symplify/EasyCodingStandard](https://github.com/Symplify/EasyCodingStandard) will be used to clean up the generated code. | ``` setPrettyPrint(false) ``` | true
 ``` setOutputEnabled(bool $prettyPrint) ``` | Enable or disable output of the generation process to STDOUT | ``` setOutputEnabled(false) ``` | true
 
+## How the heck does this work? ##
+
+The class generation process basically splits up into three to four steps:
+
+- Scan the given source directory to find all *.json files which should be processed.
+- Loop over all schemas which should be generated. This is the main step of the class generation. Now each schema is parsed and a Schema model class which holds the properties for the generated model is populated. After the model is finished a RenderJob is generated and added to the RenderQueue. If a JSON-Schema contains nested objects or references multiple RenderJobs may be added to the RenderQueue for a given schema file.
+- After all schema files have been parsed without an error the RenderQueue will be worked off. All previous added RenderJobs will be executed and the PHP classes will be saved to the filesystem at the given destination directory.
+- If pretty printing is enabled the generated PHP classes will be cleaned up for a better code formatting. Done.
+
 ## Tests ##
 
-After installing the dependencies of the library via `composer update` you can execute the tests with `./vendor/bin/phpunit` (Linux) or `vendor\bin\phpunit.bat` (Windows). The test names are optimized for the usage of the `--testdox` output.
+After installing the dependencies of the library via `composer update` you can execute the tests with `./vendor/bin/phpunit` (Linux) or `vendor\bin\phpunit.bat` (Windows). The test names are optimized for the usage of the `--testdox` output. Most tests are atomic integration tests which will set up a JSON-Schema file and generate a class from the schema and test the behaviour of the generated class afterwards.
 
 During the execution the tests will create a directory PHPModelGeneratorTest in tmp where JSON-Schema files and PHP classes will be written to.
 
-If a test which creates a PHP class from a JSON-Schema fails the JSON-Schema and the class will be dumped to `./Failed-classes`
+If a test which creates a PHP class from a JSON-Schema fails the JSON-Schema and the generated class(es) will be dumped to `./Failed-classes`

src/Model/Property/Property.php

@@ -4,6 +4,7 @@
 
 namespace PHPModelGenerator\Model\Property;
 
+use PHPModelGenerator\Model\Schema;
 use PHPModelGenerator\Model\Validator;
 use PHPModelGenerator\Model\Validator\PropertyValidatorInterface;
 use PHPModelGenerator\PropertyProcessor\Decorator\PropertyDecoratorInterface;
@@ -28,6 +29,8 @@ class Property implements PropertyInterface
     protected $validator = [];
     /** @var Property[] */
     protected $nestedProperties = [];
+    /** @var Schema */
+    protected $schema;
     /** @var PropertyDecoratorInterface[] */
     public $decorators = [];
 
@@ -232,4 +235,21 @@ public function isRequired(): bool
     {
         return $this->isPropertyRequired;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNestedSchema(Schema $schema): PropertyInterface
+    {
+        $this->schema = $schema;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNestedSchema(): ?Schema
+    {
+        return $this->schema;
+    }
 }

src/Model/Property/PropertyInterface.php

@@ -4,6 +4,7 @@
 
 namespace PHPModelGenerator\Model\Property;
 
+use PHPModelGenerator\Model\Schema;
 use PHPModelGenerator\Model\Validator;
 use PHPModelGenerator\Model\Validator\PropertyValidatorInterface;
 use PHPModelGenerator\PropertyProcessor\Decorator\PropertyDecoratorInterface;
@@ -119,4 +120,20 @@ public function setRequired(bool $isPropertyRequired): PropertyInterface;
      * @return bool
      */
     public function isRequired(): bool;
+
+    /**
+     * Set a nested schema
+     *
+     * @param Schema $schema
+     *
+     * @return PropertyInterface
+     */
+    public function setNestedSchema(Schema $schema);
+
+    /**
+     * Get a nested schema if a schema was appended to the property
+     *
+     * @return null|Schema
+     */
+    public function getNestedSchema(): ?Schema;
 }

src/Model/Property/PropertyProxy.php

@@ -5,6 +5,7 @@
 namespace PHPModelGenerator\Model\Property;
 
 use PHPModelGenerator\Model\ResolvedDefinitionsCollection;
+use PHPModelGenerator\Model\Schema;
 use PHPModelGenerator\Model\Validator\PropertyValidatorInterface;
 use PHPModelGenerator\PropertyProcessor\Decorator\PropertyDecoratorInterface;
 
@@ -169,4 +170,20 @@ public function isRequired(): bool
     {
         return $this->getProperty()->isRequired();
     }
-}
+
+    /**
+     * @inheritdoc
+     */
+    public function setNestedSchema(Schema $schema): PropertyInterface
+    {
+        return $this->getProperty()->setNestedSchema($schema);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNestedSchema(): ?Schema
+    {
+        return $this->getProperty()->getNestedSchema();
+    }
+}

src/Model/Schema.php

@@ -33,7 +33,7 @@ public function __construct(array $parentDefinitions = [])
     }
 
     /**
-     * @return Property[]
+     * @return PropertyInterface[]
      */
     public function getProperties(): array
     {
@@ -44,10 +44,16 @@ public function getProperties(): array
      * @param PropertyInterface $property
      *
      * @return $this
+     *
+     * @throws SchemaException
      */
     public function addProperty(PropertyInterface $property)
     {
-        $this->properties[] = $property;
+        if (isset($this->properties[$property->getName()])) {
+            throw new SchemaException("Duplicate object property {$property->getName()}");
+        }
+
+        $this->properties[$property->getName()] = $property;
 
         return $this;
     }
@@ -115,7 +121,7 @@ public function getUseList(bool $skipGlobalNamespace): array
     public function addDefinition(string $key, SchemaDefinition $definition)
     {
         if (isset($this->definitions[$key])) {
-            throw new SchemaException("Duplicate key for schema definition: $key");
+            return;
         }
 
         $this->definitions[$key] = $definition;

src/Model/SchemaDefinition.php

@@ -65,6 +65,8 @@ public function resolveReference(
         PropertyCollectionProcessor $propertyCollectionProcessor
     ): PropertyInterface {
         $structure = $this->structure;
+        $originalPath = $path;
+
         while ($segment = array_shift($path)) {
             if (!isset($structure[$segment])) {
                 throw new SchemaException("Unresolved path segment: $segment");
@@ -73,7 +75,7 @@ public function resolveReference(
             $structure = $structure[$segment];
         }
 
-        $key = implode('-', $path);
+        $key = implode('-', $originalPath);
 
         if (!$this->resolvedPaths->offsetExists($key)) {
             // create a dummy entry for the path first. If the path is used recursive the recursive usages will point
@@ -90,7 +92,7 @@ public function resolveReference(
                     )
                 );
             } catch (PHPModelGeneratorException $exception) {
-                unset($this->resolvedPaths[$key]);
+                $this->resolvedPaths->offsetUnset($key);
                 throw $exception;
             }
         }

src/Model/Validator/ComposedPropertyValidator.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace PHPModelGenerator\Model\Validator;
+
+use PHPModelGenerator\Exception\InvalidArgumentException;
+use PHPModelGenerator\Model\Property\PropertyInterface;
+
+/**
+ * Class ComposedPropertyValidator
+ *
+ * @package PHPModelGenerator\Model\Validator
+ */
+class ComposedPropertyValidator extends PropertyTemplateValidator
+{
+    /** @var string */
+    protected $composedProcessor;
+    /** @var PropertyInterface[] */
+    protected $composedProperties;
+
+    /**
+     * ComposedPropertyValidator constructor.
+     *
+     * @param PropertyInterface   $property
+     * @param PropertyInterface[] $composedProperties
+     * @param string              $composedProcessor
+     * @param array               $validatorVariables
+     */
+    public function __construct(
+        PropertyInterface $property,
+        array $composedProperties,
+        string $composedProcessor,
+        array $validatorVariables
+    ) {
+        parent::__construct(
+            InvalidArgumentException::class,
+            "Invalid value for {$property->getName()} declined by composition constraint",
+            DIRECTORY_SEPARATOR . 'Validator' . DIRECTORY_SEPARATOR . 'ComposedItem.phptpl',
+            $validatorVariables
+        );
+
+        $this->composedProcessor = $composedProcessor;
+        $this->composedProperties = $composedProperties;
+    }
+
+    /**
+     * @return string
+     */
+    public function getComposedProcessor(): string
+    {
+        return $this->composedProcessor;
+    }
+
+    /**
+     * @return PropertyInterface[]
+     */
+    public function getComposedProperties(): array
+    {
+        return $this->composedProperties;
+    }
+}

src/PropertyProcessor/ComposedValue/AbstractComposedPropertiesProcessor.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace PHPModelGenerator\PropertyProcessor\ComposedValue;
+
+/**
+ * Class AbstractComposedPropertiesProcessor
+ *
+ * @package PHPModelGenerator\PropertyProcessor\ComposedValue
+ */
+abstract class AbstractComposedPropertiesProcessor extends AbstractComposedValueProcessor
+{
+}

src/PropertyProcessor/ComposedValue/AbstractComposedValueProcessor.php

@@ -2,10 +2,9 @@
 
 namespace PHPModelGenerator\PropertyProcessor\ComposedValue;
 
-use PHPModelGenerator\Exception\InvalidArgumentException;
 use PHPModelGenerator\Model\Property\PropertyInterface;
 use PHPModelGenerator\Model\Validator;
-use PHPModelGenerator\Model\Validator\PropertyTemplateValidator;
+use PHPModelGenerator\Model\Validator\ComposedPropertyValidator;
 use PHPModelGenerator\Model\Validator\RequiredPropertyValidator;
 use PHPModelGenerator\PropertyProcessor\Property\AbstractTypedValueProcessor;
 use PHPModelGenerator\PropertyProcessor\PropertyCollectionProcessor;
@@ -28,6 +27,7 @@ protected function generateValidators(PropertyInterface $property, array $proper
         $propertyFactory = new PropertyFactory(new PropertyProcessorFactory());
 
         $properties = [];
+
         foreach ($propertyData['composition'] as $compositionElement) {
             $compositionProperty = $propertyFactory
                 ->create(
@@ -48,12 +48,13 @@ protected function generateValidators(PropertyInterface $property, array $proper
         $availableAmount = count($properties);
 
         $property->addValidator(
-            new PropertyTemplateValidator(
-                InvalidArgumentException::class,
-                "Invalid value for {$property->getName()} declined by composition constraint",
-                DIRECTORY_SEPARATOR . 'Validator' . DIRECTORY_SEPARATOR . 'ComposedItem.phptpl',
+            new ComposedPropertyValidator(
+                $property,
+                $properties,
+                static::class,
                 [
                     'properties' => $properties,
+                    'property' => $property,
                     'viewHelper' => new RenderHelper(),
                     'availableAmount' => $availableAmount,
                     'composedValueValidation' => $this->getComposedValueValidation($availableAmount),

src/PropertyProcessor/ComposedValue/AllOfProcessor.php

@@ -7,7 +7,7 @@
  *
  * @package PHPModelGenerator\PropertyProcessor\ComposedValue
  */
-class AllOfProcessor extends AbstractComposedValueProcessor
+class AllOfProcessor extends AbstractComposedPropertiesProcessor
 {
     /**
      * @inheritdoc