Merge pull request paquettg#106 from billythekid/master

added optional array of tags to exempt from trailing slashes for self…

Author: paquettg

src/PHPHtmlParser/Dom.php

@@ -98,6 +98,13 @@ class Dom
         'wbr'
     ];
 
+    /**
+     * A list of tags where there should be no /> at the end (html5 style)
+     *
+     * @var array
+     */
+    protected $noSlash = [];
+
     /**
      * Returns the inner html of the root node.
      *
@@ -275,6 +282,53 @@ public function clearSelfClosingTags()
         return $this;
     }
 
+
+    /**
+     * Adds a tag to the list of self closing tags that should not have a trailing slash
+     *
+     * @param $tag
+     * @return $this
+     */
+    public function addNoSlashTag($tag)
+    {
+        if ( ! is_array($tag)) {
+            $tag = [$tag];
+        }
+        foreach ($tag as $value) {
+            $this->noSlash[] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes a tag from the list of no-slash tags.
+     *
+     * @param $tag
+     * @return $this
+     */
+    public function removeNoSlashTag($tag)
+    {
+        if ( ! is_array($tag)) {
+            $tag = [$tag];
+        }
+        $this->noSlash = array_diff($this->noSlash, $tag);
+
+        return $this;
+    }
+
+    /**
+     * Empties the list of no-slash tags.
+     *
+     * @return $this
+     */
+    public function clearNoSlashTags()
+    {
+        $this->noSlash = [];
+
+        return $this;
+    }
+
     /**
      * Simple wrapper function that returns the first child.
      *
@@ -596,6 +650,13 @@ protected function parseTag()
 
             // We force self closing on this tag.
             $node->getTag()->selfClosing();
+
+            // Should this tag use a trailing slash?
+            if(in_array($tag, $this->noSlash))
+            {
+                $node->getTag()->noTrailingSlash();
+            }
+
         }
 
         $this->content->fastForward(1);

src/PHPHtmlParser/Dom/Tag.php

@@ -33,6 +33,13 @@ class Tag
      */
     protected $selfClosing = false;
 
+    /**
+     * If self-closing, will this use a trailing slash. />
+     *
+     * @var bool
+     */
+    protected $trailingSlash = true;
+
     /**
      * Tag noise
      */
@@ -99,6 +106,19 @@ public function selfClosing()
         return $this;
     }
 
+
+    /**
+     * Sets the tag to not use a trailing slash.
+     *
+     * @return $this
+     */
+    public function noTrailingSlash()
+    {
+        $this->trailingSlash = false;
+
+        return $this;
+    }
+
     /**
      * Checks if the tag is self closing.
      *
@@ -258,7 +278,7 @@ public function makeOpeningTag()
             }
         }
 
-        if ($this->selfClosing) {
+        if ($this->selfClosing && $this->trailingSlash) {
             return $return.' />';
         } else {
             return $return.'>';

tests/DomTest.php

@@ -88,6 +88,15 @@ public function testLoadClosingTagOnSelfClosing()
         $this->assertEquals('<br /><p>Hey bro, <a href="google.com" data-quote="\"">click here</a></p>', $dom->find('div', 0)->innerHtml);
     }
 
+    public function testLoadClosingTagOnSelfClosingNoSlash()
+    {
+        $dom = new Dom;
+        $dom->addNoSlashTag("br");
+
+        $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 testLoadClosingTagAddSelfClosingTag()
     {
         $dom = new Dom;