Fix: do not generates value if the form has no constraints

src/Aggregate/Form.php

@@ -360,7 +360,12 @@ private function submitToChildrenAndValidate($data, string $method): void
             return;
         }
 
-        $this->error = $this->validator->validate($this->value(), $this);
+        // Do not generate value if it's not necessary
+        $this->error = $this->validator->hasConstraints()
+            ? $this->validator->validate($this->value(), $this)
+            : FormError::null()
+        ;
+
         $this->valid = $this->error->empty();
     }
 

src/Csrf/CsrfValueValidator.php

@@ -74,4 +74,12 @@ public function constraints(): array
     {
         return []; // Does CsrfConstraint should be returns ?
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasConstraints(): bool
+    {
+        return true;
+    }
 }

src/Phone/PhoneElement.php

@@ -69,7 +69,7 @@ protected function toHttp($phpValue)
             return null;
         }
 
-        return $phpValue->getRawInput() ?: $this->formatter->format($phpValue, PhoneNumberFormat::E164);
+        return $phpValue->getRawInput() ?? $this->formatter->format($phpValue, PhoneNumberFormat::E164);
     }
 
     /**

src/Phone/Transformer/PhoneNumberToStringTransformer.php

@@ -62,6 +62,10 @@ public function transformFromHttp($value, ElementInterface $input): ?string
 
         $formatter = $this->formatter ?? ($input instanceof PhoneElement ? $input->getFormatter() : PhoneNumberUtil::getInstance());
 
+        if (!$formatter->isValidNumber($value)) {
+            return $value->getRawInput();
+        }
+
         return $formatter->format($value, $this->format);
     }
 }

src/Validator/ConstraintValueValidator.php

@@ -102,6 +102,14 @@ public function constraints(): array
         return $this->constraints;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasConstraints(): bool
+    {
+        return !empty($this->constraints);
+    }
+
     /**
      * Get the empty value validator instance
      *

src/Validator/ValueValidatorInterface.php

@@ -43,4 +43,11 @@ public function onTransformerException(Exception $exception, $value, ElementInte
      * @return Constraint[]
      */
     public function constraints(): array;
+
+    /**
+     * Check if the validator has constraints, and the value should be validated, or not
+     *
+     * @return bool true if there is no constraints, and validate() always returns en ampty error
+     */
+    public function hasConstraints(): bool;
 }

tests/Aggregate/FormTest.php

@@ -67,6 +67,32 @@ public function test_submit_success()
         $this->assertSame(4, $this->form['id']->element()->value());
     }
 
+    /**
+     *
+     */
+    public function test_submit_without_constraints_should_not_generate_the_value_on_submit()
+    {
+        $called = false;
+        $this->form = new Form(new ChildrenCollection([
+            $this->registry->childBuilder(StringElement::class, 'firstName')->setter(function ($value) use(&$called) { $called = true; return $value; })->length(['min' => 2])->buildChild(),
+            $this->registry->childBuilder(StringElement::class, 'lastName')->setter()->length(['min' => 2])->buildChild(),
+            $this->registry->childBuilder(IntegerElement::class, 'id')->setter()->buildChild(),
+        ]));
+
+        $this->form->submit([
+            'firstName' => 'John',
+            'lastName' => 'Smith',
+            'id' => '4',
+        ]);
+
+        $this->assertTrue($this->form->valid());
+        $this->assertTrue($this->form->error()->empty());
+        $this->assertFalse($called);
+
+        $this->form->value();
+        $this->assertTrue($called);
+    }
+
     /**
      *
      */

tests/Phone/PhoneElementTest.php

@@ -72,6 +72,7 @@ public function test_submit_null()
 
         $this->assertTrue($element->submit(null)->valid());
         $this->assertNull($element->value());
+        $this->assertNull($element->httpValue());
         $this->assertTrue($element->error()->empty());
     }
 
@@ -84,6 +85,7 @@ public function test_submit_empty_string()
 
         $this->assertTrue($element->submit('')->valid());
         $this->assertSame('', $element->value()->getRawInput());
+        $this->assertSame('', $element->httpValue());
         $this->assertTrue($element->error()->empty());
     }
 

tests/Phone/Transformer/PhoneNumberToStringTransformerTest.php

@@ -49,4 +49,20 @@ public function test_with_format_and_formatter()
         $this->assertInstanceOf(PhoneNumber::class, $form['foo']->element()->value());
         $this->assertEquals('236547841', $form['foo']->element()->value()->getNationalNumber());
     }
+
+    /**
+     *
+     */
+    public function test_with_invalid_number_should_return_unformated_value()
+    {
+        $builder = new FormBuilder();
+        $builder->phone('foo')->modelTransformer(new PhoneNumberToStringTransformer())->getter()->setter();
+
+        $form = $builder->buildElement();
+
+        $form->submit(['foo' => 'invalid']);
+        $this->assertSame(['foo' => 'invalid'], $form->value());
+
+        $this->assertInstanceOf(PhoneNumber::class, $form['foo']->element()->value());
+    }
 }

tests/Validator/ConstraintValueValidatorTest.php

@@ -6,7 +6,6 @@
 use Bdf\Form\Leaf\StringElement;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\NotBlank;
-use Symfony\Component\Validator\Constraints\NotEqualTo;
 
 /**
  * Class ConstraintValueValidatorTest
@@ -22,6 +21,7 @@ public function test_validate_success()
         $validator = new ConstraintValueValidator([new NotBlank()]);
 
         $this->assertTrue($validator->validate('value', $element)->empty());
+        $this->assertTrue($validator->hasConstraints());
     }
 
     /**
@@ -33,6 +33,7 @@ public function test_validate_without_constraints()
         $validator = new ConstraintValueValidator([]);
 
         $this->assertTrue($validator->validate('value', $element)->empty());
+        $this->assertFalse($validator->hasConstraints());
     }
 
     /**