diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
index 1a09609b28556..2dc8c2cb2b28d 100644
--- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
+++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -146,7 +146,7 @@ public function loadChoicesForValues(array $values, $value = null)
// Optimize performance in case we have an object loader and
// a single-field identifier
- if (!$this->choiceList && $this->objectLoader && $this->idReader->isSingleId()) {
+ if (null === $value && !$this->choiceList && $this->objectLoader && $this->idReader->isSingleId()) {
$unorderedObjects = $this->objectLoader->getEntitiesByIds($this->idReader->getIdField(), $values);
$objectsById = array();
$objects = array();
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
index c5cdc60bbd342..c9ea820d95e97 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -740,6 +740,55 @@ public function testOverrideChoices()
$this->assertSame('2', $field->getViewData());
}
+ public function testOverrideChoicesValues()
+ {
+ $entity1 = new SingleIntIdEntity(1, 'Foo');
+ $entity2 = new SingleIntIdEntity(2, 'Bar');
+
+ $this->persist(array($entity1, $entity2));
+
+ $field = $this->factory->createNamed('name', 'entity', null, array(
+ 'em' => 'default',
+ 'class' => self::SINGLE_IDENT_CLASS,
+ 'choice_label' => 'name',
+ 'choice_value' => 'name',
+ ));
+
+ $field->submit('Bar');
+
+ $this->assertEquals(array('Foo' => new ChoiceView($entity1, 'Foo', 'Foo'), 'Bar' => new ChoiceView($entity2, 'Bar', 'Bar')), $field->createView()->vars['choices']);
+ $this->assertTrue($field->isSynchronized(), 'Field should be synchronized.');
+ $this->assertSame($entity2, $field->getData(), 'Entity should be loaded by custom value.');
+ $this->assertSame('Bar', $field->getViewData());
+ }
+
+ public function testOverrideChoicesValuesWithCallable()
+ {
+ $entity1 = new GroupableEntity(1, 'Foo', 'BazGroup');
+ $entity2 = new GroupableEntity(2, 'Bar', 'BooGroup');
+
+ $this->persist(array($entity1, $entity2));
+
+ $field = $this->factory->createNamed('name', 'entity', null, array(
+ 'em' => 'default',
+ 'class' => self::ITEM_GROUP_CLASS,
+ 'choice_label' => 'name',
+ 'choice_value' => function (GroupableEntity $entity) {
+ return $entity->groupName.'/'.$entity->name;
+ },
+ ));
+
+ $field->submit('BooGroup/Bar');
+
+ $this->assertEquals(array(
+ 'BazGroup/Foo' => new ChoiceView($entity1, 'BazGroup/Foo', 'Foo'),
+ 'BooGroup/Bar' => new ChoiceView($entity2, 'BooGroup/Bar', 'Bar'),
+ ), $field->createView()->vars['choices']);
+ $this->assertTrue($field->isSynchronized(), 'Field should be synchronized.');
+ $this->assertSame($entity2, $field->getData(), 'Entity should be loaded by custom value.');
+ $this->assertSame('BooGroup/Bar', $field->getViewData());
+ }
+
public function testGroupByChoices()
{
$item1 = new GroupableEntity(1, 'Foo', 'Group1');
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy