improved code, testing

Author: oscarotero

composer.json

@@ -40,7 +40,8 @@
         "friendsofphp/php-cs-fixer": "^2.0",
         "nyholm/psr7": "^1.2",
         "oscarotero/php-cs-fixer-config": "^1.0",
-        "brick/varexporter": "^0.3.1"
+        "brick/varexporter": "^0.3.1",
+        "symfony/css-selector": "^5.0"
     },
     "autoload": {
         "psr-4": {

src/Document.php

@@ -45,7 +45,9 @@ public function __clone()
 
     public function remove(string $query): void
     {
-        foreach ($this->select($query)->nodes() as $node) {
+        $nodes = iterator_to_array($this->xpath->query($query), false);
+
+        foreach ($nodes as $node) {
             $node->parentNode->removeChild($node);
         }
     }

tests/DocumentTest.php

@@ -0,0 +1,57 @@
+<?php
+declare(strict_types = 1);
+
+namespace Embed\Tests;
+
+use Embed\Embed;
+use Embed\Http\Crawler;
+use PHPUnit\Framework\TestCase;
+
+class DocumentTest extends TestCase
+{
+    private static Embed $embed;
+
+    private static function getEmbed(): Embed
+    {
+        if (isset(self::$embed)) {
+            return self::$embed;
+        }
+
+        $dispatcher = new FileClient(__DIR__.'/cache');
+        $dispatcher->setMode(0);
+
+        return self::$embed = new Embed(new Crawler($dispatcher));
+    }
+
+    public function testSelectors()
+    {
+        $extractor = self::getEmbed()->get('http://www.wired.com/?p=2064839');
+        $document = $extractor->getDocument();
+
+        $expected = 23;
+
+        $this->assertCount($expected, $document->select('.//p')->nodes());
+        $this->assertCount($expected, $document->selectCss('p')->nodes());
+
+        $document->remove('.//p');
+
+        $this->assertCount(0, $document->select('.//p')->nodes());
+        $this->assertCount(0, $document->selectCss('p')->nodes());
+    }
+
+    public function testMultipleSelectors()
+    {
+        $extractor = self::getEmbed()->get('https://css-tricks.com/css-scrollbar-with-progress-meter/');
+        $document = $extractor->getDocument();
+
+        $expected = 118;
+
+        $this->assertCount($expected, $document->selectCss('[aria-hidden],[hidden],meta,style,canvas,svg,form,script,template,link,.hidden')->nodes());
+        $this->assertCount($expected, $document->select('.//*[@aria-hidden]|.//*[@hidden]|.//meta|.//style|.//canvas|.//svg|.//form|.//script|.//template|.//link|.//*[contains(concat(" ",normalize-space(@class)," ")," hidden ")]')->nodes());
+
+        $document->removeCss('[aria-hidden],[hidden],meta,style,canvas,svg,form,script,template,link,.hidden');
+
+        $this->assertCount(0, $document->selectCss('[aria-hidden],[hidden],meta,style,canvas,svg,form,script,template,link,.hidden')->nodes());
+        $this->assertCount(0, $document->select('.//*[@aria-hidden]|.//*[@hidden]|.//meta|.//style|.//canvas|.//svg|.//form|.//script|.//template|.//link|.//*[contains(concat(" ",normalize-space(@class)," ")," hidden ")]')->nodes());
+    }
+}