merged branch sterrien/patch-4 (PR #7519)

fabpot · fabpot · commit bf7daa11e735 · 2013-04-01T10:01:59.000+02:00
This PR was merged into the 2.1 branch. Discussion ---------- [Form] [Doctrine] [EntityChoiceList] idAsIndex should be true with a smallint id field. When the id of an entity is a smallint, $this->idAsIndex should also be true. It was not the case. Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: should License of the code: MIT Commits ------- 673fd9b idAsIndex should be true with a smallint or bigint id field.
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
@@ -111,7 +111,7 @@ public function __construct(ObjectManager $manager, $class, $labelPath = null, E
             $this->idField = $identifier[0];
             $this->idAsValue = true;
 
-            if ('integer' === $this->classMetadata->getTypeOfField($this->idField)) {
+            if (in_array($this->classMetadata->getTypeOfField($this->idField), array('integer', 'smallint', 'bigint'))) {
                 $this->idAsIndex = true;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function __construct(ObjectManager $manager, $class, $labelPath = null, E`
`111`	`111`	`$this->idField = $identifier[0];`
112	`112`	`$this->idAsValue = true;`
`113`	`113`
`114`		`- if ('integer' === $this->classMetadata->getTypeOfField($this->idField)) {`
	`114`	`+ if (in_array($this->classMetadata->getTypeOfField($this->idField), array('integer', 'smallint', 'bigint'))) {`
`115`	`115`	`$this->idAsIndex = true;`
`116`	`116`	`}`
`117`	`117`	`}`