Dev cleanup

.dev-tools/composer.json

@@ -51,7 +51,7 @@
             "phpcbf || exit 0"
         ],
         "infection": [
-            "infection run --min-msi=100 --logger-github --no-progress --threads=16"
+            "infection run --logger-github --no-progress --threads=16"
         ]
     }
 }

.dev-tools/infection.json

@@ -17,6 +17,7 @@
         "configDir": "..",
         "customPath": "../vendor/phpunit/phpunit/phpunit"
     },
+    "minCoveredMsi": 100,
     "mutators": {
         "ArrayAll": true,
         "ArrayAny": true,

.dev-tools/src/InfectionConfigBuilder.php

@@ -52,6 +52,7 @@ public function build(): array
                 'configDir' => '..',
                 'customPath' => '../vendor/phpunit/phpunit/phpunit',
             ],
+            'minCoveredMsi' => 100,
             'mutators' => [],
         ];
 

.dev-tools/src/Readme/ReadmeCommand.php

@@ -269,7 +269,7 @@ private function diff(string $from, string $to): string
 
     private function createSplFileInfoDouble(): \SplFileInfo
     {
-        return new class (\getcwd() . '/file.php') extends \SplFileInfo {
+        return new class (\getcwd() . \DIRECTORY_SEPARATOR . 'file.php') extends \SplFileInfo {
             public function __construct(string $filename)
             {
                 parent::__construct($filename);

.php-cs-fixer.php

@@ -59,6 +59,7 @@
 $rules['trailing_comma_in_multiline'] = ['after_heredoc' => true, 'elements' => ['arguments', 'arrays']]; // TODO: remove when dropping support to PHP <8.0
 
 $rules[PhpdocOnlyAllowedAnnotationsFixer::name()]['elements'][] = 'phpstan-type';
+$rules[PhpdocOnlyAllowedAnnotationsFixer::name()]['elements'][] = 'codeCoverageIgnore';
 
 foreach (new PhpCsFixerCustomFixersDev\Fixers() as $fixer) {
     $rules[$fixer->getName()] = true;

tests/Fixer/AbstractFixerTestCase.php

@@ -157,14 +157,19 @@ final protected static function getFixer(): FixerInterface
     }
 
     /**
-     * @param null|array<string, mixed> $configuration
+     * @param array<string, mixed> $configuration
      */
-    final protected function doTest(string $expected, ?string $input = null, ?array $configuration = null): void
+    final protected function doTest(string $expected, ?string $input = null, array $configuration = [], ?WhitespacesFixerConfig $whitespacesFixerConfig = null): void
     {
         $fixer = self::getFixer();
 
         if ($fixer instanceof ConfigurableFixerInterface) {
-            $fixer->configure($configuration ?? []);
+            $fixer->configure($configuration);
+        }
+
+        if ($whitespacesFixerConfig instanceof WhitespacesFixerConfig) {
+            self::assertInstanceOf(WhitespacesAwareFixerInterface::class, $fixer);
+            $fixer->setWhitespacesConfig($whitespacesFixerConfig);
         }
 
         if ($expected === $input) {
@@ -250,7 +255,7 @@ final protected function assertSuccessorName(string $successorName): void
 
     private function createSplFileInfoDouble(): \SplFileInfo
     {
-        return new class (\getcwd() . '/src/file.php') extends \SplFileInfo {
+        return new class (\getcwd() . \DIRECTORY_SEPARATOR . 'src' . \DIRECTORY_SEPARATOR . 'FixerFile.php') extends \SplFileInfo {
             public function __construct(string $filename)
             {
                 parent::__construct($filename);

tests/Fixer/CommentedOutFunctionFixerTest.php

@@ -31,11 +31,11 @@ public function testIsRisky(): void
     }
 
     /**
-     * @param null|array<string, list<string>> $configuration
+     * @param array<string, list<string>> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->doTest($expected, $input, $configuration);
     }

tests/Fixer/DataProviderNameFixerTest.php

@@ -40,11 +40,11 @@ public function testSuccessorName(): void
     }
 
     /**
-     * @param null|array<string, string> $configuration
+     * @param array<string, string> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->doTest($expected, $input, $configuration);
     }

tests/Fixer/DataProviderStaticFixerTest.php

@@ -36,11 +36,11 @@ public function testConfiguration(): void
     }
 
     /**
-     * @param null|array<string, bool> $configuration
+     * @param array<string, bool> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->doTest($expected, $input, $configuration);
     }

tests/Fixer/NoDuplicatedArrayKeyFixerTest.php

@@ -31,11 +31,11 @@ public function testConfiguration(): void
     }
 
     /**
-     * @param null|array<string, bool> $configuration
+     * @param array<string, bool> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->doTest($expected, $input, $configuration);
     }

tests/Fixer/NoSuperfluousConcatenationFixerTest.php

@@ -31,11 +31,11 @@ public function testConfiguration(): void
     }
 
     /**
-     * @param null|array<string, bool> $configuration
+     * @param array<string, bool> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testStringIsTheSame(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testStringIsTheSame(string $expected, ?string $input = null, array $configuration = []): void
     {
         if ($input === null) {
             $this->expectNotToPerformAssertions();
@@ -48,11 +48,11 @@ public function testStringIsTheSame(string $expected, ?string $input = null, ?ar
     }
 
     /**
-     * @param null|array<string, bool> $configuration
+     * @param array<string, bool> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->doTest(
             '<?php ' . $expected . ';',

tests/Fixer/NumericLiteralSeparatorFixerTest.php

@@ -71,11 +71,11 @@ public function testReversingCodeSample(): void
     }
 
     /**
-     * @param null|array<string, null|bool> $configuration
+     * @param array<string, null|bool> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->doTest(
             $expected,

tests/Fixer/PhpdocOnlyAllowedAnnotationsFixerTest.php

@@ -31,11 +31,11 @@ public function testIsRisky(): void
     }
 
     /**
-     * @param null|array<string, list<string>> $configuration
+     * @param array<string, list<string>> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->doTest($expected, $input, $configuration);
     }

tests/Fixer/PromotedConstructorPropertyFixerTest.php

@@ -33,11 +33,11 @@ public function testIsRisky(): void
     }
 
     /**
-     * @param null|array<string, list<string>> $configuration
+     * @param array<string, list<string>> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->doTest($expected, $input, $configuration);
     }

tests/Fixer/SingleSpaceAfterStatementFixerTest.php

@@ -113,11 +113,11 @@ public function testIsRisky(): void
     }
 
     /**
-     * @param null|array<string, bool> $configuration
+     * @param array<string, bool> $configuration
      *
      * @dataProvider provideFixCases
      */
-    public function testFix(string $expected, ?string $input = null, ?array $configuration = null): void
+    public function testFix(string $expected, ?string $input = null, array $configuration = []): void
     {
         $this->doTest($expected, $input, $configuration);
     }