bug #9557 [DoctrineBridge] Fix for cache-key conflict when having a \Traversable as choices (DRvanR)

fabpot · fabpot · commit be01e34ed5a7 · 2013-12-29T16:35:40.000+01:00
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #9557). Discussion ---------- [DoctrineBridge] Fix for cache-key conflict when having a \Traversable as choices | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #9556 | License | MIT | Doc PR | ~ Commits ------- 1119684 Fix for cache-key conflict when having a \Traversable as choices
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -89,6 +89,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 array_walk_recursive($choiceHashes, function (&$value) {
                     $value = spl_object_hash($value);
                 });
+            } elseif ($choiceHashes instanceof \Traversable) {
+                $hashes = array();
+                foreach ($choiceHashes as $value) {
+                    $hashes[] = spl_object_hash($value);
+                }
+                
+                $choiceHashes = $hashes;
             }
 
             $preferredChoiceHashes = $options['preferred_choices'];
