Closes #2731

sebastianbergmann · Oct 14, 2017 · 2decef4 · 2decef4
1 parent 6727744
commit 2decef4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/ChangeLog-6.4.md b/ChangeLog-6.4.md
@@ -5,6 +5,7 @@ All notable changes of the PHPUnit 6.4 release series are documented in this fil
 ## [6.4.2] - 2017-10-13
 
 * Fixed [#2688](https://github.com/sebastianbergmann/phpunit/issues/2688): `assertNotContains()` interferes with actual string
+* Fixed [#2731](https://github.com/sebastianbergmann/phpunit/issues/2731): Empty exception message cannot be expected
 * Fixed [#2778](https://github.com/sebastianbergmann/phpunit/issues/2778): `assertContains()` does not handle empty strings in strings correctly
 
 ## [6.4.1] - 2017-10-07

diff --git a/src/Framework/Constraint/ExceptionMessage.php b/src/Framework/Constraint/ExceptionMessage.php
@@ -36,6 +36,10 @@ public function __construct($expected)
      */
     protected function matches($other)
     {
+        if ($this->expectedMessage === '') {
+            return $other->getMessage() === '';
+        }
+
         return \strpos($other->getMessage(), $this->expectedMessage) !== false;
     }
 
@@ -51,6 +55,13 @@ protected function matches($other)
      */
     protected function failureDescription($other)
     {
+        if ($this->expectedMessage === '') {
+            return \sprintf(
+                "exception message is empty but is '%s'",
+                $other->getMessage()
+            );
+        }
+
         return \sprintf(
             "exception message '%s' contains '%s'",
             $other->getMessage(),
@@ -63,6 +74,10 @@ protected function failureDescription($other)
      */
     public function toString()
     {
+        if ($this->expectedMessage === '') {
+            return 'exception message is empty';
+        }
+
         return 'exception message contains ';
     }
 }