Added an optional paramter to enable recursive text

Author: paquettg

src/PHPHtmlParser/Dom/HtmlNode.php

@@ -25,6 +25,14 @@ class HtmlNode extends AbstractNode {
 	 */
 	protected $text = null;
 
+	/**
+	 * Remembers what the text was when we looked into all our
+	 * children nodes.
+	 *
+	 * @var string
+	 */
+	protected $textWithChildren = null;
+
 	/**
 	 * Sets up the tag of this node.
 	 */
@@ -134,37 +142,54 @@ public function outerHtml()
 	}
 
 	/**
-	 * Gets the text of this node (if there is any text).
+	 * Gets the text of this node (if there is any text). Or get all the text
+	 * in this node, including children.
 	 *
+	 * @param bool $lookInChildren
 	 * @return string
 	 */
-	public function text()
+	public function text($lookInChildren = false)
 	{
-		if ( ! is_null($this->text))
+		if ($lookInChildren)
+		{
+			if ( ! is_null($this->textWithChildren))
+			{
+				// we already know the results.
+				return $this->textWithChildren;
+			}
+		}
+		elseif( ! is_null($this->text))
 		{
 			// we already know the results.
 			return $this->text;
 		}
 
 		// find out if this node has any text children
+		$text = '';
 		foreach ($this->children as $child)
 		{
 			if ($child['node'] instanceof TextNode)
 			{
-				// we found a text node
-				$text = $child['node']->text();
-
-				// remember the results
-				$this->text = $text;
-
-				return $text;
+				$text .= $child['node']->text;
+			}
+			elseif($lookInChildren and
+			       $child['node'] instanceof HtmlNode)
+			{
+				$text .= $child['node']->text($lookInChildren);
 			}
 		}
 
-		// no text found in this node
-		$this->text = '';
+		// remember our result
+		if ($lookInChildren)
+		{
+			$this->textWithChildren = $text;
+		}
+		else
+		{
+			$this->text = $text;
+		}
 
-		return '';
+		return $text;
 	}
 
 	/**

tests/Node/HtmlTest.php

@@ -155,6 +155,35 @@ public function testTextMagic()
 		$this->assertEquals('link', $node->text);
 	}
 
+	public function testTextLookInChildren()
+	{
+		$p = new HtmlNode('p');
+		$a = new HtmlNode('a');
+		$a->addChild(new TextNode('click me'));
+		$p->addChild(new TextNode('Please '));
+		$p->addChild($a);
+		$p->addChild(new TextNode('!'));
+		$node = new HtmlNode('div');
+		$node->addChild($p);
+
+		$this->assertEquals('Please click me!', $node->text(true));
+	}
+
+	public function testTextLookInChildrenAndNoChildren()
+	{
+		$p = new HtmlNode('p');
+		$a = new HtmlNode('a');
+		$a->addChild(new TextNode('click me'));
+		$p->addChild(new TextNode('Please '));
+		$p->addChild($a);
+		$p->addChild(new TextNode('!'));
+
+		$p->text;
+		$p->text(true);
+
+		$this->assertEquals('Please click me!', $p->text(true));
+	}
+
 	public function testGetAttribute()
 	{
 		$node = new HtmlNode('a');