Added tests for the Static Facade

Fixed a few issues brought to light from the new tests

Author: paquettg

src/PHPHtmlParser/Dom.php

@@ -51,6 +51,23 @@ class Dom {
 	 */
 	protected $size;
 
+	/**
+	 * A list of tags which will always be self closing
+	 *
+	 * @var array
+	 */
+	protected $selfClosing = [
+		'img',
+		'br',
+		'input',
+		'meta',
+		'link',
+		'hr',
+		'base',
+		'embed',
+		'spacer',
+	];
+
 	/**
 	 * Returns the inner html of the root node.
 	 *
@@ -131,6 +148,54 @@ public function find($selector, $nth = null)
 		return $this->root->find($selector, $nth);
 	}
 
+	/**
+	 * Adds the tag (or tags in an array) to the list of tags that will always
+	 * be self closing.
+	 *
+	 * @param string|array $tag
+	 * @chainable
+	 */
+	public function addSelfClosingTag($tag)
+	{
+		if ( ! is_array($tag))
+		{
+			$tag = [$tag];
+		}
+		foreach ($tag as $value)
+		{
+			$this->selfClosing[] = $value;
+		}
+		return $this;
+	}
+	
+	/**
+	 * Removes the tag (or tags in an array) from the list of tags that will
+	 * always be self closing.
+	 *
+	 * @param string|array $tag
+	 * @chainable
+	 */
+	public function removeSelfClosingTag($tag)
+	{
+		if ( ! is_array($tag))
+		{
+			$tag = [$tag];
+		}
+		$this->selfClosing = array_diff($this->selfClosing, $tag);
+		return $this;
+	}
+
+	/**
+	 * Sets the list of self closing tags to empty.
+	 *
+	 * @chainable
+	 */
+	public function clearSelfClosingTags()
+	{
+		$this->selfClosing = [];
+		return $this;
+	}
+
 	/**
 	 * Simple wrapper function that returns the first child.
 	 *
@@ -309,6 +374,11 @@ protected function parse()
 					continue;
 				}
 
+				if ( ! isset($info['node']))
+				{
+					continue;
+				}
+
 				$node = $info['node'];
 				$activeNode->addChild($node);
 
@@ -354,9 +424,20 @@ protected function parseTag()
 			// move to end of tag
 			$this->content->copyUntil('>');
 			$this->content->fastForward(1);
-			$return['status']  = true;
-			$return['closing'] = true;
-			$return['tag']     = strtolower($tag);
+			
+			// check if this closing tag counts
+			$tag = strtolower($tag);
+			if (in_array($tag, $this->selfClosing))
+			{
+				$return['status'] = true;
+				return $return;
+			}
+			else
+			{
+				$return['status']  = true;
+				$return['closing'] = true;
+				$return['tag']     = strtolower($tag);
+			}
 			return $return;
 		}
 
@@ -433,6 +514,11 @@ protected function parseTag()
 			$node->getTag()->selfClosing();
 			$this->content->fastForward(1);
 		}
+		elseif (in_array($tag, $this->selfClosing))
+		{
+			// We force self closing on this tag.
+			$node->getTag()->selfClosing();
+		}
 
 		$this->content->fastForward(1);
 

src/PHPHtmlParser/Dom/Tag.php

@@ -110,6 +110,7 @@ public function noise($noise)
 	 */
 	public function setAttribute($key, $value)
 	{
+		$key = strtolower($key);
 		$this->attr[$key] = $value;
 		return $this;
 	}

tests/DomTest.php

@@ -43,6 +43,28 @@ public function testLoadNoClosingTag()
 		$this->assertEquals('<div class="all"><p>Hey bro, <a href="google.com" data-quote="\"">click here</a></p></div><br />', $root->outerHtml);
 	}
 
+	public function testLoadAttributeOnSelfClosing()
+	{
+		$dom = new Dom;
+		$dom->load('<div class="all"><p>Hey bro, <a href="google.com" data-quote="\"">click here</a></div><br class="both" />');
+		$br = $dom->find('br', 0);
+		$this->assertEquals('both', $br->getAttribute('class'));
+	}
+
+	public function testLoadClosingTagOnSelfClosing()
+	{
+		$dom = new Dom;
+		$dom->load('<div class="all"><br><p>Hey bro, <a href="google.com" data-quote="\"">click here</a></br></div>');
+		$this->assertEquals('<br /><p>Hey bro, <a href="google.com" data-quote="\"">click here</a></p>', $dom->find('div', 0)->innerHtml);
+	}
+
+	public function testLoadUpperCase()
+	{
+		$dom = new Dom;
+		$dom->load('<DIV CLASS="ALL"><BR><P>hEY BRO, <A HREF="GOOGLE.COM" DATA-QUOTE="\"">CLICK HERE</A></BR></DIV>');
+		$this->assertEquals('<br /><p>hEY BRO, <a href="GOOGLE.COM" data-quote="\"">CLICK HERE</a></p>', $dom->find('div', 0)->innerHtml);
+	}
+
 	public function testLoadWithFile()
 	{
 		$dom = new Dom;

tests/StaticDomTest.php

@@ -24,7 +24,13 @@ public function testLoadWithFile()
 
 	public function testFind()
 	{
-		Dom::load('tests/small.html');
-		$this->assertEquals('VonBurgermeister', Dom::find('.post-user font', 0)->text);
+		Dom::load('tests/horrible.html');
+		$this->assertEquals('<input type="submit" tabindex="0" name="submit" value="Информации" />', Dom::find('table input', 1)->outerHtml);
+	}
+
+	public function testFindI()
+	{
+		Dom::load('tests/horrible.html');
+		$this->assertEquals('[ Досие бр:12928 ]', Dom::find('i')[0]->innerHtml);
 	}
 }