merged branch Tobion/formparent (PR #5357)

fabpot · fabpot · commit 003f8c59c3d8 · 2012-08-29T13:42:13.000+02:00
Commits ------- 30c1457 [Form] fixed Form::setParent(null) 214f0de [Form] added test with null parent Discussion ---------- [Form] fixed Form::setParent(null) --------------------------------------------------------------------------- by bschussek at 2012-08-29T10:58:20Z :+1:
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -253,7 +253,7 @@ public function setParent(FormInterface $parent = null)
             throw new AlreadyBoundException('You cannot set the parent of a bound form');
         }
 
-        if ('' === $this->config->getName()) {
+        if (null !== $parent && '' === $this->config->getName()) {
             throw new FormException('A form with an empty name cannot have a parent form.');
         }
 
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
@@ -21,7 +21,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
     /**
      * Sets the parent form.
      *
-     * @param  FormInterface $parent The parent form
+     * @param  FormInterface|null $parent The parent form or null if it's the root.
      *
      * @return FormInterface The form instance
      *
@@ -34,7 +34,7 @@ public function setParent(FormInterface $parent = null);
     /**
      * Returns the parent form.
      *
-     * @return FormInterface The parent form
+     * @return FormInterface|null The parent form or null if there is none.
      */
     public function getParent();
 
diff --git a/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -665,6 +665,14 @@ public function testFormCanHaveEmptyName()
         $this->assertEquals('', $form->getName());
     }
 
+    public function testSetNullParentWorksWithEmptyName()
+    {
+        $form = $this->getBuilder('')->getForm();
+        $form->setParent(null);
+
+        $this->assertNull($form->getParent());
+    }
+
     /**
      * @expectedException Symfony\Component\Form\Exception\FormException
      * @expectedExceptionMessage A form with an empty name cannot have a parent form.

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ public function setParent(FormInterface $parent = null)`
`253`	`253`	`throw new AlreadyBoundException('You cannot set the parent of a bound form');`
`254`	`254`	`}`
`255`	`255`
`256`		`- if ('' === $this->config->getName()) {`
	`256`	`+ if (null !== $parent && '' === $this->config->getName()) {`
`257`	`257`	`throw new FormException('A form with an empty name cannot have a parent form.');`
`258`	`258`	`}`
`259`	`259`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable`
`21`	`21`	`/**`
`22`	`22`	`* Sets the parent form.`
`23`	`23`	`*`
`24`		`- * @param FormInterface $parent The parent form`
	`24`	`+ * @param FormInterface\|null $parent The parent form or null if it's the root.`
`25`	`25`	`*`
`26`	`26`	`* @return FormInterface The form instance`
`27`	`27`	`*`
`@@ -34,7 +34,7 @@ public function setParent(FormInterface $parent = null);`
`34`	`34`	`/**`
`35`	`35`	`* Returns the parent form.`
`36`	`36`	`*`
`37`		`- * @return FormInterface The parent form`
	`37`	`+ * @return FormInterface\|null The parent form or null if there is none.`
`38`	`38`	`*/`
`39`	`39`	`public function getParent();`
`40`	`40`