Merge branch 'hotfix/55'

Close #55
zendframework · Oct 29, 2017 · 72dbee0 · 72dbee0
2 parents 31fa83c + aa6e9ef
commit 72dbee0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#55](https://github.com/zendframework/zend-test/pull/55) Fixes compatibility
+  with PHPUnit 5.7.23 where empty expected exception message no longer means
+  message is not checked.
 
 ## 3.1.0 - 2017-05-01
 

diff --git a/src/PHPUnit/Controller/AbstractControllerTestCase.php b/src/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -490,7 +490,8 @@ public function assertApplicationException($type, $message = null)
             $this->getApplication()->getMvcEvent()->setParam('exception', null);
         }
 
-        if (method_exists($this, 'setExpectedException')) {
+        if (! method_exists($this, 'expectException')) {
+            // For old PHPUnit 4
             $this->setExpectedException($type, $message);
         } else {
             $this->expectException($type);

diff --git a/test/ExpectedExceptionTrait.php b/test/ExpectedExceptionTrait.php
@@ -16,7 +16,8 @@ trait ExpectedExceptionTrait
      */
     public function expectedException($exceptionClass, $message = '')
     {
-        if (method_exists($this, 'setExpectedException')) {
+        if (! method_exists($this, 'expectException')) {
+            // For old PHPUnit 4
             $this->setExpectedException($exceptionClass, $message);
             return;
         }