Implemented + and ~ operators support

Author: popov654

src/PHPHtmlParser/Selector/Parser.php

@@ -43,7 +43,7 @@ public function parseSelectorString(string $selector): ParsedSelectorCollectionD
             $isNthOfType = false;
 
             // check for elements that alter the behavior of the next element
-            if ($tag == '>') {
+            if ($tag == '>' || $tag == '+' || $tag == '~') {
                 $alterNext = true;
             }
 

src/PHPHtmlParser/Selector/Seeker.php

@@ -25,6 +25,22 @@ class Seeker implements SeekerInterface
     public function seek(array $nodes, RuleDTO $rule, array $options): array
     {
 
+        if ($rule->getTag() == '+' || $rule->getTag() == '~') {
+            $result = [];
+            foreach ($nodes as $node) {
+                if ($rule->getTag() == '+') {
+                    $result[] = $node->nextSibling();
+                } else {
+                    while ($node->hasNextSibling()) {
+                        $result[] = $node->nextSibling();
+                        $node = $node->nextSibling();
+                    }
+                }
+            }
+
+            return $result;
+        }
+
         $options = $this->flattenOptions($options);
 
         $return = [];

src/PHPHtmlParser/Selector/Selector.php

@@ -70,14 +70,19 @@ public function find(AbstractNode $node): Collection
             }
 
             $options = [];
+            $lastRule = null;
             foreach ($selector->getRules() as $rule) {
+                if ($rule->getTag() == '*' && $lastRule && ($lastRule->getTag() == '+' || $lastRule->getTag() == '~')) {
+                    continue;
+                }
                 if ($rule->isAlterNext() && $rule->getTag() == '>') {
                     $options[] = $this->alterNext($rule);
                     continue;
                 }
                 $nodes = $this->seeker->seek($nodes, $rule, $options);
                 // clear the options
                 $options = [];
+                $lastRule = $rule;
             }
 
             // this is the final set of nodes

tests/Selector/SeekerTest.php

@@ -119,4 +119,82 @@ public function testSeekNthOfType()
         $this->assertEquals('p', $results[0]->getTag()->name());
         $this->assertTrue($results[0] === $test->lastChild());
     }
+
+    public function testSeekNextOne()
+    {
+        $ruleDTO = RuleDTO::makeFromPrimitives(
+            '+',
+            '=',
+            null,
+            null,
+            false,
+            false
+        );
+
+        $test = new HtmlNode('div');
+        $p1 = new HtmlNode('p');
+        $div = new HtmlNode('div');
+        $p2 = new HtmlNode('p');
+        $test->addChild($p1);
+        $test->addChild($div);
+        $test->addChild($p2);
+
+        $seeker = new Seeker();
+
+        $results = $seeker->seek([$p1], $ruleDTO, []);
+        $this->assertCount(1, $results);
+        $this->assertEquals('div', $results[0]->getTag()->name());
+
+        $ruleDTO = RuleDTO::makeFromPrimitives(
+            '+',
+            '=',
+            null,
+            null,
+            false,
+            false
+        );
+
+        $results = $seeker->seek([$div], $ruleDTO, []);
+        $this->assertCount(1, $results);
+        $this->assertEquals('p', $results[0]->getTag()->name());
+    }
+
+    public function testSeekNextAll()
+    {
+        $ruleDTO = RuleDTO::makeFromPrimitives(
+            '~',
+            '=',
+            null,
+            null,
+            false,
+            false
+        );
+
+        $test = new HtmlNode('div');
+        $p1 = new HtmlNode('p');
+        $div = new HtmlNode('div');
+        $p2 = new HtmlNode('p');
+        $test->addChild($p1);
+        $test->addChild($div);
+        $test->addChild($p2);
+
+        $seeker = new Seeker();
+
+        $results = $seeker->seek([$p1], $ruleDTO, []);
+        $this->assertCount(2, $results);
+        $this->assertEquals('p', $results[1]->getTag()->name());
+
+        $ruleDTO = RuleDTO::makeFromPrimitives(
+            '~',
+            '=',
+            null,
+            null,
+            false,
+            false
+        );
+
+        $results = $seeker->seek([$div], $ruleDTO, []);
+        $this->assertCount(1, $results);
+        $this->assertEquals('p', $results[0]->getTag()->name());
+    }
 }