symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
Lines changed: 38 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
Lines changed: 38 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
Lines changed: 4 additions & 0 deletions
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\Validator\Constraints;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\Persistence\ObjectRepository;
@@ -137,6 +138,16 @@ private function createSchema(ObjectManager $em)
         ));
     }
 
+    public function resultTypesProvider()
+    {
+        $entity = new SingleIntIdEntity(1, 'foo');
+        return array(
+            array($entity, array($entity)),
+            array($entity, new \ArrayIterator(array($entity))),
+            array($entity, new ArrayCollection(array($entity))),
+        );
+    }
+
     /**
      * This is a functional test as there is a large integration necessary to get the validator working.
      */
@@ -336,6 +347,33 @@ public function testValidateUniquenessWithUnrewoundArray()
         $this->assertNoViolation();
     }
 
+    /**
+     * @dataProvider resultTypesProvider
+     */
+    public function testValidateResultTypes($entity1, $result)
+    {
+        $constraint = new UniqueEntity(array(
+            'message' => 'myMessage',
+            'fields' => array('name'),
+            'em' => self::EM_NAME,
+            'repositoryMethod' => 'findByCustom',
+        ));
+
+        $repository = $this->createRepositoryMock();
+        $repository->expects($this->once())
+            ->method('findByCustom')
+            ->will($this->returnValue($result))
+        ;
+        $this->em = $this->createEntityManagerMock($repository);
+        $this->registry = $this->createRegistryMock($this->em);
+        $this->validator = $this->createValidator();
+        $this->validator->initialize($this->context);
+
+        $this->validator->validate($entity1, $constraint);
+
+        $this->assertNoViolation();
+    }
+
     public function testAssociatedEntity()
     {
         $constraint = new UniqueEntity(array(
 
@@ -114,6 +114,10 @@ public function validate($entity, Constraint $constraint)
         $repository = $em->getRepository(get_class($entity));
         $result = $repository->{$constraint->repositoryMethod}($criteria);
 
+        if ($result instanceof \IteratorAggregate) {
+            $result = $result->getIterator();
+        }
+
         /* If the result is a MongoCursor, it must be advanced to the first
          * element. Rewinding should have no ill effect if $result is another
          * iterator implementation.