[BUGFIX] Allow order-insensitve removeDeclarationBlockBySelector (#1406)

Also internally avoid comparison with `==`.

Resolves #1330

Author: JakeQZ

CHANGELOG.md

@@ -23,6 +23,7 @@ Please also have a look at our
 
 ### Fixed
 
+- Allow `removeDeclarationBlockBySelector()` to be order-insensitve (#1406)
 - Fix parsing of `calc` expressions when a newline immediately precedes or
   follows a `+` or `-` operator (#1399)
 - Use typesafe versions of PHP functions (#1379, #1380, #1382, #1383, #1384)

config/phpstan-baseline.neon

@@ -1,11 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: '#^Loose comparison via "\=\=" is not allowed\.$#'
-			identifier: equal.notAllowed
-			count: 1
-			path: ../src/CSSList/CSSList.php
-
 		-
 			message: '#^Parameter \#2 \$found of class Sabberworm\\CSS\\Parsing\\UnexpectedTokenException constructor expects string, Sabberworm\\CSS\\Value\\CSSFunction\|Sabberworm\\CSS\\Value\\CSSString\|Sabberworm\\CSS\\Value\\LineName\|Sabberworm\\CSS\\Value\\Size\|Sabberworm\\CSS\\Value\\URL given\.$#'
 			identifier: argument.type

src/CSSList/CSSList.php

@@ -370,7 +370,7 @@ public function removeDeclarationBlockBySelector($selectors, bool $removeAll = f
             if (!($item instanceof DeclarationBlock)) {
                 continue;
             }
-            if ($item->getSelectors() == $selectors) {
+            if (self::selectorsMatch($item->getSelectors(), $selectors)) {
                 unset($this->contents[$key]);
                 if (!$removeAll) {
                     return;
@@ -427,4 +427,34 @@ public function getContents(): array
     {
         return $this->contents;
     }
+
+    /**
+     * @param list<Selector> $selectors1
+     * @param list<Selector> $selectors2
+     */
+    private static function selectorsMatch(array $selectors1, array $selectors2): bool
+    {
+        $selectorStrings1 = self::getSelectorStrings($selectors1);
+        $selectorStrings2 = self::getSelectorStrings($selectors2);
+
+        \sort($selectorStrings1);
+        \sort($selectorStrings2);
+
+        return $selectorStrings1 === $selectorStrings2;
+    }
+
+    /**
+     * @param list<Selector> $selectors
+     *
+     * @return list<string>
+     */
+    private static function getSelectorStrings(array $selectors): array
+    {
+        return \array_map(
+            static function (Selector $selector): string {
+                return $selector->getSelector();
+            },
+            $selectors
+        );
+    }
 }

tests/Unit/CSSList/CSSListTest.php

@@ -239,6 +239,22 @@ public function removeDeclarationBlockBySelectorRemovesDeclarationBlockWithOutso
         self::assertSame([], $subject->getContents());
     }
 
+    /**
+     * @test
+     */
+    public function removeDeclarationBlockBySelectorRemovesDeclarationBlockWithSelectorsInReverseOrder(): void
+    {
+        $subject = new ConcreteCSSList();
+        $declarationBlock = new DeclarationBlock();
+        $declarationBlock->setSelectors(['html', 'body']);
+        $subject->setContents([$declarationBlock]);
+        self::assertNotSame([], $subject->getContents()); // make sure contents are set
+
+        $subject->removeDeclarationBlockBySelector([new Selector('body'), new Selector('html')]);
+
+        self::assertSame([], $subject->getContents());
+    }
+
     /**
      * @test
      */