Closes #6094

Author: sebastianbergmann

ChangeLog-10.5.md

@@ -10,6 +10,7 @@ All notable changes of the PHPUnit 10.5 release series are documented in this fi
 
 ### Fixed
 
+* [#6094](https://github.com/sebastianbergmann/phpunit/issues/6094): Errors in after-last-test methods are not reported
 * [#6095](https://github.com/sebastianbergmann/phpunit/issues/6095): Expectation is not counted correctly when a doubled method is called more often than is expected
 * [#6098](https://github.com/sebastianbergmann/phpunit/issues/6098): No `system-out` element in JUnit XML logfile
 

src/Runner/TestResult/Collector.php

@@ -16,6 +16,7 @@
 use PHPUnit\Event\Code\TestMethod;
 use PHPUnit\Event\EventFacadeIsSealedException;
 use PHPUnit\Event\Facade;
+use PHPUnit\Event\Test\AfterLastTestMethodErrored;
 use PHPUnit\Event\Test\BeforeFirstTestMethodErrored;
 use PHPUnit\Event\Test\ConsideredRisky;
 use PHPUnit\Event\Test\DeprecationTriggered;
@@ -66,7 +67,7 @@ final class Collector
     private int $numberOfIssuesIgnoredByBaseline = 0;
 
     /**
-     * @psalm-var list<BeforeFirstTestMethodErrored|Errored>
+     * @psalm-var list<AfterLastTestMethodErrored|BeforeFirstTestMethodErrored|Errored>
      */
     private array $testErroredEvents = [];
 
@@ -169,6 +170,7 @@ public function __construct(Facade $facade, Source $source)
             new TestPreparedSubscriber($this),
             new TestFinishedSubscriber($this),
             new BeforeTestClassMethodErroredSubscriber($this),
+            new AfterTestClassMethodErroredSubscriber($this),
             new TestErroredSubscriber($this),
             new TestFailedSubscriber($this),
             new TestMarkedIncompleteSubscriber($this),
@@ -296,6 +298,11 @@ public function beforeTestClassMethodErrored(BeforeFirstTestMethodErrored $event
         $this->numberOfTestsRun++;
     }
 
+    public function afterTestClassMethodErrored(AfterLastTestMethodErrored $event): void
+    {
+        $this->testErroredEvents[] = $event;
+    }
+
     public function testErrored(Errored $event): void
     {
         $this->testErroredEvents[] = $event;

src/Runner/TestResult/Subscriber/AfterTestClassMethodErroredSubscriber.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestRunner\TestResult;
+
+use PHPUnit\Event\Test\AfterLastTestMethodErrored;
+use PHPUnit\Event\Test\AfterLastTestMethodErroredSubscriber;
+
+/**
+ * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class AfterTestClassMethodErroredSubscriber extends Subscriber implements AfterLastTestMethodErroredSubscriber
+{
+    public function notify(AfterLastTestMethodErrored $event): void
+    {
+        $this->collector()->afterTestClassMethodErrored($event);
+    }
+}

src/Runner/TestResult/TestResult.php

@@ -10,6 +10,7 @@
 namespace PHPUnit\TestRunner\TestResult;
 
 use function count;
+use PHPUnit\Event\Test\AfterLastTestMethodErrored;
 use PHPUnit\Event\Test\BeforeFirstTestMethodErrored;
 use PHPUnit\Event\Test\ConsideredRisky;
 use PHPUnit\Event\Test\Errored;
@@ -36,7 +37,7 @@ final class TestResult
     private readonly int $numberOfAssertions;
 
     /**
-     * @psalm-var list<BeforeFirstTestMethodErrored|Errored>
+     * @psalm-var list<AfterLastTestMethodErrored|BeforeFirstTestMethodErrored|Errored>
      */
     private readonly array $testErroredEvents;
 
@@ -131,7 +132,7 @@ final class TestResult
     private readonly int $numberOfIssuesIgnoredByBaseline;
 
     /**
-     * @psalm-param list<BeforeFirstTestMethodErrored|Errored> $testErroredEvents
+     * @psalm-param list<AfterLastTestMethodErrored|BeforeFirstTestMethodErrored|Errored> $testErroredEvents
      * @psalm-param list<Failed> $testFailedEvents
      * @psalm-param array<string,list<ConsideredRisky>> $testConsideredRiskyEvents
      * @psalm-param list<TestSuiteSkipped> $testSuiteSkippedEvents
@@ -188,7 +189,7 @@ public function numberOfAssertions(): int
     }
 
     /**
-     * @psalm-return list<BeforeFirstTestMethodErrored|Errored>
+     * @psalm-return list<AfterLastTestMethodErrored|BeforeFirstTestMethodErrored|Errored>
      */
     public function testErroredEvents(): array
     {

src/TextUI/Output/Default/ResultPrinter.php

@@ -26,6 +26,7 @@
 use function trim;
 use PHPUnit\Event\Code\Test;
 use PHPUnit\Event\Code\TestMethod;
+use PHPUnit\Event\Test\AfterLastTestMethodErrored;
 use PHPUnit\Event\Test\BeforeFirstTestMethodErrored;
 use PHPUnit\Event\Test\ConsideredRisky;
 use PHPUnit\Event\Test\DeprecationTriggered;
@@ -239,7 +240,7 @@ private function printTestsWithErrors(TestResult $result): void
         $elements = [];
 
         foreach ($result->testErroredEvents() as $event) {
-            if ($event instanceof BeforeFirstTestMethodErrored) {
+            if ($event instanceof AfterLastTestMethodErrored || $event instanceof BeforeFirstTestMethodErrored) {
                 $title = $event->testClassName();
             } else {
                 $title = $this->name($event->test());

tests/end-to-end/event/exception-in-teardown-after-class.phpt

@@ -31,4 +31,4 @@ After Last Test Method Finished:
 Test Suite Finished (PHPUnit\TestFixture\Event\ExceptionInTearDownAfterClassTest, 1 test)
 Test Runner Execution Finished
 Test Runner Finished
-PHPUnit Finished (Shell Exit Code: 0)
+PHPUnit Finished (Shell Exit Code: 2)

tests/end-to-end/logging/teamcity-directory.phpt

@@ -70,7 +70,7 @@ Runtime: %s
 ##teamcity[testSuiteFinished name='CLI Arguments' flowId='%d']
 Time: %s, Memory: %s
 
-There were 5 errors:
+There were 6 errors:
 
 1) PHPUnit\TestFixture\Basic\SetUpBeforeClassTest
 Exception: forcing an Exception in setUpBeforeClass()
@@ -97,6 +97,11 @@ RuntimeException: error with custom message
 
 %s%eStatusTest.php:%d
 
+6) PHPUnit\TestFixture\Basic\TearDownAfterClassTest
+Exception: forcing an Exception in tearDownAfterClass()
+
+%s%eTearDownAfterClassTest.php:%d
+
 --
 
 There were 2 failures:
@@ -127,4 +132,4 @@ This test did not perform any assertions
 %s%eStatusTest.php:%d
 
 ERRORS!
-Tests: 18, Assertions: 6, Errors: 5, Failures: 2, Skipped: 3, Incomplete: 2, Risky: 2.
+Tests: 18, Assertions: 6, Errors: 6, Failures: 2, Skipped: 3, Incomplete: 2, Risky: 2.

tests/end-to-end/regression/6094.phpt

@@ -0,0 +1,29 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/6094
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/6094/Issue6094Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+There was 1 error:
+
+1) PHPUnit\TestFixture\Issue6094\Issue6094Test
+Exception: message
+
+%sIssue6094Test.php:19
+
+ERRORS!
+Tests: 1, Assertions: 1, Errors: 1.

tests/end-to-end/regression/6094/Issue6094Test.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6094;
+
+use Exception;
+use PHPUnit\Framework\TestCase;
+
+final class Issue6094Test extends TestCase
+{
+    public static function tearDownAfterClass(): void
+    {
+        throw new Exception('message');
+    }
+
+    public function testOne(): void
+    {
+        $this->assertTrue(true);
+    }
+}