Closes sebastianbergmann#2221

Author: sebastianbergmann

ChangeLog-5.4.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 5.4 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [5.4.7] - 2016-MM-DD
+
+### Fixed
+
+* Fixed [#2221](https://github.com/sebastianbergmann/phpunit/issues/2221): `expectException()` accepts non-string argument
+
 ## [5.4.6] - 2016-06-16
 
 ### Fixed
@@ -57,6 +63,7 @@ All notable changes of the PHPUnit 5.4 release series are documented in this fil
 * The logfile format generated using the `--log-junit` option and the `<log type="junit" target="..."/>` configuration directive has been updated to match the [current format used by JUnit](http://llg.cubic.org/docs/junit/). Due to this change you may need to update how your continuous integration server processes test result logfiles generated by PHPUnit.
 * The usage of test doubles created via data providers has been improved
 
+[5.4.7]: https://github.com/sebastianbergmann/phpunit/compare/5.4.6...5.4.7
 [5.4.6]: https://github.com/sebastianbergmann/phpunit/compare/5.4.5...5.4.6
 [5.4.5]: https://github.com/sebastianbergmann/phpunit/compare/5.4.4...5.4.5
 [5.4.4]: https://github.com/sebastianbergmann/phpunit/compare/5.4.3...5.4.4

src/Framework/TestCase.php

@@ -134,7 +134,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
     /**
      * The name of the expected Exception.
      *
-     * @var mixed
+     * @var string
      */
     private $expectedException = null;
 
@@ -574,12 +574,16 @@ public function setExpectedExceptionRegExp($exception, $messageRegExp = '', $cod
     }
 
     /**
-     * @param mixed $exception
+     * @param string $exception
      *
      * @since Method available since Release 5.2.0
      */
     public function expectException($exception)
     {
+        if (!is_string($exception)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
         $this->expectedException = $exception;
     }