ClassHelper: Improved getAllNames()

Author: kukulich

SlevomatCodingStandard/Helpers/ClassHelper.php

@@ -4,7 +4,6 @@
 
 use Generator;
 use PHP_CodeSniffer\Files\File;
-use function array_map;
 use function iterator_to_array;
 use function sprintf;
 use const T_ANON_CLASS;
@@ -47,18 +46,19 @@ public static function getName(File $phpcsFile, int $classPointer): string
 
 	/**
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile
-	 * @return string[]
+	 * @return array<int, string>
 	 */
 	public static function getAllNames(File $phpcsFile): array
 	{
 		$previousClassPointer = 0;
 
-		return array_map(
-			static function (int $classPointer) use ($phpcsFile): string {
-				return self::getName($phpcsFile, $classPointer);
-			},
-			iterator_to_array(self::getAllClassPointers($phpcsFile, $previousClassPointer))
-		);
+		$names = [];
+		/** @var int $classPointer */
+		foreach (iterator_to_array(self::getAllClassPointers($phpcsFile, $previousClassPointer)) as $classPointer) {
+			$names[$classPointer] = self::getName($phpcsFile, $classPointer);
+		}
+
+		return $names;
 	}
 
 	/**

tests/Helpers/ClassHelperTest.php

@@ -2,6 +2,7 @@
 
 namespace SlevomatCodingStandard\Helpers;
 
+use function array_values;
 use const T_ANON_CLASS;
 
 class ClassHelperTest extends TestCase
@@ -36,13 +37,13 @@ public function testNameWithoutNamespace(): void
 	public function testGetAllNamesWithNamespace(): void
 	{
 		$phpcsFile = $this->getCodeSnifferFile(__DIR__ . '/data/classWithNamespace.php');
-		self::assertSame(['FooClass', 'FooInterface', 'FooTrait'], ClassHelper::getAllNames($phpcsFile));
+		self::assertSame(['FooClass', 'FooInterface', 'FooTrait'], array_values(ClassHelper::getAllNames($phpcsFile)));
 	}
 
 	public function testGetAllNamesWithoutNamespace(): void
 	{
 		$phpcsFile = $this->getCodeSnifferFile(__DIR__ . '/data/classWithoutNamespace.php');
-		self::assertSame(['FooClass', 'FooInterface', 'FooTrait'], ClassHelper::getAllNames($phpcsFile));
+		self::assertSame(['FooClass', 'FooInterface', 'FooTrait'], array_values(ClassHelper::getAllNames($phpcsFile)));
 	}
 
 	public function testGetAllNamesWithNoClass(): void