Feat: Add ArrayIndentationFixer (part of #94)

lmc-eu · May 6, 2024 · f8d2e2d · f8d2e2d
1 parent 2861158
commit f8d2e2d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/ecs.php b/ecs.php
@@ -134,6 +134,7 @@
 use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer;
 use PhpCsFixer\Fixer\Strict\StrictParamFixer;
 use PhpCsFixer\Fixer\StringNotation\SingleQuoteFixer;
+use PhpCsFixer\Fixer\Whitespace\ArrayIndentationFixer;
 use PhpCsFixer\Fixer\Whitespace\BlankLineBeforeStatementFixer;
 use PhpCsFixer\Fixer\Whitespace\CompactNullableTypeDeclarationFixer;
 use PhpCsFixer\Fixer\Whitespace\HeredocIndentationFixer;
@@ -382,6 +383,8 @@
             StrictParamFixer::class,
             // Convert double quotes to single quotes for simple strings
             SingleQuoteFixer::class,
+            // Each element of an array must be indented exactly once.
+            ArrayIndentationFixer::class,
             // Remove extra spaces in a nullable typehint
             CompactNullableTypeDeclarationFixer::class,
             // Heredoc/nowdoc content must be properly indented.

diff --git a/tests/Integration/Fixtures/Basic.correct.php.inc b/tests/Integration/Fixtures/Basic.correct.php.inc
@@ -64,12 +64,18 @@ class Basic
         $singleLineArray = ['foo', 'bar', 'baz'];
         $singleLineArray2 = [1, 2, 3];
 
-        $multiLineAssociative = [
+        $multiLineAssociative1 = [
             'foo' => 'bar',
             'baz' => 'bat',
         ];
 
         $multiLineAssociative2 = [
+            'foo' => 'bar',
+            'baz' => 'bat',
+            'bak' => 'baz',
+        ];
+
+        $multiLineAssociative3 = [
             'firstKey' => 'bar',
             'thisIsSecondKey' => 'bat',
             'third' => 'bat',

diff --git a/tests/Integration/Fixtures/Basic.wrong.php.inc b/tests/Integration/Fixtures/Basic.wrong.php.inc
@@ -61,12 +61,17 @@ class Basic
         $singleLineArray = ['foo', 'bar', 'baz',];
         $singleLineArray2 = [1,2,3];
 
-        $multiLineAssociative = [
-            'foo'=>'bar',
-            'baz'=>'bat'
+        $multiLineAssociative1 = [
+            'foo' => 'bar', 'baz' => 'bat',
         ];
 
         $multiLineAssociative2 = [
+            'foo'=>'bar',
+                'baz'=>'bat',
+        'bak'=>'baz'
+        ];
+
+        $multiLineAssociative3 = [
             'firstKey'        => 'bar',
             'thisIsSecondKey' => 'bat',
             'third'           => 'bat',