Closes #5164

sebastianbergmann · Feb 4, 2023 · 8072151 · 8072151
1 parent 385b4d1
commit 8072151
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ChangeLog-9.6.md b/ChangeLog-9.6.md
@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 9.6 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [9.6.3] - 2023-MM-DD
+
+### Fixed
+
+* [#5164](https://github.com/sebastianbergmann/phpunit/issues/5164): `markTestSkipped()` not handled correctly when called in "before first test" method
+
 ## [9.6.2] - 2023-02-04
 
 ### Fixed
@@ -24,6 +30,7 @@ All notable changes of the PHPUnit 9.6 release series are documented in this fil
 * [#5064](https://github.com/sebastianbergmann/phpunit/issues/5064): Deprecate `PHPUnit\Framework\TestCase::getMockClass()`
 * [#5132](https://github.com/sebastianbergmann/phpunit/issues/5132): Deprecate `Test` suffix for abstract test case classes
 
+[9.6.3]: https://github.com/sebastianbergmann/phpunit/compare/9.6.2...9.6
 [9.6.2]: https://github.com/sebastianbergmann/phpunit/compare/9.6.1...9.6.2
 [9.6.1]: https://github.com/sebastianbergmann/phpunit/compare/9.6.0...9.6.1
 [9.6.0]: https://github.com/sebastianbergmann/phpunit/compare/9.5.28...9.6.0
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -628,7 +628,7 @@ public function run(TestResult $result = null): TestResult
                         call_user_func([$this->name, $beforeClassMethod]);
                     }
                 }
-            } catch (SkippedTestSuiteError $error) {
+            } catch (SkippedTestSuiteError|SkippedTestError $error) {
                 foreach ($this->tests() as $test) {
                     $result->startTest($test);
                     $result->addFailure($test, $error, 0);

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