[2.6][Validator] Fix BC for Validator's validate method

symfony · Jun 28, 2015 · 29ceaa2 · 29ceaa2
1 parent dda8303
commit 29ceaa2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Tests/Validator/Abstract2Dot5ApiTest.php b/Tests/Validator/Abstract2Dot5ApiTest.php
@@ -75,6 +75,12 @@ public function testValidateConstraintWithoutGroup()
         $this->assertCount(1, $violations);
     }
 
+    public function testValidateWithEmptyArrayAsConstraint()
+    {
+        $violations = $this->validator->validate('value', array());
+        $this->assertCount(0, $violations);
+    }
+
     public function testGroupSequenceAbortsAfterFailedGroup()
     {
         $entity = new Entity();

diff --git a/Validator/LegacyValidator.php b/Validator/LegacyValidator.php
@@ -69,7 +69,7 @@ public function getMetadataFactory()
 
     private static function testConstraints($constraints)
     {
-        return null === $constraints || $constraints instanceof Constraint || (is_array($constraints) && current($constraints) instanceof Constraint);
+        return null === $constraints || $constraints instanceof Constraint || (is_array($constraints) && (0 === count($constraints) || current($constraints) instanceof Constraint));
     }
 
     private static function testGroups($groups)