merged branch Tobion/formhasparent (PR #5360)

fabpot · fabpot · commit 77a47d362cc9 · 2012-08-29T13:43:39.000+02:00
Commits ------- 0186731 [Form] removed hasParent from FormInterface and deprecated its use Discussion ---------- [Form] removed hasParent from FormInterface and deprecated its use There are already 2 alternatives with getParent() and isRoot(), so a third one with similar semantics is confusing and unneeded. --------------------------------------------------------------------------- by bschussek at 2012-08-29T11:11:11Z :+1:
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -194,7 +194,7 @@ public function getPropertyPath()
             return null;
         }
 
-        if ($this->hasParent() && null === $this->getParent()->getConfig()->getDataClass()) {
+        if ($this->parent && null === $this->parent->getConfig()->getDataClass()) {
             return new PropertyPath('[' . $this->getName() . ']');
         }
 
@@ -271,7 +271,12 @@ public function getParent()
     }
 
     /**
-     * {@inheritdoc}
+     * Returns whether the form has a parent.
+     *
+     * @return Boolean
+     *
+     * @deprecated Deprecated since version 2.1, to be removed in 2.3. Use
+     *             {@link getParent()} or inverse {@link isRoot()} instead.
      */
     public function hasParent()
     {
@@ -291,7 +296,7 @@ public function getRoot()
      */
     public function isRoot()
     {
-        return !$this->hasParent();
+        return null === $this->parent;
     }
 
     /**
diff --git a/src/Symfony/Component/Form/FormInterface.php b/src/Symfony/Component/Form/FormInterface.php
@@ -38,13 +38,6 @@ public function setParent(FormInterface $parent = null);
      */
     public function getParent();
 
-    /**
-     * Returns whether the form has a parent.
-     *
-     * @return Boolean
-     */
-    public function hasParent();
-
     /**
      * Adds a child to the form.
      *

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public function getPropertyPath()`
`194`	`194`	`return null;`
`195`	`195`	`}`
`196`	`196`
`197`		`- if ($this->hasParent() && null === $this->getParent()->getConfig()->getDataClass()) {`
	`197`	`+ if ($this->parent && null === $this->parent->getConfig()->getDataClass()) {`
`198`	`198`	`return new PropertyPath('[' . $this->getName() . ']');`
`199`	`199`	`}`
`200`	`200`
`@@ -271,7 +271,12 @@ public function getParent()`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`/**`
`274`		`- * {@inheritdoc}`
	`274`	`+ * Returns whether the form has a parent.`
	`275`	`+ *`
	`276`	`+ * @return Boolean`
	`277`	`+ *`
	`278`	`+ * @deprecated Deprecated since version 2.1, to be removed in 2.3. Use`
	`279`	`+ * {@link getParent()} or inverse {@link isRoot()} instead.`
`275`	`280`	`*/`
`276`	`281`	`public function hasParent()`
`277`	`282`	`{`
`@@ -291,7 +296,7 @@ public function getRoot()`
`291`	`296`	`*/`
`292`	`297`	`public function isRoot()`
`293`	`298`	`{`
`294`		`- return !$this->hasParent();`
	`299`	`+ return null === $this->parent;`
`295`	`300`	`}`
`296`	`301`
`297`	`302`	`/**`