Fixed issue paquettg#65

Author: paquettg

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added `declare(strict_types=1)` to all source files.
 - Added new option `depthFirstSearch`.
 - Deprecated option `depthFirstSearch` and marked for removal in `3.0.0`.
+- Added multi class selections support.
 
 ### Changed
 - Started using a changelog.

src/PHPHtmlParser/Selector/Parser.php

@@ -14,7 +14,7 @@ class Parser implements ParserInterface
      *
      * @var string
      */
-    protected $pattern = "/([\w\-:\*>]*)(?:\#([\w\-]+)|\.([\w\-]+))?(?:\[@?(!?[\w\-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
+    protected $pattern = "/([\w\-:\*>]*)(?:\#([\w\-]+)|\.([\w\.\-]+))?(?:\[@?(!?[\w\-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
 
     /**
      * Parses the selector string
@@ -53,7 +53,7 @@ public function parseSelectorString(string $selector): array
             // check for class selector
             if ( ! empty($match[3])) {
                 $key   = 'class';
-                $value = $match[3];
+                $value = explode('.', $match[3]);
             }
 
             // and final attribute selector

src/PHPHtmlParser/Selector/Selector.php

@@ -343,16 +343,24 @@ public function checkComparison(array $rule, AbstractNode $node): bool
             $nodeValue = $node->getAttribute($rule['key']);
         }
 
-        $check = $this->match($rule['operator'], $rule['value'], $nodeValue);
+        $check = false;
+        if (!is_array($rule['value'])) {
+            $check = $this->match($rule['operator'], $rule['value'], $nodeValue);
+        }
 
         // handle multiple classes
         if ( ! $check && $rule['key'] == 'class') {
             $nodeClasses = explode(' ', $node->getAttribute('class'));
-            foreach ($nodeClasses as $class) {
-                if ( ! empty($class)) {
-                    $check = $this->match($rule['operator'], $rule['value'], $class);
+            foreach ($rule['value'] as $value) {
+                foreach ($nodeClasses as $class) {
+                    if ( ! empty($class)) {
+                        $check = $this->match($rule['operator'], $value, $class);
+                    }
+                    if ($check) {
+                        break;
+                    }
                 }
-                if ($check) {
+                if (!$check) {
                     break;
                 }
             }

tests/Selector/SelectorTest.php

@@ -216,4 +216,18 @@ public function testFindNodeByAttributeOnly()
         $selector = new Selector('[custom-attr]', new Parser());
         $this->assertEquals(1, count($selector->find($root)));
     }
+
+    public function testFindMultipleClasses()
+    {
+        $root   = new HtmlNode(new Tag('root'));
+        $child1 = new HtmlNode(new Tag('a'));
+        $child1->setAttribute('class', 'b');
+        $child2 = new HtmlNode(new Tag('a'));
+        $child2->setAttribute('class', 'b c');
+        $root->addChild($child1);
+        $root->addChild($child2);
+
+        $selector = new Selector('a.b.c', new Parser());
+        $this->assertEquals(1, count($selector->find($root)));
+    }
 }