bug #14929 [DoctrineBridge] Fix DoctrineType (dosten)

fabpot · fabpot · commit 282ea41cf07e · 2015-06-10T16:30:49.000+02:00
This PR was merged into the 3.0-dev branch. Discussion ---------- [DoctrineBridge] Fix DoctrineType | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Seems that a wrong merge breaks the `DoctrineType`. Because the minimum version in 3.0 is 5.5 we can use `$this` inside a closure. Commits ------- 0010452 Fix DoctrineType
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -126,12 +126,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $registry = $this->registry;
-        $choiceListFactory = $this->choiceListFactory;
-        $idReaders = &$this->idReaders;
-        $choiceLoaders = &$this->choiceLoaders;
-
-        $choiceLoader = function (Options $options) use ($choiceListFactory, &$choiceLoaders, $type) {
+        $choiceLoader = function (Options $options) {
             // Unless the choices are given explicitly, load them on demand
             if (null === $options['choices']) {
 
@@ -141,7 +136,7 @@ public function configureOptions(OptionsResolver $resolver)
                 // If there is no QueryBuilder we can safely cache DoctrineChoiceLoader,
                 // also if concrete Type can return important QueryBuilder parts to generate
                 // hash key we go for it as well
-                if (!$options['query_builder'] || false !== ($qbParts = $type->getQueryBuilderPartsForCachingHash($options['query_builder']))) {
+                if (!$options['query_builder'] || false !== ($qbParts = $this->getQueryBuilderPartsForCachingHash($options['query_builder']))) {
 
                     $hash = CachingFactoryDecorator::generateHash(array(
                         $options['em'],
@@ -150,8 +145,8 @@ public function configureOptions(OptionsResolver $resolver)
                         $options['loader'],
                     ));
 
-                    if (isset($choiceLoaders[$hash])) {
-                        return $choiceLoaders[$hash];
+                    if (isset($this->choiceLoaders[$hash])) {
+                        return $this->choiceLoaders[$hash];
                     }
                 }
 
@@ -165,15 +160,15 @@ public function configureOptions(OptionsResolver $resolver)
                 }
 
                 $doctrineChoiceLoader = new DoctrineChoiceLoader(
-                    $choiceListFactory,
+                    $this->choiceListFactory,
                     $options['em'],
                     $options['class'],
                     $options['id_reader'],
                     $entityLoader
                 );
 
                 if ($hash !== null) {
-                    $choiceLoaders[$hash] = $doctrineChoiceLoader;
+                    $this->choiceLoaders[$hash] = $doctrineChoiceLoader;
                 }
 
                 return $doctrineChoiceLoader;
@@ -220,17 +215,17 @@ public function configureOptions(OptionsResolver $resolver)
             // Otherwise, an incrementing integer is used as value automatically
         };
 
-        $emNormalizer = function (Options $options, $em) use ($registry) {
+        $emNormalizer = function (Options $options, $em) {
             /* @var ManagerRegistry $registry */
             if (null !== $em) {
                 if ($em instanceof ObjectManager) {
                     return $em;
                 }
 
-                return $registry->getManager($em);
+                return $this->registry->getManager($em);
             }
 
-            $em = $registry->getManagerForClass($options['class']);
+            $em = $this->registry->getManagerForClass($options['class']);
 
             if (null === $em) {
                 throw new RuntimeException(sprintf(
@@ -273,7 +268,7 @@ public function configureOptions(OptionsResolver $resolver)
 
         // Set the "id_reader" option via the normalizer. This option is not
         // supposed to be set by the user.
-        $idReaderNormalizer = function (Options $options) use (&$idReaders) {
+        $idReaderNormalizer = function (Options $options) {
             $hash = CachingFactoryDecorator::generateHash(array(
                 $options['em'],
                 $options['class'],
@@ -285,12 +280,12 @@ public function configureOptions(OptionsResolver $resolver)
             // of the field, so we store that information in the reader.
             // The reader is cached so that two choice lists for the same class
             // (and hence with the same reader) can successfully be cached.
-            if (!isset($idReaders[$hash])) {
+            if (!isset($this->idReaders[$hash])) {
                 $classMetadata = $options['em']->getClassMetadata($options['class']);
-                $idReaders[$hash] = new IdReader($options['em'], $classMetadata);
+                $this->idReaders[$hash] = new IdReader($options['em'], $classMetadata);
             }
 
-            return $idReaders[$hash];
+            return $this->idReaders[$hash];
         };
 
         $resolver->setDefaults(array(
