bug #9865 [Validator] Fixes message value for objects (jongotlin)

fabpot · fabpot · commit c9dd3489470b · 2013-12-27T22:53:59.000+01:00
This PR was submitted for the 2.2 branch but it was merged into the 2.3 branch instead (closes #9865). Discussion ---------- [Validator] Fixes message value for objects | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 7b69e9b [Validator] Fixes message value for objects
diff --git a/src/Symfony/Component/Validator/Constraints/NullValidator.php b/src/Symfony/Component/Validator/Constraints/NullValidator.php
@@ -27,6 +27,12 @@ class NullValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         if (null !== $value) {
+            if (is_object($value)) {
+                $value = get_class($value);
+            } elseif (is_array($value)) {
+                $value = 'Array';
+            }
+
             $this->context->addViolation($constraint->message, array('{{ value }}' => $value));
         }
     }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/NullValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/NullValidatorTest.php
@@ -43,7 +43,7 @@ public function testNullIsValid()
     /**
      * @dataProvider getInvalidValues
      */
-    public function testInvalidValues($value)
+    public function testInvalidValues($value, $readableValue)
     {
         $constraint = new Null(array(
             'message' => 'myMessage'
@@ -52,7 +52,7 @@ public function testInvalidValues($value)
         $this->context->expects($this->once())
             ->method('addViolation')
             ->with('myMessage', array(
-                '{{ value }}' => $value,
+                '{{ value }}' => $readableValue,
             ));
 
         $this->validator->validate($value, $constraint);
@@ -61,10 +61,13 @@ public function testInvalidValues($value)
     public function getInvalidValues()
     {
         return array(
-            array(0),
-            array(false),
-            array(true),
-            array(''),
+            array(0, 0),
+            array(false, false),
+            array(true, true),
+            array('', ''),
+            array('foo bar', 'foo bar'),
+            array(new \DateTime(), 'DateTime'),
+            array(array(), 'Array'),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,12 @@ class NullValidator extends ConstraintValidator`
`27`	`27`	`public function validate($value, Constraint $constraint)`
`28`	`28`	`{`
`29`	`29`	`if (null !== $value) {`
	`30`	`+ if (is_object($value)) {`
	`31`	`+ $value = get_class($value);`
	`32`	`+ } elseif (is_array($value)) {`
	`33`	`+ $value = 'Array';`
	`34`	`+ }`
	`35`	`+`
`30`	`36`	`$this->context->addViolation($constraint->message, array('{{ value }}' => $value));`
`31`	`37`	`}`
`32`	`38`	`}`