* Composed object values aren't set properly (instead the incoming raw array was set as property value)

Author: wol-soft

src/PropertyProcessor/ComposedValue/AbstractComposedValueProcessor.php

@@ -66,6 +66,10 @@ protected function generateValidators(PropertyInterface $property, array $proper
                     'viewHelper' => new RenderHelper(),
                     'availableAmount' => $availableAmount,
                     'composedValueValidation' => $this->getComposedValueValidation($availableAmount),
+                    // if the property is a composed property the resulting value of a validation must be proposed to be the
+                    // 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,
                 ]

src/PropertyProcessor/ComposedValue/IfProcessor.php

@@ -81,12 +81,4 @@ protected function generateValidators(PropertyInterface $property, array $proper
 
         parent::generateValidators($property, $propertyData);
     }
-
-    /**
-     * @inheritdoc
-     */
-    protected function getComposedValueValidation(int $composedElements): string
-    {
-        return '$succeededCompositionElements === 0';
-    }
 }

src/Templates/Model.phptpl

@@ -34,7 +34,9 @@ class {{ class }}
     */
     public function __construct(array $modelData)
     {
-        $rawValue = $modelData;
+        {% if baseValidators %}
+            $value = $modelData;
+        {% endif %}
 
         {% foreach baseValidators as validator %}
              if ({{ validator.getCheck() }}) {
@@ -100,7 +102,7 @@ class {{ class }}
          */
         protected function process{{ viewHelper.ucfirst(property.getAttribute()) }}(array $modelData): void
         {
-            $value = $rawValue = $modelData['{{ property.getName() }}'] ?? $this->{{ property.getAttribute() }};
+            $value = $modelData['{{ property.getName() }}'] ?? $this->{{ property.getAttribute() }};
 
             {{ viewHelper.resolvePropertyDecorator(property) }}
 

src/Templates/Validator/ComposedItem.phptpl

@@ -1,18 +1,28 @@
 {%if onlyForDefinedValues %}
     $value !== null &&
 {% endif %}
-(function ($value) use (&$modelData) {
+(function (&$value) use (&$modelData) {
     $succeededCompositionElements = {{ availableAmount }};
     $originalModelData = $value;
+    $proposedValue = null;
+
     {% foreach properties as property %}
         try {
+            {% if not postPropose %}
+                $proposedValue = $proposedValue ?? $value;
+            {% endif %}
+
             {{ viewHelper.resolvePropertyDecorator(property) }}
 
             {% foreach property.getOrderedValidators() as validator %}
                 if ({{ validator.getCheck() }}) {
                     throw new {{ viewHelper.getSimpleClassName(validator.getExceptionClass()) }}('{{ validator.getExceptionMessage() }}');
                 }
             {% endforeach %}
+
+            {% if postPropose %}
+                $proposedValue = $proposedValue ?? $value;
+            {% endif %}
         } catch (\Exception $e) {
             {% foreach property.getAffectedObjectProperties() as affectedObjectProperty %}
                 unset($modelData['{{ affectedObjectProperty.getName() }}']);
@@ -23,5 +33,7 @@
         $value = $originalModelData;
     {% endforeach %}
 
+    $value = $proposedValue;
+
     return !({{ composedValueValidation }});
-})($rawValue)
+})($value)

src/Templates/Validator/ConditionalComposedItem.phptpl

@@ -1,9 +1,9 @@
 {%if onlyForDefinedValues %}
     $value !== null &&
 {% endif %}
-(function ($value) use (&$modelData) {
+(function (&$value) use (&$modelData) {
     $originalModelData = $value;
-    $ifValid           = true;
+    $ifValid  = true;
 
     try {
         {{ viewHelper.resolvePropertyDecorator(ifProperty) }}
@@ -41,4 +41,4 @@
     }
 
     return false;
-})($rawValue)
+})($value)

tests/ComposedValue/ComposedOneOfTest.php

@@ -203,27 +203,40 @@ public function invalidExtendedPropertyDataProvider(): array
     }
 
     /**
-     * @dataProvider objectPropertyWithReferencedSchemaDataProvider
+     * @dataProvider composedPropertyWithReferencedSchemaDataProvider
      *
      * @param $propertyValue
      */
-    public function testMatchingObjectPropertyWithReferencedSchemaIsValid($propertyValue): void
+    public function testMatchingComposedPropertyWithReferencedSchemaIsValid($propertyValue): void
     {
         $className = $this->generateObjectFromFile('ReferencedObjectSchema.json');
 
         $object = new $className(['property' => $propertyValue]);
         $this->assertSame($propertyValue, $object->getProperty());
     }
 
-    public function objectPropertyWithReferencedSchemaDataProvider(): array
+    public function composedPropertyWithReferencedSchemaDataProvider(): array
     {
         return [
             'null' => [null],
             'string matching required length' => ['Hanne'],
-            'Matching object' => [['name' => 'Ha', 'age' => 42]],
         ];
     }
 
+    /**
+     * @param $propertyValue
+     */
+    public function testMatchingObjectPropertyWithReferencedSchemaIsValid(): void
+    {
+        $className = $this->generateObjectFromFile('ReferencedObjectSchema.json');
+
+        $object = new $className(['property' => ['name' => 'Ha', 'age' => 42]]);
+
+        $this->assertTrue(is_object($object->getProperty()));
+        $this->assertSame('Ha', $object->getProperty()->getName());
+        $this->assertSame(42, $object->getProperty()->getAge());
+    }
+
     /**
      * @dataProvider invalidObjectPropertyWithReferencedSchemaDataProvider
      *