Merge pull request #50 from LinioIT/fix/not-required-field-constraints

Fix/not required field constraints
LinioIT · Jul 31, 2020 · 93e25d2 · 93e25d2
2 parents dbdad6e + 3f6d2db
commit 93e25d2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Node/BaseNode.php b/src/Node/BaseNode.php
@@ -275,7 +275,7 @@ public function walk($input)
     protected function checkConstraints(string $field, $value): void
     {
         foreach ($this->constraints as $constraint) {
-            if (!$constraint->validate($value)) {
+            if (!$constraint->validate($value) && ($this->isRequired() || !empty($value))) {
                 throw new InvalidConstraintException($constraint->getErrorMessage($field));
             }
         }

diff --git a/tests/Node/BaseNodeTest.php b/tests/Node/BaseNodeTest.php
@@ -129,4 +129,19 @@ public function testIsGettingTransformedValue(): void
         $child = $base->add('foobar', 'string', ['transformer' => new DateTimeTransformer()]);
         $this->assertEquals(new \DateTime('2014-01-01 00:00:00'), $child->getValue('foobar', '2014-01-01 00:00:00'));
     }
+
+    public function testNotRequiredWithConstraints(): void
+    {
+        $typeHandler = $this->prophesize(TypeHandler::class);
+        $typeHandler->getType('string')->willReturn(new BaseNode());
+
+        $base = new BaseNode();
+        $base->setTypeHandler($typeHandler->reveal());
+        $child = $base->add('foobar', 'string')
+            ->setRequired(false)
+            ->addConstraint(new StringSize(1, 255));
+
+        $this->assertNull($child->getValue('foobar', null));
+        $this->assertEmpty($child->getValue('foobar', ''));
+    }
 }