Refactoring out isChild method.

Author: akond

src/PHPHtmlParser/Dom/AbstractNode.php

@@ -358,21 +358,42 @@ public function previousChild($id)
 	}
 
 	/**
-	 * Checks if the given node id is a decendant of the 
+	 * Checks if the given node id is a child of the 
 	 * current node.
 	 *
 	 * @param int $id
 	 * @return bool
 	 */
-	public function isDescendant($id)
+	public function isChild ($id)
 	{
 		foreach ($this->children as $childId => $child)
 		{
 			if ($id == $childId)
 			{
 				return true;
 			}
-			elseif ($child['node']->hasChildren())
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks if the given node id is a decendant of the 
+	 * current node.
+	 *
+	 * @param int $id
+	 * @return bool
+	 */
+	public function isDescendant($id)
+	{
+		if ($this->isChild ($id))
+		{
+			return true;
+		}
+
+		foreach ($this->children as $childId => $child)
+		{
+			if ($child['node']->hasChildren())
 			{
 				if ($child['node']->isDescendant($id))
 				{

tests/Node/ChildrenTest.php

@@ -61,4 +61,18 @@ public function testCountChildren()
 		$child2->setParent($parent);
 		$this->assertEquals(2, $parent->countChildren());
 	}
+
+	public function testIsChild ()
+	{
+		$parent = new Node;
+		$child1 = new Node;
+		$child2 = new Node;
+
+		$child1->setParent($parent);
+		$child2->setParent($child1);
+
+		$this->assertTrue ($parent->isChild ($child1->id ()));
+		$this->assertTrue ($parent->isDescendant ($child2->id ()));
+		$this->assertFalse ($parent->isChild ($child2->id ()));
+	}
 }