Fixes paquettg#203

Author: paquettg

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - Curl interface and curl implementation has been removed.
 - Removed support for the depth first search option.
+- findById() method removed from Dom object.
 
 ## 2.2.0
 

src/PHPHtmlParser/Dom.php

@@ -150,7 +150,6 @@ public function __get($name)
      */
     public function load(string $str, array $options = []): Dom
     {
-        AbstractNode::resetCount();
         // check if it's a file
         if (\strpos($str, "\n") === false && \is_file($str)) {
             return $this->loadFromFile($str, $options);
@@ -264,22 +263,6 @@ public function find(string $selector, int $nth = null)
         return $result;
     }
 
-    /**
-     * Find element by Id on the root node.
-     *
-     * @throws ChildNotFoundException
-     * @throws NotLoadedException
-     * @throws ParentNotFoundException
-     *
-     * @return bool|AbstractNode
-     */
-    public function findById(int $id)
-    {
-        $this->isLoaded();
-
-        return $this->root->findById($id);
-    }
-
     /**
      * Adds the tag (or tags in an array) to the list of tags that will always
      * be self closing.

src/PHPHtmlParser/Dom/AbstractNode.php

@@ -140,16 +140,6 @@ public function setHtmlSpecialCharsDecode($htmlSpecialCharsDecode = false): void
         $this->htmlSpecialCharsDecode = $htmlSpecialCharsDecode;
     }
 
-    /**
-     * Reset node counter.
-     *
-     * @return void
-     */
-    public static function resetCount()
-    {
-        self::$count = 0;
-    }
-
     /**
      * Returns the id of this object.
      */

tests/DomTest.php

@@ -394,33 +394,6 @@ public function testHasChildren()
         $this->assertTrue($dom->hasChildren());
     }
 
-    public function testFindByIdVar1()
-    {
-        $dom = new Dom();
-        $dom->load('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>');
-        /** @var Dom\AbstractNode $result */
-        $result = $dom->findById(4);
-        $this->assertEquals(4, $result->id());
-    }
-
-    public function testFindByIdVar2()
-    {
-        $dom = new Dom();
-        $dom->load('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>');
-        /** @var Dom\AbstractNode $result */
-        $result = $dom->findById(5);
-        $this->assertEquals(5, $result->id());
-    }
-
-    public function testFindByIdNotFountEleement()
-    {
-        $dom = new Dom();
-        $dom->load('<div class="all"><p>Hey bro, <a href="google.com">click here</a><br /> :)</p></div>');
-        /** @var Dom\AbstractNode $result */
-        $result = $dom->findById(8);
-        $this->assertFalse($result);
-    }
-
     public function testWhitespaceInText()
     {
         $dom = new Dom();
@@ -629,4 +602,21 @@ public function testLessThanCharacterInJavascript()
             ])->find('body');
         $this->assertCount(1, $results);
     }
+
+    public function testUniqueIdForAllObjects()
+    {
+        // Create a dom which will be used as a parent/container for a paragraph
+        $dom1 = new \PHPHtmlParser\Dom;
+        $dom1->load('<div>A container div</div>'); // Resets the counter (doesn't matter here as the counter was 0 even without resetting)
+        $div = $dom1->firstChild();
+
+        // Create a paragraph outside of the first dom
+        $dom2 = new \PHPHtmlParser\Dom;
+        $dom2->load('<p>Our new paragraph.</p>'); // Resets the counter
+        $paragraph = $dom2->firstChild();
+
+        $div->addChild($paragraph);
+
+        $this->assertEquals('A container div<p>Our new paragraph.</p>', $div->innerhtml);
+    }
 }