Merge branch '13.1'

* 13.1:
  Fix crash when before-class or after-class method fails with assertion failure

Author: sebastianbergmann

src/Runner/TestResult/Collector.php

@@ -336,6 +336,10 @@ public function testSuiteFinished(TestSuiteFinished $event): void
             assert($test instanceof TestMethod);
 
             foreach ($this->testFailedEvents as $testFailedEvent) {
+                if ($testFailedEvent instanceof AfterLastTestMethodFailed || $testFailedEvent instanceof BeforeFirstTestMethodFailed) {
+                    continue;
+                }
+
                 if ($testFailedEvent->test()->isTestMethod() && $testFailedEvent->test()->methodName() === $test->methodName()) {
                     return;
                 }

tests/end-to-end/regression/6595-directory.phpt

@@ -0,0 +1,39 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/6595 (assertion failure in setUpBeforeClass with directory containing data provider test)
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/6595';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+...
+
+Time: %s, Memory: %s
+
+There were 3 failures:
+
+1) PHPUnit\TestFixture\Issue6595\FailureInSetUpBeforeClassTest
+failure in setUpBeforeClass
+
+%sFailureInSetUpBeforeClassTest.php:%d
+
+2) PHPUnit\TestFixture\Issue6595\FailureInSetUpBeforeClassWithDataProviderTest
+failure in setUpBeforeClass
+
+%sFailureInSetUpBeforeClassWithDataProviderTest.php:%d
+
+3) PHPUnit\TestFixture\Issue6595\FailureInTearDownAfterClassTest
+failure in tearDownAfterClass
+
+%sFailureInTearDownAfterClassTest.php:%d
+
+FAILURES!
+Tests: 5, Assertions: 3, Failures: 3.

tests/end-to-end/regression/6595/FailureInSetUpBeforeClassWithDataProviderTest.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6595;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class FailureInSetUpBeforeClassWithDataProviderTest extends TestCase
+{
+    public static function provider(): array
+    {
+        return [
+            [1],
+            [2],
+        ];
+    }
+
+    public static function setUpBeforeClass(): void
+    {
+        self::fail('failure in setUpBeforeClass');
+    }
+
+    #[DataProvider('provider')]
+    public function testOne(int $value): void
+    {
+        $this->assertGreaterThan(0, $value);
+    }
+}

tests/end-to-end/regression/6595/PassingWithDataProviderTest.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6595;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class PassingWithDataProviderTest extends TestCase
+{
+    public static function provider(): array
+    {
+        return [
+            [1],
+            [2],
+        ];
+    }
+
+    #[DataProvider('provider')]
+    public function testOne(int $value): void
+    {
+        $this->assertGreaterThan(0, $value);
+    }
+}