[Validator] Fix a bug in the ExecutionContext

symfony · May 7, 2012 · 23e15bb · 23e15bb
1 parent f273edc
commit 23e15bb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/Symfony/Component/Validator/ExecutionContext.php b/src/Symfony/Component/Validator/ExecutionContext.php
@@ -68,7 +68,7 @@ public function addViolation($message, array $params = array(), $invalidValue =
             $this->globalContext->getRoot(),
             $this->propertyPath,
             // check using func_num_args() to allow passing null values
-            func_num_args() === 3 ? $invalidValue : $this->value,
+            func_num_args() >= 3 ? $invalidValue : $this->value,
             $pluralization
         ));
     }
@@ -91,7 +91,7 @@ public function addViolationAtPath($propertyPath, $message, array $params = arra
             $this->globalContext->getRoot(),
             $propertyPath,
             // check using func_num_args() to allow passing null values
-            func_num_args() === 4 ? $invalidValue : $this->value,
+            func_num_args() >= 4 ? $invalidValue : $this->value,
             $pluralization
         ));
     }
@@ -114,7 +114,7 @@ public function addViolationAtSubPath($subPath, $message, array $params = array(
             $this->globalContext->getRoot(),
             $this->getPropertyPath($subPath),
             // check using func_num_args() to allow passing null values
-            func_num_args() === 4 ? $invalidValue : $this->value,
+            func_num_args() >= 4 ? $invalidValue : $this->value,
             $pluralization
         ));
     }

diff --git a/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php b/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
@@ -93,6 +93,7 @@ public function testAddViolationUsesPassedNullValue()
     {
         // passed null value should override preconfigured value "invalid"
         $this->context->addViolation('Error', array('foo' => 'bar'), null);
+        $this->context->addViolation('Error', array('foo' => 'bar'), null, 1);
 
         $this->assertEquals(new ConstraintViolationList(array(
             new ConstraintViolation(
@@ -102,6 +103,14 @@ public function testAddViolationUsesPassedNullValue()
                 'foo.bar',
                 null
             ),
+            new ConstraintViolation(
+                'Error',
+                array('foo' => 'bar'),
+                'Root',
+                'foo.bar',
+                null,
+                1
+            ),
         )), $this->context->getViolations());
     }
 
@@ -140,6 +149,7 @@ public function testAddViolationAtPathUsesPassedNullValue()
     {
         // passed null value should override preconfigured value "invalid"
         $this->context->addViolationAtPath('bar.baz', 'Error', array('foo' => 'bar'), null);
+        $this->context->addViolationAtPath('bar.baz', 'Error', array('foo' => 'bar'), null, 1);
 
         $this->assertEquals(new ConstraintViolationList(array(
             new ConstraintViolation(
@@ -149,6 +159,14 @@ public function testAddViolationAtPathUsesPassedNullValue()
                 'bar.baz',
                 null
             ),
+            new ConstraintViolation(
+                'Error',
+                array('foo' => 'bar'),
+                'Root',
+                'bar.baz',
+                null,
+                1
+            ),
         )), $this->context->getViolations());
     }
 
@@ -187,6 +205,7 @@ public function testAddViolationAtSubPathUsesPassedNullValue()
     {
         // passed null value should override preconfigured value "invalid"
         $this->context->addViolationAtSubPath('bam.baz', 'Error', array('foo' => 'bar'), null);
+        $this->context->addViolationAtSubPath('bam.baz', 'Error', array('foo' => 'bar'), null, 1);
 
         $this->assertEquals(new ConstraintViolationList(array(
             new ConstraintViolation(
@@ -196,6 +215,14 @@ public function testAddViolationAtSubPathUsesPassedNullValue()
                 'foo.bar.bam.baz',
                 null
             ),
+            new ConstraintViolation(
+                'Error',
+                array('foo' => 'bar'),
+                'Root',
+                'foo.bar.bam.baz',
+                null,
+                1
+            ),
         )), $this->context->getViolations());
     }