Merge branch '11.5' into 12.2

Author: sebastianbergmann

src/Event/Value/Test/TestDoxBuilder.php

@@ -17,11 +17,13 @@
  *
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final readonly class TestDoxBuilder
+final class TestDoxBuilder
 {
+    private static ?NamePrettifier $namePrettifier = null;
+
     public static function fromTestCase(TestCase $testCase): TestDox
     {
-        $prettifier = new NamePrettifier;
+        $prettifier = self::namePrettifier();
 
         return new TestDox(
             $prettifier->prettifyTestClassName($testCase::class),
@@ -36,7 +38,7 @@ public static function fromTestCase(TestCase $testCase): TestDox
      */
     public static function fromClassNameAndMethodName(string $className, string $methodName): TestDox
     {
-        $prettifier = new NamePrettifier;
+        $prettifier = self::namePrettifier();
 
         $prettifiedMethodName = $prettifier->prettifyTestMethodName($methodName);
 
@@ -46,4 +48,13 @@ public static function fromClassNameAndMethodName(string $className, string $met
             $prettifiedMethodName,
         );
     }
+
+    private static function namePrettifier(): NamePrettifier
+    {
+        if (self::$namePrettifier === null) {
+            self::$namePrettifier = new NamePrettifier;
+        }
+
+        return self::$namePrettifier;
+    }
 }

src/Logging/TestDox/NamePrettifier.php

@@ -57,7 +57,7 @@ final class NamePrettifier
     /**
      * @var array<string, int>
      */
-    private static array $strings = [];
+    private array $strings = [];
 
     /**
      * @param class-string $className
@@ -118,10 +118,10 @@ public function prettifyTestMethodName(string $name): string
 
         $string = rtrim($name, '0123456789');
 
-        if (array_key_exists($string, self::$strings)) {
+        if (array_key_exists($string, $this->strings)) {
             $name = $string;
         } elseif ($string === $name) {
-            self::$strings[$string] = 1;
+            $this->strings[$string] = 1;
         }
 
         if (str_starts_with($name, 'test_')) {

tests/unit/Logging/TestDox/NamePrettifierTest.php

@@ -88,14 +88,6 @@ public static function methodNameProvider(): array
                 '',
                 'test',
             ],
-            [
-                'This is a test',
-                'testThisIsATest',
-            ],
-            [
-                'This is a test',
-                'testThisIsATest2',
-            ],
             [
                 'This is a test',
                 'this_is_a_test',
@@ -132,7 +124,8 @@ public static function methodNameProvider(): array
      */
     public static function objectProvider(): array
     {
-        $object = new class {
+        $object = new class
+        {
             public function __toString(): string
             {
                 return 'object as string';
@@ -207,4 +200,12 @@ public function test_TestCase_can_be_prettified(string $expected, TestCase $test
     {
         $this->assertSame($expected, (new NamePrettifier)->prettifyTestCase($testCase, $colorize));
     }
+
+    public function testStripsNumericSuffixFromTestMethodNameWhenTestMethodNameWithoutThatSuffixWasPreviouslyProcessed(): void
+    {
+        $namePrettifier = new NamePrettifier;
+
+        $this->assertSame('This is a test', $namePrettifier->prettifyTestMethodName('testThisIsATest'));
+        $this->assertSame('This is a test', $namePrettifier->prettifyTestMethodName('testThisIsATest2'));
+    }
 }