Add properties to merged property without validators

Author: wol-soft

composer.json

@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=7.2",
-        "wol-soft/php-micro-template": "^1.3",
+        "wol-soft/php-micro-template": "^1.3.1",
         "symplify/easy-coding-standard": "^4.1",
         "ext-json": "*"
     },

src/PropertyProcessor/ComposedValue/AbstractComposedValueProcessor.php

@@ -66,10 +66,6 @@ protected function generateValidators(PropertyInterface $property, array $proper
 
         $availableAmount = count($properties);
 
-        if ($createMergedProperty) {
-            $this->createMergedProperty($property, $properties);
-        }
-
         $property->addValidator(
             new ComposedPropertyValidator(
                 $property,
@@ -84,8 +80,10 @@ protected function generateValidators(PropertyInterface $property, array $proper
                     // final value after the validations (eg. object instantiations may be performed). Otherwise (eg. a
                     // NotProcessor) the value must be proposed before the validation
                     'postPropose' => $this instanceof ComposedPropertiesInterface,
-                    'onlyForDefinedValues' => $propertyData['onlyForDefinedValues'] &&
-                        $this instanceof ComposedPropertiesInterface,
+                    'mergedProperty' =>
+                        $createMergedProperty ? $this->createMergedProperty($property, $properties) : null,
+                    'onlyForDefinedValues' =>
+                        $propertyData['onlyForDefinedValues'] && $this instanceof ComposedPropertiesInterface,
                 ]
             ),
             100
@@ -97,12 +95,12 @@ protected function generateValidators(PropertyInterface $property, array $proper
      *
      * Gather all nested object properties and merge them together into a single merged property
      *
-     * @param PropertyInterface              $property
+     * @param PropertyInterface              $compositionProperty
      * @param CompositionPropertyDecorator[] $properties
      *
      * @return PropertyInterface
      */
-    private function createMergedProperty(PropertyInterface $property, array $properties): PropertyInterface
+    private function createMergedProperty(PropertyInterface $compositionProperty, array $properties): PropertyInterface
     {
         $mergedPropertySchema = new Schema();
         $mergedClassName = sprintf('%s_Merged_%s', $this->schemaProcessor->getCurrentClassName(), uniqid());
@@ -111,7 +109,13 @@ private function createMergedProperty(PropertyInterface $property, array $proper
         foreach ($properties as $property) {
             if ($property->getNestedSchema()) {
                 foreach ($property->getNestedSchema()->getProperties() as $nestedProperty) {
-                    $mergedPropertySchema->addProperty($nestedProperty);
+                    $mergedPropertySchema->addProperty(
+                        // don't validate fields in merged properties. All fields were validated before corresponding to
+                        // the defined constraints of the composition property.
+                        (clone $nestedProperty)->filterValidators(function () {
+                            return false;
+                        })
+                    );
                 }
             }
         }
@@ -122,7 +126,7 @@ private function createMergedProperty(PropertyInterface $property, array $proper
             $mergedPropertySchema
         );
 
-        $property->addTypeHintDecorator(new CompositionTypeHintDecorator($mergedProperty));
+        $compositionProperty->addTypeHintDecorator(new CompositionTypeHintDecorator($mergedProperty));
 
         return $mergedProperty
             ->addDecorator(new ObjectInstantiationDecorator($mergedClassName))

src/PropertyProcessor/Property/AbstractPropertyProcessor.php

@@ -112,7 +112,7 @@ protected function addComposedValueValidator(PropertyInterface $property, array
                     new PropertyCollectionProcessor(),
                     $this->schemaProcessor,
                     $this->schema,
-                    $property->getName(),
+                    $property->getName() . '_composed_' . uniqid(),
                     [
                         'type' => $composedValueKeyword,
                         'propertyData' => $propertyData,

src/Templates/Validator/ComposedItem.phptpl

@@ -33,7 +33,15 @@
         $value = $originalModelData;
     {% endforeach %}
 
-    $value = $proposedValue;
+    {% if mergedProperty %}
+        if (is_object($proposedValue)) {
+            {{ viewHelper.resolvePropertyDecorator(mergedProperty) }}
+        } else {
+            $value = $proposedValue;
+        }
+    {% else %}
+        $value = $proposedValue;
+    {% endif %}
 
     return !({{ composedValueValidation }});
 })($value)