Fix backcompat for assertMatchesRegularExpression

romanzipp · Mar 19, 2024 · a20408b · a20408b
1 parent a0fdb65
commit a20408b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
             composer-dependency: prefer-lowest
           - php: "8.2"
             composer-dependency: prefer-lowest
-          - php: "8.2"
+          - php: "8.3"
             composer-dependency: prefer-lowest
     name: "PHP ${{ matrix.php }} - ${{ matrix.composer-dependency }}"
     runs-on: ubuntu-latest

diff --git a/tests/CollisionTest.php b/tests/CollisionTest.php
@@ -78,7 +78,7 @@ public function testVoidElementSingleAttributeCollisions()
 
         $this->assertCount(1, $contents);
 
-        $this->assertMatchesRegularExpression('/content\=\"My Second Site Name\"/', $contents[0]);
+        $this->assertMatchesRegularExpressionCustom('/content\=\"My Second Site Name\"/', $contents[0]);
     }
 
     public function testVoidElementSingleOptionalAttributeCollisions()
@@ -99,8 +99,8 @@ public function testVoidElementSingleOptionalAttributeCollisions()
 
         $this->assertCount(2, $contents);
 
-        $this->assertMatchesRegularExpression('/content\=\"My Site Name\"/', $contents[0]);
-        $this->assertMatchesRegularExpression('/content\=\"My Second Site Name\"/', $contents[1]);
+        $this->assertMatchesRegularExpressionCustom('/content\=\"My Site Name\"/', $contents[0]);
+        $this->assertMatchesRegularExpressionCustom('/content\=\"My Second Site Name\"/', $contents[1]);
     }
 
     public function testVoidElementMultipleAttributesCollisions()
@@ -123,6 +123,6 @@ public function testVoidElementMultipleAttributesCollisions()
 
         $this->assertCount(1, $contents);
 
-        $this->assertMatchesRegularExpression('/content\=\"My Second Value\"/', $contents[0]);
+        $this->assertMatchesRegularExpressionCustom('/content\=\"My Second Value\"/', $contents[0]);
     }
 }
diff --git a/tests/HooksTest.php b/tests/HooksTest.php
@@ -102,7 +102,7 @@ public function testExistingAttributesHooks()
 
         $contents = seo()->render()->toArray();
 
-        $this->assertMatchesRegularExpression('/content\=\"My Second Title\"/', $contents[0]);
+        $this->assertMatchesRegularExpressionCustom('/content\=\"My Second Title\"/', $contents[0]);
 
         OpenGraph::clearHooks();
     }
@@ -124,7 +124,7 @@ public function testAppendingAttributesHooks()
 
         $contents = seo()->render()->toArray();
 
-        $this->assertMatchesRegularExpression('/should\=\"exist\"/', $contents[0]);
+        $this->assertMatchesRegularExpressionCustom('/should\=\"exist\"/', $contents[0]);
 
         OpenGraph::clearHooks();
     }
@@ -146,7 +146,7 @@ public function testAttributeHooks()
 
         $contents = seo()->render()->toArray();
 
-        $this->assertMatchesRegularExpression('/content\=\"My Title 1\"/', $contents[0]);
+        $this->assertMatchesRegularExpressionCustom('/content\=\"My Title 1\"/', $contents[0]);
 
         OpenGraph::clearHooks();
     }

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -31,4 +31,15 @@ protected function getPackageAliases($app)
             'Seo' => Seo::class,
         ];
     }
+
+    public static function assertMatchesRegularExpressionCustom(string $pattern, string $string, string $message = ''): void
+    {
+        // If parent has method assertMatchesRegularExpression, call it
+        if (method_exists(BaseTestCase::class, 'assertMatchesRegularExpression')) {
+            parent::assertMatchesRegularExpression($pattern, $string, $message);
+            return;
+        }
+
+        static::assertThat($string, new RegularExpression($pattern), $message);
+    }
 }