Merge branch '7.5' into 8.4

sebastianbergmann · Oct 28, 2019 · a498029 · a498029
2 parents f9f77ec + ea510c5
commit a498029
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -1957,23 +1957,17 @@ private function verifyMockObjects(): void
         if ($this->prophet !== null) {
             try {
                 $this->prophet->checkPredictions();
-            } catch (\Throwable $t) {
-                /* Intentionally left empty */
-            }
-
-            foreach ($this->prophet->getProphecies() as $objectProphecy) {
-                foreach ($objectProphecy->getMethodProphecies() as $methodProphecies) {
-                    foreach ($methodProphecies as $methodProphecy) {
-                        \assert($methodProphecy instanceof MethodProphecy);
-
-                        $this->numAssertions += \count($methodProphecy->getCheckedPredictions());
+            } finally {
+                foreach ($this->prophet->getProphecies() as $objectProphecy) {
+                    foreach ($objectProphecy->getMethodProphecies() as $methodProphecies) {
+                        foreach ($methodProphecies as $methodProphecy) {
+                            \assert($methodProphecy instanceof MethodProphecy);
+
+                            $this->numAssertions += \count($methodProphecy->getCheckedPredictions());
+                        }
                     }
                 }
             }
-
-            if (isset($t)) {
-                throw $t;
-            }
         }
     }