Merge branch '10.5' into 11.0

Author: sebastianbergmann

.psalm/baseline.xml

@@ -475,13 +475,6 @@
     </RedundantCondition>
   </file>
   <file src="src/Metadata/Api/Groups.php">
-    <LessSpecificReturnStatement>
-      <code><![CDATA[array_unique($groups)]]></code>
-      <code><![CDATA[array_unique($groups)]]></code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code><![CDATA[list<string>]]></code>
-    </MoreSpecificReturnType>
     <RedundantCondition>
       <code><![CDATA[$metadata instanceof CoversFunction]]></code>
       <code><![CDATA[$metadata instanceof UsesFunction]]></code>

ChangeLog-11.0.md

@@ -2,6 +2,13 @@
 
 All notable changes of the PHPUnit 11.0 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [11.0.7] - 2024-MM-DD
+
+### Changed
+
+* [#5747](https://github.com/sebastianbergmann/phpunit/pull/5747): Cache result of `Groups::groups()`
+* [#5748](https://github.com/sebastianbergmann/phpunit/pull/5748): Improve performance of `NamePrettifier::prettifyTestMethodName()`
+
 ## [11.0.6] - 2024-03-12
 
 ### Changed
@@ -130,6 +137,7 @@ All notable changes of the PHPUnit 11.0 release series are documented in this fi
 * `PHPUnit\TextUI\Configuration\Configuration::registerMockObjectsFromTestArgumentsRecursively()`
 * `PHPUnit\Framework\Constraint\Constraint::exporter()`
 
+[11.0.7]: https://github.com/sebastianbergmann/phpunit/compare/11.0.6...11.0
 [11.0.6]: https://github.com/sebastianbergmann/phpunit/compare/11.0.5...11.0.6
 [11.0.5]: https://github.com/sebastianbergmann/phpunit/compare/11.0.4...11.0.5
 [11.0.4]: https://github.com/sebastianbergmann/phpunit/compare/11.0.3...11.0.4

src/Logging/TestDox/NamePrettifier.php

@@ -19,11 +19,9 @@
 use function explode;
 use function gettype;
 use function implode;
-use function in_array;
 use function is_bool;
 use function is_float;
 use function is_int;
-use function is_numeric;
 use function is_object;
 use function is_scalar;
 use function method_exists;
@@ -55,7 +53,7 @@
 final class NamePrettifier
 {
     /**
-     * @psalm-var list<string>
+     * @psalm-var array<string, int>
      */
     private static array $strings = [];
 
@@ -109,20 +107,19 @@ public function prettifyTestClassName(string $className): string
         return $result;
     }
 
+    // NOTE: this method is on a hot path and very performance sensitive. change with care.
     public function prettifyTestMethodName(string $name): string
     {
-        $buffer = '';
-
         if ($name === '') {
-            return $buffer;
+            return '';
         }
 
         $string = (string) preg_replace('#\d+$#', '', $name, -1, $count);
 
-        if (in_array($string, self::$strings, true)) {
+        if (array_key_exists($string, self::$strings)) {
             $name = $string;
         } elseif ($count === 0) {
-            self::$strings[] = $string;
+            self::$strings[$string] = 1;
         }
 
         if (str_starts_with($name, 'test_')) {
@@ -132,22 +129,26 @@ public function prettifyTestMethodName(string $name): string
         }
 
         if ($name === '') {
-            return $buffer;
+            return '';
         }
 
         $name[0] = strtoupper($name[0]);
 
-        if (str_contains($name, '_')) {
-            return trim(str_replace('_', ' ', $name));
+        $noUnderscore = str_replace('_', ' ', $name);
+
+        if ($noUnderscore !== $name) {
+            return trim($noUnderscore);
         }
 
         $wasNumeric = false;
 
+        $buffer = '';
+
         foreach (range(0, strlen($name) - 1) as $i) {
             if ($i > 0 && $name[$i] >= 'A' && $name[$i] <= 'Z') {
                 $buffer .= ' ' . strtolower($name[$i]);
             } else {
-                $isNumeric = is_numeric($name[$i]);
+                $isNumeric = $name[$i] >= '0' && $name[$i] <= '9';
 
                 if (!$wasNumeric && $isNumeric) {
                     $buffer .= ' ';

src/Metadata/Api/Groups.php

@@ -10,6 +10,7 @@
 namespace PHPUnit\Metadata\Api;
 
 use function array_flip;
+use function array_key_exists;
 use function array_unique;
 use function assert;
 use function strtolower;
@@ -29,14 +30,25 @@
  */
 final readonly class Groups
 {
+    /**
+     * @var array<string, array<int, string>>
+     */
+    private static array $groupCache = [];
+
     /**
      * @psalm-param class-string $className
      * @psalm-param non-empty-string $methodName
      *
-     * @psalm-return list<string>
+     * @psalm-return array<int, string>
      */
     public function groups(string $className, string $methodName, bool $includeVirtual = true): array
     {
+        $key = $className . '::' . $methodName . '::' . $includeVirtual;
+
+        if (array_key_exists($key, self::$groupCache)) {
+            return self::$groupCache[$key];
+        }
+
         $groups = [];
 
         foreach (Registry::parser()->forClassAndMethod($className, $methodName)->isGroup() as $group) {
@@ -50,7 +62,7 @@ public function groups(string $className, string $methodName, bool $includeVirtu
         }
 
         if (!$includeVirtual) {
-            return array_unique($groups);
+            return self::$groupCache[$key] = array_unique($groups);
         }
 
         foreach (Registry::parser()->forClassAndMethod($className, $methodName) as $metadata) {
@@ -85,7 +97,7 @@ public function groups(string $className, string $methodName, bool $includeVirtu
             }
         }
 
-        return array_unique($groups);
+        return self::$groupCache[$key] = array_unique($groups);
     }
 
     /**

tests/unit/Logging/TestDox/NamePrettifierTest.php

@@ -33,6 +33,7 @@ public function testTitleHasSensibleDefaults(): void
 
     public function testTestNameIsConvertedToASentence(): void
     {
+        $this->assertEquals('', (new NamePrettifier)->prettifyTestMethodName(''));
         $this->assertEquals('This is a test', (new NamePrettifier)->prettifyTestMethodName('testThisIsATest'));
         $this->assertEquals('This is a test', (new NamePrettifier)->prettifyTestMethodName('testThisIsATest2'));
         $this->assertEquals('This is a test', (new NamePrettifier)->prettifyTestMethodName('this_is_a_test'));