styles: Enable PHP-CS-Fixer array_indentation rule (#1936)

* styles: Enable PHP-CS-Fixer array_indentation rule Related to #1929. This rule required more manual fixing. * manual fix * more fix
infection · Mar 19, 2024 · e4dcc84 · e4dcc84
1 parent 8c9cc85
commit e4dcc84
Show file tree

Hide file tree

Showing 27 changed files with 227 additions and 354 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -80,31 +80,30 @@
         '@PHPUnit75Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        // TODO: enable
-        'array_indentation' => false,
+        'array_indentation' => true,
         'blank_line_before_statement' => false,
-    // TODO: enable back
-//        'blank_line_before_statement' => [
-//            'statements' => [
-//                'break',
-//                'continue',
-//                'declare',
-//                'do',
-//                'for',
-//                'foreach',
-//                'if',
-//                'include',
-//                'include_once',
-//                'require',
-//                'require_once',
-//                'return',
-//                'switch',
-//                'throw',
-//                'try',
-//                'while',
-//                'yield',
-//            ],
-//        ],
+        // TODO: enable back
+        //        'blank_line_before_statement' => [
+        //            'statements' => [
+        //                'break',
+        //                'continue',
+        //                'declare',
+        //                'do',
+        //                'for',
+        //                'foreach',
+        //                'if',
+        //                'include',
+        //                'include_once',
+        //                'require',
+        //                'require_once',
+        //                'return',
+        //                'switch',
+        //                'throw',
+        //                'try',
+        //                'while',
+        //                'yield',
+        //            ],
+        //        ],
         'blank_line_between_import_groups' => false,
         'compact_nullable_typehint' => true,
         'concat_space' => ['spacing' => 'one'],

diff --git a/src/Differ/DiffSourceCodeMatcher.php b/src/Differ/DiffSourceCodeMatcher.php
@@ -44,7 +44,7 @@
 final class DiffSourceCodeMatcher
 {
     private const POSSIBLE_DELIMITERS = [
-            '#', '%', ':', ';', '=', '?', '@', '^', '~',
+        '#', '%', ':', ';', '=', '?', '@', '^', '~',
     ];
 
     public function matches(string $diff, string $sourceCodeRegex): bool

diff --git a/src/Logger/GitHubAnnotationsLogger.php b/src/Logger/GitHubAnnotationsLogger.php
@@ -65,7 +65,7 @@ public function getLogLines(): array
 
 {$escapedExecutionResult->getMutantDiff()}
 TEXT
-            ,
+                ,
             ];
 
             $lines[] = $this->buildAnnotation(

diff --git a/src/Logger/GitLabCodeQualityLogger.php b/src/Logger/GitLabCodeQualityLogger.php
@@ -68,7 +68,7 @@ public function getLogLines(): array
                 'location' => [
                     'path' => Path::makeRelative($escapedExecutionResult->getOriginalFilePath(), $projectRootDirectory),
                     'lines' => [
-                      'begin' => $escapedExecutionResult->getOriginalStartingLine(),
+                        'begin' => $escapedExecutionResult->getOriginalStartingLine(),
                     ],
                 ],
                 'severity' => 'major',

diff --git a/tests/phpunit/AutoReview/IntegrationGroup/IoCodeDetectorTest.php b/tests/phpunit/AutoReview/IntegrationGroup/IoCodeDetectorTest.php
@@ -65,8 +65,7 @@ public static function codeProvider(): iterable
 echo basename('/etc/sudoers.d', '.d');
 PHP
             ,
-            false,  // Cannot detect this one since the call is not fully-qualified and there is no
-                    // use statements - too tricky to detect
+            false,  // Cannot detect this one since the call is not fully-qualified and there is no use statements - too tricky to detect
         ];
 
         yield 'core function - use statement' => [

diff --git a/tests/phpunit/Differ/DiffSourceCodeMatcherTest.php b/tests/phpunit/Differ/DiffSourceCodeMatcherTest.php
@@ -76,8 +76,7 @@ public static function diffRegexProvider(): Generator
          return 'string';
      }
  }
-DIFF
-            ,
+DIFF,
             true,
         ];
 
@@ -95,8 +94,7 @@ public function hello() : string
          return 'hello';
      }
      public function getString()
-DIFF
-            ,
+DIFF,
             true,
         ];
 
@@ -114,8 +112,7 @@ class SourceClass
      {
          Assert::numeric('1');
          $this->getString();
-DIFF
-            ,
+DIFF,
             false,
         ];
 
@@ -133,8 +130,7 @@ public function hello() : string
          return 'hello';
      }
      public function getString()
-DIFF
-            ,
+DIFF,
             true,
         ];
 
@@ -152,8 +148,7 @@ public function hello() : string
          $this->getString();
          return 'hello';
      }
-DIFF
-            ,
+DIFF,
             true,
         ];
 
@@ -165,8 +160,7 @@ public function hello() : string
 @@ @@
 
 + $a - 2 + $this->getString();
-DIFF
-            ,
+DIFF,
             false,
         ];
 
@@ -179,23 +173,21 @@ public function hello() : string
 
 - $a - 2 + $this->getString() / 2; # comment
 + $a - 2 + $this->getString(); # comment
-DIFF
-            ,
-                true,
+DIFF,
+            true,
         ];
 
         yield 'Regex containing less common delimiters should not lead to syntax error' => [
             '.*%.*',
-                <<<'DIFF'
+            <<<'DIFF'
 --- Original
 +++ New
 @@ @@
 
 - $a % 2;
 + $a % 3;
-DIFF
-                ,
-                true,
+DIFF,
+            true,
         ];
     }
 }
diff --git a/tests/phpunit/Event/Subscriber/InitialTestsConsoleLoggerSubscriberTest.php b/tests/phpunit/Event/Subscriber/InitialTestsConsoleLoggerSubscriberTest.php
@@ -69,12 +69,12 @@ public function test_it_sets_test_framework_version_as_unknown_in_case_of_except
         $output->expects($this->once())
             ->method('writeln')
             ->with([
-            '',
-            'Running initial test suite...',
-            '',
-            'PHPUnit version: unknown',
-            '',
-        ]);
+                '',
+                'Running initial test suite...',
+                '',
+                'PHPUnit version: unknown',
+                '',
+            ]);
         $output->method('getVerbosity')
             ->willReturn(OutputInterface::VERBOSITY_QUIET);
 

diff --git a/tests/phpunit/Logger/GitLabCodeQualityLoggerTest.php b/tests/phpunit/Logger/GitLabCodeQualityLoggerTest.php
@@ -85,7 +85,7 @@ public static function metricsProvider(): iterable
                     'location' => [
                         'path' => 'foo/bar',
                         'lines' => [
-                          'begin' => 9,
+                            'begin' => 9,
                         ],
                     ],
                     'severity' => 'major',
@@ -100,7 +100,7 @@ public static function metricsProvider(): iterable
                     'location' => [
                         'path' => 'foo/bar',
                         'lines' => [
-                          'begin' => 10,
+                            'begin' => 10,
                         ],
                     ],
                     'severity' => 'major',
@@ -121,7 +121,7 @@ public static function metricsProvider(): iterable
                     'location' => [
                         'path' => 'foo/bar',
                         'lines' => [
-                          'begin' => 10,
+                            'begin' => 10,
                         ],
                     ],
                     'severity' => 'major',

diff --git a/tests/phpunit/Metrics/TargetDetectionStatusesProviderTest.php b/tests/phpunit/Metrics/TargetDetectionStatusesProviderTest.php
@@ -100,7 +100,8 @@ public function test_it_ignores_some_statuses_when_debugging_is_not_enabled_for_
 
         $provider = new TargetDetectionStatusesProvider($logs, LogVerbosity::NORMAL, false, false);
 
-        $this->assertProvidesExcluding([
+        $this->assertProvidesExcluding(
+            [
                 DetectionStatus::KILLED,
                 DetectionStatus::ERROR,
             ],
@@ -119,7 +120,8 @@ public function test_it_ignores_more_statuses_when_running_in_only_covered_mode_
 
         $provider = new TargetDetectionStatusesProvider($logs, LogVerbosity::NORMAL, true, false);
 
-        $this->assertProvidesExcluding([
+        $this->assertProvidesExcluding(
+            [
                 DetectionStatus::KILLED,
                 DetectionStatus::ERROR,
                 DetectionStatus::NOT_COVERED,

diff --git a/tests/phpunit/Mutator/Arithmetic/DivisionTest.php b/tests/phpunit/Mutator/Arithmetic/DivisionTest.php
@@ -52,21 +52,20 @@ public function test_it_can_mutate(string $input, $expected = []): void
     public static function mutationsProvider(): iterable
     {
         yield 'It changes regular divison' => [
-                <<<'PHP'
+            <<<'PHP'
 <?php
 
 $a = 10 / 2;
-PHP
-                ,
-                <<<'PHP'
+PHP,
+            <<<'PHP'
 <?php
 
 $a = 10 * 2;
 PHP,
         ];
 
         yield 'It does not change division equals' => [
-                <<<'PHP'
+            <<<'PHP'
 <?php
 
 $a = 10;

diff --git a/tests/phpunit/Mutator/Arithmetic/MultiplicationTest.php b/tests/phpunit/Mutator/Arithmetic/MultiplicationTest.php
@@ -52,21 +52,20 @@ public function test_it_can_mutate(string $input, $expected = []): void
     public static function mutationsProvider(): iterable
     {
         yield 'It mutates normal multiplication' => [
-                <<<'PHP'
+            <<<'PHP'
 <?php
 
 $a = 10 * 3;
-PHP
-                ,
-                <<<'PHP'
+PHP,
+            <<<'PHP'
 <?php
 
 $a = 10 / 3;
 PHP,
         ];
 
         yield 'It does not mutate multiplication equals' => [
-                <<<'PHP'
+            <<<'PHP'
 <?php
 
 $a = 1;