Fix for cache-key conflict when having a \Traversable as choices

symfony · Dec 29, 2013 · d6163a8 · d6163a8
1 parent 28e9e06
commit d6163a8
Showing 1 changed file with 7 additions and 0 deletions.
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'];