Merge branch '11.5' into 12.2

Author: sebastianbergmann

ChangeLog-12.2.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 12.2 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [12.2.7] - 2025-MM-DD
+
+### Fixed
+
+* [#6254](https://github.com/sebastianbergmann/phpunit/issues/6254): `defects,random`configuration is supported by implementation, but it is not allowed by the XML configuration file schema
+
 ## [12.2.6] - 2025-07-04
 
 ### Fixed
@@ -99,6 +105,7 @@ This feature is experimental and the generated XML may change to enhance complia
 * A warning is now emitted when more than one of `#[Small]`, `#[Medium]`, or `#[Large]` is used on a test class
 * A warning is now emitted when a data provider provides data sets that have more values than the test method consumes using arguments
 
+[12.2.7]: https://github.com/sebastianbergmann/phpunit/compare/12.2.6...12.2
 [12.2.6]: https://github.com/sebastianbergmann/phpunit/compare/12.2.5...12.2.6
 [12.2.5]: https://github.com/sebastianbergmann/phpunit/compare/12.2.4...12.2.5
 [12.2.4]: https://github.com/sebastianbergmann/phpunit/compare/12.2.3...12.2.4

phpunit.xsd

@@ -118,6 +118,7 @@
         <xs:restriction base="xs:string">
             <xs:enumeration value="default"/>
             <xs:enumeration value="defects"/>
+            <xs:enumeration value="defects,random"/>
             <xs:enumeration value="depends"/>
             <xs:enumeration value="depends,defects"/>
             <xs:enumeration value="depends,duration"/>

schema/10.5.xsd

@@ -116,6 +116,7 @@
         <xs:restriction base="xs:string">
             <xs:enumeration value="default"/>
             <xs:enumeration value="defects"/>
+            <xs:enumeration value="defects,random"/>
             <xs:enumeration value="depends"/>
             <xs:enumeration value="depends,defects"/>
             <xs:enumeration value="depends,duration"/>

schema/11.5.xsd

@@ -118,6 +118,7 @@
         <xs:restriction base="xs:string">
             <xs:enumeration value="default"/>
             <xs:enumeration value="defects"/>
+            <xs:enumeration value="defects,random"/>
             <xs:enumeration value="depends"/>
             <xs:enumeration value="depends,defects"/>
             <xs:enumeration value="depends,duration"/>

tests/unit/Runner/TestSuiteSorterTest.php

@@ -503,6 +503,42 @@ public function testCanSetRandomizationWithASeed(): void
         $this->assertSame($expectedOrder, $sorter->getExecutionOrder());
     }
 
+    public function testCanSetRandomizationWithDefectsFirst(): void
+    {
+        $cache = new DefaultResultCache;
+
+        $runState = [
+            'testOne'   => ['state' => TestStatus::success(), 'time' => 1],
+            'testTwo'   => ['state' => TestStatus::success(), 'time' => 1],
+            'testThree' => ['state' => TestStatus::error(), 'time' => 1],
+            'testFour'  => ['state' => TestStatus::success(), 'time' => 1],
+            'testFive'  => ['state' => TestStatus::error(), 'time' => 1],
+        ];
+
+        foreach ($runState as $testName => $data) {
+            $cache->setStatus(MultiDependencyTest::class . '::' . $testName, $data['state']);
+            $cache->setTime(MultiDependencyTest::class . '::' . $testName, $data['time']);
+        }
+
+        $sorter = new TestSuiteSorter($cache);
+
+        $suite = TestSuite::empty('test suite name');
+        $suite->addTestSuite(new ReflectionClass(MultiDependencyTest::class));
+
+        mt_srand(54321);
+        $sorter->reorderTestsInSuite($suite, TestSuiteSorter::ORDER_RANDOMIZED, false, TestSuiteSorter::ORDER_DEFECTS_FIRST);
+
+        $expectedOrder = [
+            MultiDependencyTest::class . '::testFive',
+            MultiDependencyTest::class . '::testThree',
+            MultiDependencyTest::class . '::testTwo',
+            MultiDependencyTest::class . '::testFour',
+            MultiDependencyTest::class . '::testOne',
+        ];
+
+        $this->assertSame($expectedOrder, $sorter->getExecutionOrder());
+    }
+
     public function testCanSetRandomizationWithASeedAndResolveDependencies(): void
     {
         $suite = TestSuite::empty('test suite name');