[Form] Fix FormDataCollector

Author: nicolas-grekas

src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php

@@ -209,19 +209,15 @@ public function collectViewVariables(FormView $view)
      */
     public function buildPreliminaryFormTree(FormInterface $form)
     {
-        $this->data['forms'][$form->getName()] = array();
-
-        $this->recursiveBuildPreliminaryFormTree($form, $this->data['forms'][$form->getName()], $this->data['forms_by_hash']);
+        $this->data['forms'][$form->getName()] = &$this->recursiveBuildPreliminaryFormTree($form, $this->data['forms_by_hash']);
     }
 
     /**
      * {@inheritdoc}
      */
     public function buildFinalFormTree(FormInterface $form, FormView $view)
     {
-        $this->data['forms'][$form->getName()] = array();
-
-        $this->recursiveBuildFinalFormTree($form, $view, $this->data['forms'][$form->getName()], $this->data['forms_by_hash']);
+        $this->data['forms'][$form->getName()] = &$this->recursiveBuildFinalFormTree($form, $view, $this->data['forms_by_hash']);
     }
 
     /**
@@ -354,26 +350,25 @@ protected function cloneVar($var, $isClass = false)
         return $cache = $this->cloner->cloneVar($var);
     }
 
-    private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output, array &$outputByHash)
+    private function &recursiveBuildPreliminaryFormTree(FormInterface $form, array &$outputByHash)
     {
         $hash = spl_object_hash($form);
 
+        $output = &$outputByHash[$hash];
         $output = isset($this->dataByForm[$hash])
             ? $this->dataByForm[$hash]
             : array();
 
-        $outputByHash[$hash] = &$output;
-
         $output['children'] = array();
 
         foreach ($form as $name => $child) {
-            $output['children'][$name] = array();
-
-            $this->recursiveBuildPreliminaryFormTree($child, $output['children'][$name], $outputByHash);
+            $output['children'][$name] = &$this->recursiveBuildPreliminaryFormTree($child, $outputByHash);
         }
+
+        return $output;
     }
 
-    private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output, array &$outputByHash)
+    private function &recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, array &$outputByHash)
     {
         $viewHash = spl_object_hash($view);
         $formHash = null;
@@ -386,6 +381,9 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie
             // corresponding FormInterface instance for its view in a different way
             $formHash = $this->formsByView[$viewHash];
         }
+        if (null !== $formHash) {
+            $output = &$outputByHash[$formHash];
+        }
 
         $output = isset($this->dataByView[$viewHash])
             ? $this->dataByView[$viewHash]
@@ -398,8 +396,6 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie
                     ? $this->dataByForm[$formHash]
                     : array()
             );
-
-            $outputByHash[$formHash] = &$output;
         }
 
         $output['children'] = array();
@@ -411,9 +407,9 @@ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormVie
                 ? $form->get($name)
                 : null;
 
-            $output['children'][$name] = array();
-
-            $this->recursiveBuildFinalFormTree($childForm, $childView, $output['children'][$name], $outputByHash);
+            $output['children'][$name] = &$this->recursiveBuildFinalFormTree($childForm, $childView, $outputByHash);
         }
+
+        return $output;
     }
 }