Closes #1959

sebastianbergmann · Dec 10, 2015 · 1f44c09 · 1f44c09
1 parent c047ff0
commit 1f44c09
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/ChangeLog-5.1.md b/ChangeLog-5.1.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 5.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [5.1.4] - 2015-12-DD
+
+* Fixed [#1959](https://github.com/sebastianbergmann/phpunit/issues/1959): Prophecy errors are not handled correctly
+
+### Fixed
+
 ## [5.1.3] - 2015-12-10
 
 ### Added
@@ -30,6 +36,7 @@ All notable changes of the PHPUnit 5.1 release series are documented in this fil
 * Merged [#1871](https://github.com/sebastianbergmann/phpunit/issues/1871): Added support for `@testdox` annotations on classes
 * Merged [#1917](https://github.com/sebastianbergmann/phpunit/issues/1917): Allow `@coversDefaultClass` annotation to work on traits
 
+[5.1.4]: https://github.com/sebastianbergmann/phpunit/compare/5.1.3...5.1.4
 [5.1.3]: https://github.com/sebastianbergmann/phpunit/compare/5.1.2...5.1.3
 [5.1.2]: https://github.com/sebastianbergmann/phpunit/compare/5.1.1...5.1.2
 [5.1.1]: https://github.com/sebastianbergmann/phpunit/compare/5.1.0...5.1.1

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -1009,7 +1009,7 @@ protected function verifyMockObjects()
                 $this->prophet->checkPredictions();
             } catch (Throwable $t) {
                 /* Intentionally left empty */
-            } catch (Exception $e) {
+            } catch (Exception $t) {
                 /* Intentionally left empty */
             }
 
@@ -1021,8 +1021,8 @@ protected function verifyMockObjects()
                 }
             }
 
-            if (isset($e)) {
-                throw $e;
+            if (isset($t)) {
+                throw $t;
             }
         }
     }