Fixes for nested compositions

wol-soft · wol-soft · commit ece75341782f · 2019-03-28T12:54:07.000+01:00
diff --git a/composer.json b/composer.json
@@ -25,7 +25,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "PHPModelGenerator\\Tests\\": "tests"
+            "PHPModelGenerator\\Tests\\": "tests",
+            "ManualSchema\\": "tests/manual/result"
         }
     }
 }
diff --git a/src/Model/Property/Property.php b/src/Model/Property/Property.php
@@ -122,9 +122,11 @@ public function getValidators(): array
     /**
      * @inheritdoc
      */
-    public function filterValidators(callable $filter): void
+    public function filterValidators(callable $filter): PropertyInterface
     {
         $this->validator = array_filter($this->validator, $filter);
+
+        return $this;
     }
 
     /**
diff --git a/src/Model/Property/PropertyInterface.php b/src/Model/Property/PropertyInterface.php
@@ -73,8 +73,10 @@ public function getValidators(): array;
      * Filter the assigned validators
      *
      * @param callable $filter
+     *
+     * @return PropertyInterface
      */
-    public function filterValidators(callable $filter): void;
+    public function filterValidators(callable $filter): PropertyInterface;
 
     /**
      * Retrieve all added validators ordered by priority
diff --git a/src/Model/Property/PropertyProxy.php b/src/Model/Property/PropertyProxy.php
@@ -110,9 +110,9 @@ public function getValidators(): array
     /**
      * @inheritdoc
      */
-    public function filterValidators(callable $filter): void
+    public function filterValidators(callable $filter): PropertyInterface
     {
-        $this->getProperty()->filterValidators($filter);
+        return $this->getProperty()->filterValidators($filter);
     }
 
     /**
diff --git a/src/Model/RenderJob.php b/src/Model/RenderJob.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace PHPModelGenerator\Model;
 
diff --git a/src/Model/ResolvedDefinitionsCollection.php b/src/Model/ResolvedDefinitionsCollection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace PHPModelGenerator\Model;
 
 class ResolvedDefinitionsCollection
diff --git a/src/Model/Schema.php b/src/Model/Schema.php
@@ -47,7 +47,7 @@ public function getProperties(): array
      *
      * @throws SchemaException
      */
-    public function addProperty(PropertyInterface $property)
+    public function addProperty(PropertyInterface $property): self
     {
         if (isset($this->properties[$property->getName()])) {
             throw new SchemaException("Duplicate object property {$property->getName()}");
@@ -116,15 +116,17 @@ public function getUseList(bool $skipGlobalNamespace): array
      * @param string $key
      * @param SchemaDefinition $definition
      *
-     * @throws SchemaException
+     * @return Schema
      */
-    public function addDefinition(string $key, SchemaDefinition $definition)
+    public function addDefinition(string $key, SchemaDefinition $definition): self
     {
         if (isset($this->definitions[$key])) {
-            return;
+            return $this;
         }
 
         $this->definitions[$key] = $definition;
+
+        return $this;
     }
 
     /**
diff --git a/src/Model/SchemaDefinition.php b/src/Model/SchemaDefinition.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace PHPModelGenerator\Model;
 
diff --git a/src/Model/Validator.php b/src/Model/Validator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace PHPModelGenerator\Model;
 
 use PHPModelGenerator\Model\Validator\PropertyValidatorInterface;
diff --git a/src/Model/Validator/AbstractPropertyValidator.php b/src/Model/Validator/AbstractPropertyValidator.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace PHPModelGenerator\Model\Validator;
 
 /**
  * Class AbstractPropertyValidator
  *
  * @package PHPModelGenerator\Model\Validator
  */
-abstract class AbstractPropertyValidator
+abstract class AbstractPropertyValidator implements PropertyValidatorInterface
 {
     /** @var string */
     protected $exceptionClass;
diff --git a/src/Model/Validator/ComposedPropertyValidator.php b/src/Model/Validator/ComposedPropertyValidator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace PHPModelGenerator\Model\Validator;
 
 use PHPModelGenerator\Exception\InvalidArgumentException;
diff --git a/src/Model/Validator/PropertyTemplateValidator.php b/src/Model/Validator/PropertyTemplateValidator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace PHPModelGenerator\Model\Validator;
 
 use PHPMicroTemplate\Exception\PHPMicroTemplateException;
@@ -11,7 +13,7 @@
  *
  * @package PHPModelGenerator\Model\Validator
  */
-class PropertyTemplateValidator extends AbstractPropertyValidator implements PropertyValidatorInterface
+class PropertyTemplateValidator extends AbstractPropertyValidator
 {
     /** @var string */
     protected $template;
diff --git a/src/Model/Validator/PropertyValidator.php b/src/Model/Validator/PropertyValidator.php
@@ -9,7 +9,7 @@
  *
  * @package PHPModelGenerator\Model\Validator
  */
-class PropertyValidator extends AbstractPropertyValidator implements PropertyValidatorInterface
+class PropertyValidator extends AbstractPropertyValidator
 {
     /** @var string */
     protected $check;
diff --git a/src/Model/Validator/PropertyValidatorInterface.php b/src/Model/Validator/PropertyValidatorInterface.php
@@ -12,7 +12,7 @@
 interface PropertyValidatorInterface
 {
     /**
-     * Get the source code for the coeck to perform
+     * Get the source code for the check to perform
      *
      * @return string
      */
diff --git a/src/Model/Validator/RequiredPropertyValidator.php b/src/Model/Validator/RequiredPropertyValidator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace PHPModelGenerator\Model\Validator;
 
 use PHPModelGenerator\Exception\InvalidArgumentException;
diff --git a/src/PropertyProcessor/ComposedValue/AbstractComposedValueProcessor.php b/src/PropertyProcessor/ComposedValue/AbstractComposedValueProcessor.php
@@ -39,7 +39,8 @@ protected function generateValidators(PropertyInterface $property, array $proper
                 );
 
             $compositionProperty->filterValidators(function (Validator $validator) {
-                return !is_a($validator->getValidator(), RequiredPropertyValidator::class);
+                return !is_a($validator->getValidator(), RequiredPropertyValidator::class) &&
+                    !is_a($validator->getValidator(), ComposedPropertyValidator::class);
             });
 
             $properties[] = $compositionProperty;
@@ -54,7 +55,6 @@ protected function generateValidators(PropertyInterface $property, array $proper
                 static::class,
                 [
                     'properties' => $properties,
-                    'property' => $property,
                     'viewHelper' => new RenderHelper(),
                     'availableAmount' => $availableAmount,
                     'composedValueValidation' => $this->getComposedValueValidation($availableAmount),
diff --git a/src/PropertyProcessor/Property/AbstractPropertyProcessor.php b/src/PropertyProcessor/Property/AbstractPropertyProcessor.php
@@ -51,7 +51,9 @@ public function __construct(
      * Generates the validators for the property
      *
      * @param PropertyInterface $property
-     * @param array             $propertyData
+     * @param array $propertyData
+     *
+     * @throws SchemaException
      */
     protected function generateValidators(PropertyInterface $property, array $propertyData): void
     {
diff --git a/src/PropertyProcessor/Property/BaseProcessor.php b/src/PropertyProcessor/Property/BaseProcessor.php
@@ -9,8 +9,11 @@
 use PHPModelGenerator\Model\Property\Property;
 use PHPModelGenerator\Model\Property\PropertyInterface;
 use PHPModelGenerator\Model\SchemaDefinition;
+use PHPModelGenerator\Model\Validator;
 use PHPModelGenerator\Model\Validator\ComposedPropertyValidator;
 use PHPModelGenerator\Model\Validator\PropertyValidator;
+use PHPModelGenerator\Model\Validator\RequiredPropertyValidator;
+use PHPModelGenerator\Model\Validator\TypeCheckValidator;
 use PHPModelGenerator\PropertyProcessor\ComposedValue\AbstractComposedPropertiesProcessor;
 use PHPModelGenerator\PropertyProcessor\PropertyCollectionProcessor;
 use PHPModelGenerator\PropertyProcessor\PropertyFactory;
@@ -136,6 +139,8 @@ protected function setUpDefinitionDictionary(array $propertyData)
      * Add the properties defined in the JSON schema to the current schema model
      *
      * @param array $propertyData
+     *
+     * @throws SchemaException
      */
     protected function addPropertiesToSchema(array $propertyData)
     {
@@ -184,7 +189,14 @@ protected function transferComposedPropertiesToSchema(PropertyInterface $propert
                 }
 
                 foreach ($composedProperty->getNestedSchema()->getProperties() as $property) {
-                    $this->schema->addProperty($property);
+                    $this->schema->addProperty(
+                        (clone $property)
+                            ->setRequired(false)
+                            ->filterValidators(function (Validator $validator) {
+                                return !is_a($validator->getValidator(), RequiredPropertyValidator::class) &&
+                                    !is_a($validator->getValidator(), TypeCheckValidator::class);
+                            })
+                    );
                 }
             }
         }
diff --git a/src/SchemaProcessor/SchemaProcessor.php b/src/SchemaProcessor/SchemaProcessor.php
@@ -96,7 +96,9 @@ public function processSchema(
         string $className,
         array $parentDefinitions = []
     ): Schema {
-        if (!isset($jsonSchema['type']) || $jsonSchema['type'] !== 'object') {
+        if ((!isset($jsonSchema['type']) || $jsonSchema['type'] !== 'object') &&
+            !array_intersect(array_keys($jsonSchema), ['anyOf', 'allOf', 'oneOf'])
+        ) {
             throw new SchemaException("JSON-Schema doesn't provide an object " . $jsonSchema['id'] ?? '');
         }
 
@@ -112,6 +114,8 @@ public function processSchema(
      * @param array  $parentDefinitions
      *
      * @return Schema
+     *
+     * @throws SchemaException
      */
     protected function generateModel(
         string $classPath,
@@ -120,7 +124,6 @@ protected function generateModel(
         array $parentDefinitions = []
     ): Schema {
         $schema = new Schema($parentDefinitions);
-        //$schemaPropertyProcessorFactory = new SchemaPropertyProcessorFactory();
 
         $structure['type'] = 'base';
 
@@ -131,13 +134,7 @@ protected function generateModel(
             $className,
             $structure
         );
-/*
-        foreach (array_keys($structure) as $schemaProperty) {
-            $schemaPropertyProcessorFactory
-                ->getSchemaPropertyProcessor($schemaProperty)
-                ->process($this, $schema, $structure);
-        }
-*/
+
         $fileName = join(
                 DIRECTORY_SEPARATOR,
                 [$this->destination, str_replace('\\', DIRECTORY_SEPARATOR, $classPath), $className]
diff --git a/src/Templates/Validator/ComposedItem.phptpl b/src/Templates/Validator/ComposedItem.phptpl
@@ -10,7 +10,7 @@
                     throw new {{ viewHelper.getSimpleClassName(validator.getExceptionClass()) }}('{{ validator.getExceptionMessage() }}');
                 }
             {% endforeach %}
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $succeededCompositionElements--;
         }
         $value = $originalModelData;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@`
`25`	`25`	`},`
`26`	`26`	`"autoload-dev": {`
`27`	`27`	`"psr-4": {`
`28`		`- "PHPModelGenerator\\Tests\\": "tests"`
	`28`	`+ "PHPModelGenerator\\Tests\\": "tests",`
	`29`	`+ "ManualSchema\\": "tests/manual/result"`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,11 @@ public function getValidators(): array`
`122`	`122`	`/**`
`123`	`123`	`* @inheritdoc`
`124`	`124`	`*/`
`125`		`- public function filterValidators(callable $filter): void`
	`125`	`+ public function filterValidators(callable $filter): PropertyInterface`
`126`	`126`	`{`
`127`	`127`	`$this->validator = array_filter($this->validator, $filter);`
	`128`	`+`
	`129`	`+ return $this;`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,9 @@ public function getValidators(): array`
`110`	`110`	`/**`
`111`	`111`	`* @inheritdoc`
`112`	`112`	`*/`
`113`		`- public function filterValidators(callable $filter): void`
	`113`	`+ public function filterValidators(callable $filter): PropertyInterface`
`114`	`114`	`{`
`115`		`- $this->getProperty()->filterValidators($filter);`
	`115`	`+ return $this->getProperty()->filterValidators($filter);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function getProperties(): array`
`47`	`47`	`*`
`48`	`48`	`* @throws SchemaException`
`49`	`49`	`*/`
`50`		`- public function addProperty(PropertyInterface $property)`
	`50`	`+ public function addProperty(PropertyInterface $property): self`
`51`	`51`	`{`
`52`	`52`	`if (isset($this->properties[$property->getName()])) {`
`53`	`53`	`throw new SchemaException("Duplicate object property {$property->getName()}");`
`@@ -116,15 +116,17 @@ public function getUseList(bool $skipGlobalNamespace): array`
`116`	`116`	`* @param string $key`
`117`	`117`	`* @param SchemaDefinition $definition`
`118`	`118`	`*`
`119`		`- * @throws SchemaException`
	`119`	`+ * @return Schema`
`120`	`120`	`*/`
`121`		`- public function addDefinition(string $key, SchemaDefinition $definition)`
	`121`	`+ public function addDefinition(string $key, SchemaDefinition $definition): self`
`122`	`122`	`{`
`123`	`123`	`if (isset($this->definitions[$key])) {`
`124`		`- return;`
	`124`	`+ return $this;`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`$this->definitions[$key] = $definition;`
	`128`	`+`
	`129`	`+ return $this;`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`/**`