Add compat for "expectExceptionMessage"

rougin · Nov 14, 2024 · 9e7a899 · 9e7a899
1 parent 37d317b
commit 9e7a899
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/tests/ResultTest.php b/tests/ResultTest.php
@@ -33,7 +33,7 @@ public function test_undefined_field()
     {
         $expected = 'Field "age" not found';
 
-        $this->expectExceptionMessage($expected);
+        $this->doExpectExceptionMessage($expected);
 
         $result = new Result;
 

diff --git a/tests/Source/BasicSourceTest.php b/tests/Source/BasicSourceTest.php
@@ -56,7 +56,7 @@ public function test_invalid_with_error()
      */
     public function test_invalid_without_result()
     {
-        $this->expectExceptionMessage('Validation failed');
+        $this->doExpectExceptionMessage('Validation failed');
 
         $payload = array('email' => 'me@roug.in');
 
@@ -92,7 +92,7 @@ public function test_valid_with_result()
      */
     public function test_valid_without_error()
     {
-        $this->expectExceptionMessage('Validation passed');
+        $this->doExpectExceptionMessage('Validation passed');
 
         $payload = array();
 

diff --git a/tests/Testcase.php b/tests/Testcase.php
@@ -13,17 +13,42 @@
  */
 class Testcase extends Legacy
 {
-    /** @phpstan-ignore-next-line */
-    public function setExpectedException($exception)
+    /**
+     * @param string $exception
+     *
+     * @return void
+     */
+    public function doSetExpectedException($exception)
     {
         if (method_exists($this, 'expectException'))
         {
+            /** @phpstan-ignore-next-line */
             $this->expectException($exception);
 
             return;
         }
 
         /** @phpstan-ignore-next-line */
-        parent::setExpectedException($exception);
+        $this->setExpectedException($exception);
+    }
+
+    /**
+     * @param string $message
+     *
+     * @return void
+     */
+    public function doExpectExceptionMessage($message)
+    {
+        if (! method_exists($this, 'expectExceptionMessage'))
+        {
+            $exception = 'Exception';
+
+            /** @phpstan-ignore-next-line */
+            $this->setExpectedException($exception, $message);
+
+            return;
+        }
+
+        $this->expectExceptionMessage($message);
     }
 }