Remove the form reference stores in the orderer

GeLoLabs · GeLoLabs · commit 17abb97393e6 · 2014-06-27T12:43:46.000+02:00
diff --git a/src/Symfony/Component/Form/FormOrderer.php b/src/Symfony/Component/Form/FormOrderer.php
@@ -20,11 +20,6 @@
  */
 class FormOrderer implements FormOrdererInterface
 {
-    /**
-     * @var FormInterface
-     */
-    private $form;
-
     /**
      * @var array
      */
@@ -55,9 +50,9 @@ class FormOrderer implements FormOrdererInterface
      */
     public function order(FormInterface $form)
     {
-        $this->reset($form);
+        $this->reset();
 
-        foreach ($this->form as $child) {
+        foreach ($form as $child) {
             $position = $child->getConfig()->getPosition();
 
             if (empty($position)) {
@@ -233,7 +228,7 @@ private function finishWeight(FormInterface $form, $weight, $position = null)
      */
     private function processDiffered(FormInterface $form, $differed, $position)
     {
-        if (!$this->form->has($differed)) {
+        if (!$form->getParent()->has($differed)) {
             throw new InvalidConfigurationException(sprintf('The "%s" form is configured to be placed just %s the form "%s" but the form "%s" does not exist.', $form->getName(), $position, $differed, $differed));
         }
 
@@ -299,13 +294,9 @@ private function detectedSymmetricDiffered($name, $differed, $position)
 
     /**
      * Resets the orderer.
-     *
-     * @param FormInterface $form The form.
      */
-    private function reset(FormInterface $form)
+    private function reset()
     {
-        $this->form = $form;
-
         $this->weights = array();
         $this->differed = array(
             'before' => array(),
