minor #34610 [DoctrineBridge] Removed legacy checks in DoctrineChoiceLoader (HeahDude)

nicolas-grekas · nicolas-grekas · commit a2cb37e1e251 · 2019-11-27T22:23:27.000+01:00
This PR was merged into the 5.0 branch. Discussion ---------- [DoctrineBridge] Removed legacy checks in DoctrineChoiceLoader | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | ~ | License | MIT | Doc PR | ~  Commits ------- 20d2cca [DoctrineBridge] Removed legacy checks in DoctrineChoiceLoader
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -87,7 +87,7 @@ public function loadValuesForChoices(array $choices, callable $value = null)
         $optimize = $this->idReader && (null === $value || \is_array($value) && $value[0] === $this->idReader);
 
         // Attention: This optimization does not check choices for existence
-        if ($optimize && !$this->choiceList && $this->idReader->isSingleId()) {
+        if ($optimize && !$this->choiceList) {
             $values = [];
 
             // Maintain order and indices of the given objects
@@ -123,7 +123,7 @@ public function loadChoicesForValues(array $values, callable $value = null)
         // a single-field identifier
         $optimize = $this->idReader && (null === $value || \is_array($value) && $this->idReader === $value[0]);
 
-        if ($optimize && !$this->choiceList && $this->objectLoader && $this->idReader->isSingleId()) {
+        if ($optimize && !$this->choiceList && $this->objectLoader) {
             $unorderedObjects = $this->objectLoader->getEntitiesByIds($this->idReader->getIdField(), $values);
             $objectsById = [];
             $objects = [];
