Run rector rules for tests/phpunit folder (#1946)

infection · Mar 23, 2024 · bde0f4a · bde0f4a
1 parent 0aa8299
commit bde0f4a
Show file tree

Hide file tree

Showing 67 changed files with 471 additions and 655 deletions.
diff --git a/rector.php b/rector.php
@@ -39,8 +39,7 @@
 return RectorConfig::configure()
     ->withPaths([
         __DIR__ . '/src',
-        // TODO uncomment as a separate PR
-        // __DIR__ . '/tests/phpunit',
+        __DIR__ . '/tests/phpunit',
     ])
     ->withPhpSets(php81: true)
     ->withSkip([

diff --git a/tests/phpunit/AutoReview/ContainerTest.php b/tests/phpunit/AutoReview/ContainerTest.php
@@ -92,9 +92,7 @@ public function getContainerFiles(): array
         }
 
         self::$containerFiles = array_map(
-            static function (string $path): string {
-                return Path::canonicalize($path);
-            },
+            static fn (string $path): string => Path::canonicalize($path),
             [
                 __DIR__ . '/ContainerTest.php',
                 __DIR__ . '/../ContainerTest.php',

diff --git a/tests/phpunit/AutoReview/EnvVariableManipulation/EnvTestCasesProvider.php b/tests/phpunit/AutoReview/EnvVariableManipulation/EnvTestCasesProvider.php
@@ -71,9 +71,7 @@ public static function provideEnvTestCaseTuple(): iterable
         }
 
         self::$envTestCaseClassesTuple = array_values(array_filter(array_map(
-            static function (string $className): ?array {
-                return self::envTestCaseTuple($className);
-            },
+            static fn (string $className): ?array => self::envTestCaseTuple($className),
             iterator_to_array(ProjectCodeProvider::provideSourceClasses(), true),
         )));
 

diff --git a/tests/phpunit/AutoReview/Event/SubscriberProvider.php b/tests/phpunit/AutoReview/Event/SubscriberProvider.php
@@ -63,11 +63,8 @@ public static function provideSubscriberClasses(): iterable
 
         self::$subscriberClasses = array_values(array_filter(
             iterator_to_array(ProjectCodeProvider::provideSourceClasses(), true),
-            static function (string $class): bool {
-                return $class !== EventSubscriber::class
-                    && (new ReflectionClass($class))->implementsInterface(EventSubscriber::class)
-                ;
-            },
+            static fn (string $class): bool => $class !== EventSubscriber::class
+                && (new ReflectionClass($class))->implementsInterface(EventSubscriber::class),
         ));
 
         yield from self::$subscriberClasses;

diff --git a/tests/phpunit/AutoReview/IntegrationGroup/IntegrationGroupProvider.php b/tests/phpunit/AutoReview/IntegrationGroup/IntegrationGroupProvider.php
@@ -82,9 +82,7 @@ public static function provideIoTestCaseTuple(): iterable
         }
 
         self::$ioTestCaseClassesTuple = array_values(array_filter(array_map(
-            static function (string $className): ?array {
-                return self::ioTestCaseTuple($className);
-            },
+            static fn (string $className): ?array => self::ioTestCaseTuple($className),
             iterator_to_array(ProjectCodeProvider::provideSourceClasses(), true),
         )));
 

diff --git a/tests/phpunit/AutoReview/IntegrationGroup/IntegrationGroupTest.php b/tests/phpunit/AutoReview/IntegrationGroup/IntegrationGroupTest.php
@@ -70,7 +70,7 @@ public function test_the_test_cases_requiring_io_operations_belongs_to_the_integ
         $this->failWithIntegrationGroupMessage($testCaseClassName, $fileWithIoOperations);
     }
 
-    private function failWithIntegrationGroupMessage(string $testCaseClassName, string $fileWithIoOperations): void
+    private function failWithIntegrationGroupMessage(string $testCaseClassName, string $fileWithIoOperations): never
     {
         $this->fail(sprintf(
             <<<'TXT'

diff --git a/tests/phpunit/AutoReview/Makefile/MakefileTest.php b/tests/phpunit/AutoReview/Makefile/MakefileTest.php
@@ -49,6 +49,7 @@
 use PHPUnit\Framework\Attributes\Group;
 use function Safe\array_replace;
 use function sprintf;
+use function str_ends_with;
 use function str_starts_with;
 use function substr;
 use function substr_count;
@@ -284,8 +285,8 @@ protected function getExpectedHelpOutput(): string
     private static function getTestRules(bool $dockerTargets): array
     {
         $filterDockerTarget = $dockerTargets
-            ? static fn (string $target) => substr($target, -7) === '-docker'
-            : static fn (string $target) => substr($target, -7) !== '-docker';
+            ? static fn (string $target) => str_ends_with($target, '-docker')
+            : static fn (string $target) => !str_ends_with($target, '-docker');
 
         return array_values(
             array_filter(

diff --git a/tests/phpunit/AutoReview/Mutator/MutatorTest.php b/tests/phpunit/AutoReview/Mutator/MutatorTest.php
@@ -211,14 +211,10 @@ class_implements($configClassName),
     private function getPublicMethods(ReflectionClass $reflectionClass): array
     {
         $publicMethods = array_map(
-            static function (ReflectionMethod $reflectionMethod): string {
-                return $reflectionMethod->getName();
-            },
+            static fn (ReflectionMethod $reflectionMethod): string => $reflectionMethod->getName(),
             array_filter(
                 $reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC),
-                static function (ReflectionMethod $reflectionMethod): bool {
-                    return !$reflectionMethod->isConstructor();
-                },
+                static fn (ReflectionMethod $reflectionMethod): bool => !$reflectionMethod->isConstructor(),
             ),
         );
 

diff --git a/tests/phpunit/AutoReview/ProjectCode/ProjectCodeProvider.php b/tests/phpunit/AutoReview/ProjectCode/ProjectCodeProvider.php
@@ -175,15 +175,13 @@ public static function provideSourceClasses(): iterable
         ;
 
         $classes = array_map(
-            static function (SplFileInfo $file): string {
-                return sprintf(
-                    '%s\\%s%s%s',
-                    'Infection',
-                    str_replace(DIRECTORY_SEPARATOR, '\\', $file->getRelativePath()),
-                    $file->getRelativePath() !== '' ? '\\' : '',
-                    $file->getBasename('.' . $file->getExtension()),
-                );
-            },
+            static fn (SplFileInfo $file): string => sprintf(
+                '%s\\%s%s%s',
+                'Infection',
+                str_replace(DIRECTORY_SEPARATOR, '\\', $file->getRelativePath()),
+                $file->getRelativePath() !== '' ? '\\' : '',
+                $file->getBasename('.' . $file->getExtension()),
+            ),
             iterator_to_array($finder, false),
         );
         sort($classes, SORT_STRING);

diff --git a/tests/phpunit/AutoReview/ProjectCode/ProjectCodeTest.php b/tests/phpunit/AutoReview/ProjectCode/ProjectCodeTest.php
@@ -233,18 +233,14 @@ public function test_source_classes_do_not_expose_public_properties(string $clas
         // we're extending from, e.g. we can't change Symfony\Component\Process\Process to not have
         // a public property it has.
         $propertyNames = array_map(
-            static function (ReflectionProperty $reflectionProperty): string {
-                return sprintf(
-                    '%s#%s',
-                    $reflectionProperty->getDeclaringClass()->getName(),
-                    $reflectionProperty->getName(),
-                );
-            },
+            static fn (ReflectionProperty $reflectionProperty): string => sprintf(
+                '%s#%s',
+                $reflectionProperty->getDeclaringClass()->getName(),
+                $reflectionProperty->getName(),
+            ),
             array_filter(
                 $properties,
-                static function (ReflectionProperty $property) use ($className): bool {
-                    return $property->class === $className;
-                },
+                static fn (ReflectionProperty $property): bool => $property->class === $className,
             ),
         );
 

diff --git a/tests/phpunit/AutoReview/SourceTestClassNameScheme.php b/tests/phpunit/AutoReview/SourceTestClassNameScheme.php
@@ -48,7 +48,7 @@ final class SourceTestClassNameScheme
     public static function getSourceClassName(string $testCaseClassName): string
     {
         if (preg_match('/(Infection\\\\Tests\\\\.*)Test$/', $testCaseClassName, $matches) === 1) {
-            return str_replace('Infection\\Tests\\', 'Infection\\', $matches[1]);
+            return str_replace('Infection\\Tests\\', 'Infection\\', (string) $matches[1]);
         }
 
         return $testCaseClassName;

diff --git a/tests/phpunit/Configuration/ConfigurationAssertions.php b/tests/phpunit/Configuration/ConfigurationAssertions.php
@@ -153,9 +153,7 @@ private function assertConfigurationStateIs(
     private static function normalizePaths(array $fileInfos): array
     {
         return array_map(
-            static function (SplFileInfo $fileInfo): string {
-                return $fileInfo->getPathname();
-            },
+            static fn (SplFileInfo $fileInfo): string => $fileInfo->getPathname(),
             $fileInfos,
         );
     }

diff --git a/tests/phpunit/Configuration/ConfigurationFactoryTest.php b/tests/phpunit/Configuration/ConfigurationFactoryTest.php
@@ -764,12 +764,10 @@ public static function valueProvider(): iterable
             ],
             'AssignmentEqual,EqualIdentical',
             false,
-            (static function (): array {
-                return [
-                    'AssignmentEqual' => new AssignmentEqual(),
-                    'EqualIdentical' => new EqualIdentical(),
-                ];
-            })(),
+            (static fn (): array => [
+                'AssignmentEqual' => new AssignmentEqual(),
+                'EqualIdentical' => new EqualIdentical(),
+            ])(),
         );
 
         yield 'with source files' => [
@@ -932,11 +930,9 @@ public static function valueProvider(): iterable
                 '/path/to/config/phpunit-dir',
                 'config/phpunit',
             ),
-            (static function (): array {
-                return [
-                    'TrueValue' => new TrueValue(new TrueValueConfig([])),
-                ];
-            })(),
+            (static fn (): array => [
+                'TrueValue' => new TrueValue(new TrueValueConfig([])),
+            ])(),
             'phpspec',
             'config/bootstrap.php',
             '-d zend_extension=xdebug.so',