compatibility with PHPUnit 6.x fix

yiisoft · Apr 13, 2017 · 8269b73 · 8269b73
1 parent d8e6a89
commit 8269b73
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/tests/compatibility.php b/tests/compatibility.php
@@ -25,6 +25,11 @@ public function expectException($exception)
              */
             public function expectExceptionMessage($message)
             {
+                $parentClassMethods = get_class_methods(get_parent_class($this));
+                if (in_array('expectExceptionMessage', $parentClassMethods)) {
+                    parent::expectExceptionMessage($message);
+                    return;
+                }
                 $this->setExpectedException($this->getExpectedException(), $message);
             }
 
@@ -33,6 +38,11 @@ public function expectExceptionMessage($message)
              */
             public function expectExceptionMessageRegExp($messageRegExp)
             {
+                $parentClassMethods = get_class_methods(get_parent_class($this));
+                if (in_array('expectExceptionMessageRegExp', $parentClassMethods)) {
+                    parent::expectExceptionMessageRegExp($messageRegExp);
+                    return;
+                }
                 $this->setExpectedExceptionRegExp($this->getExpectedException(), $messageRegExp);
             }
         }