From b7654e578aea464461e49f93ed2c248d2389d690 Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Thu, 28 Dec 2017 09:48:30 +0100
Subject: [PATCH] Backport 950417ef02c33de80df210b5f4cbddc789cc4772 for #2236

---
 src/Framework/TestCase.php       | 10 +++++-----
 tests/Framework/TestCaseTest.php |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
index 66a38e83363..adba6c1ab78 100644
--- a/src/Framework/TestCase.php
+++ b/src/Framework/TestCase.php
@@ -945,11 +945,6 @@ public function runBare()
             $e = $_e;
         }
 
-        if (isset($_e)) {
-            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
-            $this->statusMessage = $_e->getMessage();
-        }
-
         // Clean up the mock objects.
         $this->mockObjects = [];
         $this->prophet     = null;
@@ -986,6 +981,11 @@ public function runBare()
             }
         }
 
+        if (isset($_e)) {
+            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
+            $this->statusMessage = $_e->getMessage();
+        }
+
         clearstatcache();
 
         if ($currentWorkingDirectory != getcwd()) {
diff --git a/tests/Framework/TestCaseTest.php b/tests/Framework/TestCaseTest.php
index b3a20b8caf6..ae2870cbdd0 100644
--- a/tests/Framework/TestCaseTest.php
+++ b/tests/Framework/TestCaseTest.php
@@ -159,6 +159,7 @@ public function testExceptionInTearDown()
         $this->assertTrue($test->testSomething);
         $this->assertTrue($test->assertPostConditions);
         $this->assertTrue($test->tearDown);
+        $this->assertEquals(PHPUnit_Runner_BaseTestRunner::STATUS_ERROR, $test->getStatus());
     }
 
     public function testNoArgTestCasePasses()