symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+26-1Lines changed: 26 additions & 1 deletion b/‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+26-1Lines changed: 26 additions & 1 deletion
@@ -62,7 +62,7 @@ public function getEntitiesByIds($identifier, array $values)
             $metadata = $this->queryBuilder->getEntityManager()->getClassMetadata(current($this->queryBuilder->getRootEntities()));
 
             foreach ($this->getEntities() as $entity) {
-                if (\in_array(current($metadata->getIdentifierValues($entity)), $values, true)) {
+                if (\in_array((string) current($metadata->getIdentifierValues($entity)), $values, true)) {
                     $choices[] = $entity;
                 }
             }
 
@@ -956,7 +956,32 @@ public function testDisallowChoicesThatAreNotIncludedQueryBuilderSingleIdentifie
         $this->assertNull($field->getData());
     }
 
-    public function testDisallowChoicesThatAreNotIncludedQueryBuilderSingleIdentifierWithLimit()
+    public function testSingleIdentifierWithLimit()
+    {
+        $entity1 = new SingleIntIdEntity(1, 'Foo');
+        $entity2 = new SingleIntIdEntity(2, 'Bar');
+        $entity3 = new SingleIntIdEntity(3, 'Baz');
+
+        $this->persist([$entity1, $entity2, $entity3]);
+
+        $repository = $this->em->getRepository(self::SINGLE_IDENT_CLASS);
+
+        $field = $this->factory->createNamed('name', static::TESTED_TYPE, null, [
+            'em' => 'default',
+            'class' => self::SINGLE_IDENT_CLASS,
+            'query_builder' => $repository->createQueryBuilder('e')
+                ->where('e.id IN (1, 2, 3)')
+                ->setMaxResults(1),
+            'choice_label' => 'name',
+        ]);
+
+        $field->submit('1');
+
+        $this->assertTrue($field->isSynchronized());
+        $this->assertSame($entity1, $field->getData());
+    }
+
+    public function testDisallowChoicesThatAreNotIncludedByQueryBuilderSingleIdentifierWithLimit()
     {
         $entity1 = new SingleIntIdEntity(1, 'Foo');
         $entity2 = new SingleIntIdEntity(2, 'Bar');
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function getEntitiesByIds($identifier, array $values)`
`62`	`62`	`$metadata = $this->queryBuilder->getEntityManager()->getClassMetadata(current($this->queryBuilder->getRootEntities()));`
`63`	`63`
`64`	`64`	`foreach ($this->getEntities() as $entity) {`
`65`		`- if (\in_array(current($metadata->getIdentifierValues($entity)), $values, true)) {`
	`65`	`+ if (\in_array((string) current($metadata->getIdentifierValues($entity)), $values, true)) {`
`66`	`66`	`$choices[] = $entity;`
`67`	`67`	`}`
`68`	`68`	`}`