merged branch jmikola/patch-4 (PR #3540)

fabpot · fabpot · commit 1a2642a85af2 · 2012-03-10T16:35:40.000+01:00
Commits ------- c8e74da [DoctrineBridge] Iterator->current() is not the same as current(Iterator) Discussion ---------- [DoctrineBridge] Iterator->current() is not the same as current(Iterator) More lively discussion from: doctrine/DoctrineMongoDBBundle#84.
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -106,7 +106,7 @@ public function isValid($entity, Constraint $constraint)
          * which is the same as the entity being validated, the criteria is
          * unique.
          */
-        if (0 === count($result) || (1 === count($result) && $entity === current($result))) {
+        if (0 === count($result) || (1 === count($result) && $entity === ($result instanceof \Iterator ? $result->current() : current($result)))) {
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function isValid($entity, Constraint $constraint)`
`106`	`106`	`* which is the same as the entity being validated, the criteria is`
`107`	`107`	`* unique.`
`108`	`108`	`*/`
`109`		`- if (0 === count($result) \|\| (1 === count($result) && $entity === current($result))) {`
	`109`	`+ if (0 === count($result) \|\| (1 === count($result) && $entity === ($result instanceof \Iterator ? $result->current() : current($result)))) {`
`110`	`110`	`return true;`
`111`	`111`	`}`
`112`	`112`