Refactoring

Author: paquettg

src/PHPHtmlParser/Content.php

@@ -219,7 +219,7 @@ public function copyByToken(string $token, bool $char = false, bool $escape = fa
      *
      * @param string $string
      * @param bool $copy
-     * @return $this|string
+     * @return Content|string
      */
     public function skip(string $string, bool $copy = false)
     {
@@ -242,7 +242,7 @@ public function skip(string $string, bool $copy = false)
      *
      * @param string $token
      * @param bool $copy
-     * @return null|string
+     * @return Content|string
      * @uses $this->skip()
      */
     public function skipByToken(string $token, bool $copy = false)

src/PHPHtmlParser/Dom/AbstractNode.php

@@ -15,6 +15,8 @@
  * @property string outerhtml
  * @property string innerhtml
  * @property string text
+ * @property int prev
+ * @property int next
  * @property \PHPHtmlParser\Dom\Tag tag
  * @property InnerNode parent
  */

src/PHPHtmlParser/Dom/HtmlNode.php

@@ -14,6 +14,8 @@ class HtmlNode extends InnerNode
 
     /**
      * Remembers what the innerHtml was if it was scanned previously.
+     *
+     * @var string
      */
     protected $innerHtml = null;
 

src/PHPHtmlParser/Dom/InnerNode.php

@@ -367,7 +367,7 @@ public function firstChild(): AbstractNode
         }
 
         reset($this->children);
-        $key = key($this->children);
+        $key = (int) key($this->children);
 
         return $this->getChild($key);
     }

src/PHPHtmlParser/Dom/MockNode.php

@@ -16,20 +16,23 @@ class MockNode extends InnerNode
      */
     public function innerHtml(): string
     {
+        return '';
     }
 
     /**
      * Mock of outer html.
      */
     public function outerHtml(): string
     {
+        return '';
     }
 
     /**
      * Mock of text.
      */
     public function text(): string
     {
+        return '';
     }
 
     /**

src/PHPHtmlParser/Finder.php

@@ -3,6 +3,7 @@
 namespace PHPHtmlParser;
 
 use PHPHtmlParser\Dom\AbstractNode;
+use PHPHtmlParser\Dom\InnerNode;
 
 class Finder
 {
@@ -26,7 +27,7 @@ public function __construct($id)
      */
     public function find(AbstractNode $node)
     {
-        if (!$node->id()) {
+        if (!$node->id() && $node instanceof InnerNode) {
             return $this->find($node->firstChild());
         }
 
@@ -51,4 +52,4 @@ public function find(AbstractNode $node)
 
         return false;
     }
-}
+}