[Doctrine] Cleanup and move loader into its own method

Author: beberlei

src/Symfony/Bridge/Doctrine/Form/DataTransformer/EntitiesToArrayTransformer.php

@@ -52,7 +52,7 @@ public function transform($collection)
 
  foreach ($collection as $entity) {
  // identify choices by their collection key
- $key = array_search($entity, $availableEntities);
+ $key = array_search($entity, $availableEntities, true);
  $array[] = $key;
  }
  } else {

src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php

@@ -22,6 +22,9 @@
 
 class EntityType extends AbstractType
 {
+ /**
+ * @var ManagerRegistry
+ */
  protected $registry;
 
  public function __construct(ManagerRegistry $registry)
@@ -58,11 +61,7 @@ public function getDefaultOptions(array $options)
  if (!isset($options['choice_list'])) {
  $manager = $this->registry->getManager($options['em']);
  if (isset($options['query_builder'])) {
- $options['loader'] = new ORMQueryBuilderLoader(
- $options['query_builder'],
- $manager,
- $options['class']
- );
+ $options['loader'] = $this->getLoader($manager, $options);
  }
 
  $defaultOptions['choice_list'] = new EntityChoiceList(
@@ -78,6 +77,22 @@ public function getDefaultOptions(array $options)
  return $defaultOptions;
  }
 
+ /**
+ * Return the default loader object.
+ *
+ * @param ObjectManager
+ * @param array $options
+ * @return ORMQueryBuilderLoader
+ */
+ protected function getLoader($manager, $options)
+ {
+ return new ORMQueryBuilderLoader(
+ $options['query_builder'],
+ $manager,
+ $options['class']
+ );
+ }
+
  public function getParent(array $options)
  {
  return 'choice';