[CLEANUP] Use Preg::matchAll to handle unexpected preg_match_all errors

MyIntervals · Sep 20, 2024 · 6bdb616 · 6bdb616
1 parent 8ac1121
commit 6bdb616
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -84,8 +84,3 @@ parameters:
 			message: "#^Parameter \\#2 \\$actual of static method Pelago\\\\Emogrifier\\\\Tests\\\\Unit\\\\HtmlProcessor\\\\AbstractHtmlProcessorTest\\:\\:assertEqualsHtml\\(\\) expects string, string\\|false given\\.$#"
 			count: 1
 			path: tests/Unit/HtmlProcessor/AbstractHtmlProcessorTest.php
-
-		-
-			message: "#^Variable \\$classAttributeMatches in PHPDoc tag @var does not match any variable in the foreach loop\\: \\$classAttributeValue$#"
-			count: 1
-			path: tests/Unit/HtmlProcessor/HtmlPrunerTest.php
diff --git a/src/HtmlProcessor/HtmlPruner.php b/src/HtmlProcessor/HtmlPruner.php
@@ -126,9 +126,11 @@ private function removeClassAttributeFromElements(\DOMNodeList $elements): void
      */
     public function removeRedundantClassesAfterCssInlined(CssInliner $cssInliner): self
     {
+        $preg = new Preg();
+
         $classesToKeepAsKeys = [];
         foreach ($cssInliner->getMatchingUninlinableSelectors() as $selector) {
-            \preg_match_all('/\\.(-?+[_a-zA-Z][\\w\\-]*+)/', $selector, $matches);
+            $preg->matchAll('/\\.(-?+[_a-zA-Z][\\w\\-]*+)/', $selector, $matches);
             $classesToKeepAsKeys += \array_fill_keys($matches[1], true);
         }
 

diff --git a/tests/Support/Constraint/StringContainsCssCount.php b/tests/Support/Constraint/StringContainsCssCount.php
@@ -4,6 +4,8 @@
 
 namespace Pelago\Emogrifier\Tests\Support\Constraint;
 
+use Pelago\Emogrifier\Utilities\Preg;
+
 /**
  * This constraint asserts that the string it is evaluated for contains some specific CSS a specific number of times,
  * allowing for cosmetic whitespace differences.
@@ -61,6 +63,6 @@ protected function matches($other): bool
             return false;
         }
 
-        return \preg_match_all($this->cssPattern, $other) === $this->count;
+        return (new Preg())->matchAll($this->cssPattern, $other) === $this->count;
     }
 }
diff --git a/tests/Unit/HtmlProcessor/AbstractHtmlProcessorTest.php b/tests/Unit/HtmlProcessor/AbstractHtmlProcessorTest.php
@@ -487,7 +487,7 @@ public function notAddsSecondHtmlTag(string $html): void
 
         $result = $subject->render();
 
-        $htmlTagCount = \preg_match_all('%<html[\\s/>]%', $result);
+        $htmlTagCount = (new Preg())->matchAll('%<html[\\s/>]%', $result);
         self::assertSame(1, $htmlTagCount);
     }
 
@@ -556,7 +556,7 @@ public function addsMissingHeadTagExactlyOnce(string $html): void
 
         $result = $subject->render();
 
-        $headTagCount = \preg_match_all('%<head[\\s/>]%', $result);
+        $headTagCount = (new Preg())->matchAll('%<head[\\s/>]%', $result);
         self::assertSame(1, $headTagCount);
     }
 
@@ -604,7 +604,7 @@ public function notAddsSecondHeadTag(string $html): void
 
         $result = $subject->render();
 
-        $headTagCount = \preg_match_all('%<head[\\s/>]%', $result);
+        $headTagCount = (new Preg())->matchAll('%<head[\\s/>]%', $result);
         self::assertSame(1, $headTagCount);
     }
 

diff --git a/tests/Unit/HtmlProcessor/HtmlPrunerTest.php b/tests/Unit/HtmlProcessor/HtmlPrunerTest.php
@@ -7,6 +7,7 @@
 use Pelago\Emogrifier\CssInliner;
 use Pelago\Emogrifier\HtmlProcessor\AbstractHtmlProcessor;
 use Pelago\Emogrifier\HtmlProcessor\HtmlPruner;
+use Pelago\Emogrifier\Utilities\Preg;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 
@@ -393,8 +394,7 @@ public function removeRedundantClassesMinifiesClassAttributes(string $html, arra
 
         $subject->removeRedundantClasses($classesToKeep);
 
-        \preg_match_all('/class="([^"]*+)"/', $subject->renderBodyContent(), $classAttributeMatches);
-        /** @var array<int, array<int, string>> $classAttributeMatches */
+        (new Preg())->matchAll('/class="([^"]*+)"/', $subject->renderBodyContent(), $classAttributeMatches);
         foreach ($classAttributeMatches[1] as $classAttributeValue) {
             self::assertMinified($classAttributeValue);
         }