[Validator] UuidValidator must accept a Uuid constraint.

Hugo Hamon · Hugo Hamon · commit ff8bb4b5f27c · 2016-07-01T21:12:56.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/UuidValidator.php b/src/Symfony/Component/Validator/Constraints/UuidValidator.php
@@ -81,6 +81,10 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
+        if (!$constraint instanceof Uuid) {
+            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid');
+        }
+
         if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
             throw new UnexpectedTypeException($value, 'string');
         }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
@@ -44,6 +44,16 @@ public function testEmptyStringIsValid()
         $this->assertNoViolation();
     }
 
+    /**
+     * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
+     */
+    public function testExpectsUuidConstraintCompatibleType()
+    {
+        $constraint = $this->getMockForAbstractClass('Symfony\\Component\\Validator\\Constraint');
+
+        $this->validator->validate('216fff40-98d9-11e3-a5e2-0800200c9a66', $constraint);
+    }
+
     /**
      * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
      */

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,10 @@ public function validate($value, Constraint $constraint)`
`81`	`81`	`return;`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ if (!$constraint instanceof Uuid) {`
	`85`	`+ throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Uuid');`
	`86`	`+ }`
	`87`	`+`
`84`	`88`	`if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {`
`85`	`89`	`throw new UnexpectedTypeException($value, 'string');`
`86`	`90`	`}`