* Added PatternPropertiesAccessorPostProcessor

* moved SerializationPostProcessor to internal post processors
* Basic implementation of interaction between overlapping properties
    * object properties and pattern properties
    * additional properties and pattern properties

Author: wol-soft

docs/source/gettingStarted.rst

@@ -11,7 +11,7 @@ The recommended way to install php-json-model-generator is through `Composer <ht
     composer require --dev wol-soft/php-json-schema-model-generator
     composer require wol-soft/php-json-schema-model-generator-production
 
-To avoid adding all dependencies of the php-json-model-generator to your production dependencies it's recommended to add the library as a dev-dependency and include the php-json-model-generator-exception library. The exception library provides all classes to run the generated code. Generating the classes should either be a step done in the development environment or as a build step of your application (which is the recommended workflow).
+To avoid adding all dependencies of the php-json-model-generator to your production dependencies it's recommended to add the library as a dev-dependency and include the php-json-model-generator-production library. The production library provides all classes to run the generated code. Generating the classes should either be a step done in the development environment or as a build step of your application (which is the recommended workflow).
 
 Generating classes
 ------------------

src/Model/GeneratorConfiguration.php

@@ -7,7 +7,6 @@
 use PHPModelGenerator\Exception\InvalidFilterException;
 use PHPModelGenerator\Filter\FilterInterface;
 use PHPModelGenerator\Filter\TransformingFilterInterface;
-use PHPModelGenerator\Format\FormatValidatorFromRegEx;
 use PHPModelGenerator\Format\FormatValidatorInterface;
 use PHPModelGenerator\PropertyProcessor\Filter\DateTimeFilter;
 use PHPModelGenerator\PropertyProcessor\Filter\NotEmptyFilter;

src/Model/Validator/PatternPropertiesValidator.php

@@ -25,6 +25,10 @@ class PatternPropertiesValidator extends PropertyTemplateValidator
 {
     /** @var PropertyInterface */
     private $validationProperty;
+    /** @var string */
+    private $pattern;
+    /** @var bool */
+    private $collectPatternProperties = false;
 
     /**
      * PatternPropertiesValidator constructor.
@@ -42,6 +46,7 @@ public function __construct(
         string $pattern,
         JsonSchema $propertyStructure
     ) {
+        $this->pattern = $pattern;
         $propertyFactory = new PropertyFactory(new PropertyProcessorFactory());
 
         $this->validationProperty = $propertyFactory->create(
@@ -56,16 +61,27 @@ public function __construct(
             new Property($schema->getClassName(), null, $propertyStructure),
             DIRECTORY_SEPARATOR . 'Validator' . DIRECTORY_SEPARATOR . 'PatternProperties.phptpl',
             [
-                'pattern' => "/$pattern/",
+                'patternHash' => md5($propertyStructure->getJson()['key'] ?? $this->pattern),
+                'pattern' => "/{$this->pattern}/",
                 'validationProperty' => $this->validationProperty,
                 'generatorConfiguration' => $schemaProcessor->getGeneratorConfiguration(),
                 'viewHelper' => new RenderHelper($schemaProcessor->getGeneratorConfiguration()),
+                'collectPatternProperties' => &$this->collectPatternProperties,
+                'schemaProperties' => $schema->getProperties(),
             ],
             InvalidPatternPropertiesException::class,
-            [$pattern, '&$invalidProperties']
+            [$this->pattern, '&$invalidProperties']
         );
     }
 
+    /**
+     * @param bool $collectPatternProperties
+     */
+    public function setCollectPatternProperties(bool $collectPatternProperties): void
+    {
+        $this->collectPatternProperties = $collectPatternProperties;
+    }
+
     /**
      * @inheritDoc
      */
@@ -76,6 +92,14 @@ public function getCheck(): string
         return parent::getCheck();
     }
 
+    /**
+     * @return string
+     */
+    public function getPattern(): string
+    {
+        return $this->pattern;
+    }
+
     /**
      * Initialize all variables which are required to execute a property names validator
      *

src/ModelGenerator.php

@@ -10,8 +10,8 @@
 use PHPModelGenerator\Exception\SchemaException;
 use PHPModelGenerator\Model\GeneratorConfiguration;
 use PHPModelGenerator\SchemaProcessor\PostProcessor\Internal\CompositionValidationPostProcessor;
+use PHPModelGenerator\SchemaProcessor\PostProcessor\Internal\SerializationPostProcessor;
 use PHPModelGenerator\SchemaProcessor\PostProcessor\PostProcessor;
-use PHPModelGenerator\SchemaProcessor\PostProcessor\SerializationPostProcessor;
 use PHPModelGenerator\SchemaProcessor\RenderQueue;
 use PHPModelGenerator\SchemaProcessor\SchemaProcessor;
 use PHPModelGenerator\SchemaProvider\SchemaProviderInterface;
@@ -43,7 +43,7 @@ public function __construct(GeneratorConfiguration $generatorConfiguration = nul
             $this->addPostProcessor(new SerializationPostProcessor());
         }
 
-        // add internal post processors
+        // add internal post processors which must always be executed
         $this->addPostProcessor(new CompositionValidationPostProcessor());
     }
 

src/PropertyProcessor/Property/BaseProcessor.php

@@ -72,16 +72,16 @@ public function process(string $propertyName, JsonSchema $propertySchema): Prope
         $property = new BaseProperty($propertyName, new PropertyType(static::TYPE), $propertySchema);
         $this->generateValidators($property, $propertySchema);
 
+        $this->addPropertiesToSchema($propertySchema);
+        $this->transferComposedPropertiesToSchema($property);
+
         $this->addPropertyNamesValidator($propertySchema);
         $this->addPatternPropertiesValidator($propertySchema);
         $this->addAdditionalPropertiesValidator($propertySchema);
 
         $this->addMinPropertiesValidator($propertyName, $propertySchema);
         $this->addMaxPropertiesValidator($propertyName, $propertySchema);
 
-        $this->addPropertiesToSchema($propertySchema);
-        $this->transferComposedPropertiesToSchema($property);
-
         return $property;
     }
 
@@ -179,14 +179,14 @@ protected function addPatternPropertiesValidator(JsonSchema $propertySchema): vo
                 );
             }
 
-            $this->schema->addBaseValidator(
-                new PatternPropertiesValidator(
-                    $this->schemaProcessor,
-                    $this->schema,
-                    $pattern,
-                    $propertySchema->withJson($schema)
-                )
+            $validator = new PatternPropertiesValidator(
+                $this->schemaProcessor,
+                $this->schema,
+                $pattern,
+                $propertySchema->withJson($schema)
             );
+
+            $this->schema->addBaseValidator($validator);
         }
     }
 

src/SchemaProcessor/PostProcessor/AdditionalPropertiesAccessorPostProcessor.php

@@ -144,7 +144,7 @@ private function addSerializeAdditionalPropertiesMethod(
             new RenderedMethod(
                 $schema,
                 $generatorConfiguration,
-                'AdditionalPropertiesSerializer.phptpl',
+                'AdditionalProperties/AdditionalPropertiesSerializer.phptpl',
                 [
                     'serializerClass' => $serializerClass ?? null,
                     'serializerMethod' => $serializerMethod ?? null,
@@ -185,7 +185,7 @@ private function addSetAdditionalPropertyMethod(
             new RenderedMethod(
                 $schema,
                 $generatorConfiguration,
-                'SetAdditionalProperty.phptpl',
+                'AdditionalProperties/SetAdditionalProperty.phptpl',
                 [
                     'validationProperty' => $validationProperty,
                     'objectProperties' => $objectProperties,
@@ -227,7 +227,7 @@ private function addRemoveAdditionalPropertyMethod(
             new RenderedMethod(
                 $schema,
                 $generatorConfiguration,
-                'RemoveAdditionalProperty.phptpl',
+                'AdditionalProperties/RemoveAdditionalProperty.phptpl',
                 ['minPropertyValidator' => $minPropertyValidator]
             )
         );
@@ -258,7 +258,7 @@ private function addGetAdditionalPropertyMethod(
             new RenderedMethod(
                 $schema,
                 $generatorConfiguration,
-                'GetAdditionalProperty.phptpl',
+                'AdditionalProperties/GetAdditionalProperty.phptpl',
                 [
                     'validationProperty' => $validationProperty
                         // type hint always with null as a non existent property may be requested (casually covered by

src/SchemaProcessor/PostProcessor/SerializationPostProcessor.php renamed to src/SchemaProcessor/PostProcessor/Internal/SerializationPostProcessor.php

@@ -2,14 +2,16 @@
 
 declare(strict_types = 1);
 
-namespace PHPModelGenerator\SchemaProcessor\PostProcessor;
+namespace PHPModelGenerator\SchemaProcessor\PostProcessor\Internal;
 
 use JsonSerializable;
 use PHPModelGenerator\Filter\TransformingFilterInterface;
 use PHPModelGenerator\Interfaces\SerializationInterface;
 use PHPModelGenerator\Model\GeneratorConfiguration;
 use PHPModelGenerator\Model\Schema;
 use PHPModelGenerator\Model\Validator\FilterValidator;
+use PHPModelGenerator\SchemaProcessor\PostProcessor\PostProcessor;
+use PHPModelGenerator\SchemaProcessor\PostProcessor\RenderedMethod;
 use PHPModelGenerator\Traits\SerializableTrait;
 
 /**