Revert "Closes #5210"

This reverts commit 205444f.
sebastianbergmann · Feb 18, 2023 · b2a8bb5 · b2a8bb5
1 parent be72e6e
commit b2a8bb5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -591,11 +591,13 @@ final public function runBare(): void
         clearstatcache();
 
         $hookMethods                       = (new HookMethods)->hookMethods(static::class);
+        $hasMetRequirements                = false;
         $this->numberOfAssertionsPerformed = 0;
         $currentWorkingDirectory           = getcwd();
 
         try {
             $this->checkRequirements();
+            $hasMetRequirements = true;
 
             if ($this->inIsolation) {
                 $this->invokeBeforeClassHookMethods($hookMethods, $emitter);
@@ -618,11 +620,6 @@ final public function runBare(): void
 
             $this->verifyMockObjects();
             $this->invokePostConditionHookMethods($hookMethods, $emitter);
-            $this->invokeAfterTestHookMethods($hookMethods, $emitter);
-
-            if ($this->inIsolation) {
-                $this->invokeAfterClassHookMethods($hookMethods, $emitter);
-            }
 
             $this->status = TestStatus::success();
         } catch (IncompleteTest $e) {
@@ -678,6 +675,20 @@ final public function runBare(): void
 
         $this->mockObjects = [];
 
+        // Tear down the fixture. An exception raised in tearDown() will be
+        // caught and passed on when no exception was raised before.
+        try {
+            if ($hasMetRequirements) {
+                $this->invokeAfterTestHookMethods($hookMethods, $emitter);
+
+                if ($this->inIsolation) {
+                    $this->invokeAfterClassHookMethods($hookMethods, $emitter);
+                }
+            }
+        } catch (Throwable $_e) {
+            $e = $e ?? $_e;
+        }
+
         if (isset($_e)) {
             $this->status = TestStatus::error($_e->getMessage());
         }

diff --git a/tests/end-to-end/event/test-template-methods.phpt b/tests/end-to-end/event/test-template-methods.phpt
@@ -47,10 +47,10 @@ Assertion Succeeded (Constraint: is true)
 Post Condition Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions)
 Post Condition Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions
+Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 After Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown)
 After Test Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown
-Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 Test Finished (PHPUnit\TestFixture\Event\TemplateMethodsTest::testOne)
 Test Preparation Started (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 Before Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::setUp)
@@ -64,10 +64,10 @@ Assertion Succeeded (Constraint: is true)
 Post Condition Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions)
 Post Condition Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::assertPostConditions
+Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 After Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown)
 After Test Method Finished:
 - PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDown
-Test Passed (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 Test Finished (PHPUnit\TestFixture\Event\TemplateMethodsTest::testTwo)
 After Last Test Method Called (PHPUnit\TestFixture\Event\TemplateMethodsTest::tearDownAfterClass)
 After Last Test Method Finished:

diff --git a/tests/end-to-end/regression/5210.phpt b/tests/end-to-end/regression/5210.phpt
@@ -9,6 +9,8 @@ $_SERVER['argv'][] = __DIR__ . '/5210/Issue5210Test.php';
 require_once __DIR__ . '/../../bootstrap.php';
 
 (new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--XFAIL--
+https://github.com/sebastianbergmann/phpunit/issues/5210
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.