🐛 Fix bug for array

Author: VincentLanglet

SymfonyCustom/Sniffs/Arrays/ArrayDeclarationSniff.php

@@ -651,11 +651,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
                 );
 
                 if ($fix) {
-                    if (0 === $found) {
-                        $phpcsFile->fixer->addContent($index['index'] - 1, str_repeat(' ', $expected));
-                    } else {
-                        $phpcsFile->fixer->replaceToken($index['index'] - 1, str_repeat(' ', $expected));
-                    }
+                    $this->align($phpcsFile, $index['index'], $expected, $found);
                 }
 
                 continue;
@@ -679,20 +675,7 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
                 );
 
                 if ($fix) {
-                    if ('newline' === $found) {
-                        $prev = $phpcsFile->findPrevious(T_WHITESPACE, $index['value'] - 1, null, true);
-                        $phpcsFile->fixer->beginChangeset();
-                        for ($i = $prev + 1; $i < $index['value']; $i++) {
-                            $phpcsFile->fixer->replaceToken($i, '');
-                        }
-
-                        $phpcsFile->fixer->replaceToken($index['value'] - 1, str_repeat(' ', $expected));
-                        $phpcsFile->fixer->endChangeset();
-                    } elseif (0 === $found) {
-                        $phpcsFile->fixer->addContent($index['arrow'] - 1, str_repeat(' ', $expected));
-                    } else {
-                        $phpcsFile->fixer->replaceToken($index['arrow'] - 1, str_repeat(' ', $expected));
-                    }
+                    $this->align($phpcsFile, $index['arrow'], $expected, $found);
                 }
 
                 continue;
@@ -709,28 +692,40 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
 
                 $fix = $phpcsFile->addFixableError(
                     'Array value not aligned correctly; expected %s space(s) but found %s',
-                    $index['arrow'],
+                    $index['value'],
                     'ValueNotAligned',
                     [$expected, $found]
                 );
 
                 if ($fix) {
-                    if ('newline' === $found) {
-                        $prev = $phpcsFile->findPrevious(T_WHITESPACE, $index['value'] - 1, null, true);
-                        $phpcsFile->fixer->beginChangeset();
-                        for ($i = $prev + 1; $i < $index['value']; $i++) {
-                            $phpcsFile->fixer->replaceToken($i, '');
-                        }
-
-                        $phpcsFile->fixer->replaceToken($index['value'] - 1, str_repeat(' ', $expected));
-                        $phpcsFile->fixer->endChangeset();
-                    } elseif (0 === $found) {
-                        $phpcsFile->fixer->addContent($index['value'] - 1, str_repeat(' ', $expected));
-                    } else {
-                        $phpcsFile->fixer->replaceToken($index['value'] - 1, str_repeat(' ', $expected));
-                    }
+                    $this->align($phpcsFile, $index['value'], $expected, $found);
                 }
             }
         }
     }
+
+    /**
+     * @param File       $phpcsFile
+     * @param int        $elementIndex
+     * @param int        $expected
+     * @param int|string $found
+     */
+    private function align(File $phpcsFile, int $elementIndex, int $expected, $found): void
+    {
+        if ('newline' === $found) {
+            $phpcsFile->fixer->beginChangeset();
+
+            $prev = $phpcsFile->findPrevious(T_WHITESPACE, $elementIndex - 1, null, true);
+            for ($i = $prev + 1; $i < $elementIndex; $i++) {
+                $phpcsFile->fixer->replaceToken($i, '');
+            }
+
+            $phpcsFile->fixer->replaceToken($elementIndex - 1, str_repeat(' ', $expected));
+            $phpcsFile->fixer->endChangeset();
+        } elseif (0 === $found) {
+            $phpcsFile->fixer->addContent($elementIndex - 1, str_repeat(' ', $expected));
+        } else {
+            $phpcsFile->fixer->replaceToken($elementIndex - 1, str_repeat(' ', $expected));
+        }
+    }
 }

SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc

@@ -135,3 +135,15 @@ return [
     DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class          => ['test' => true],
     Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
 ];
+
+[
+    0 => 1,
+    1
+    => 2,
+];
+
+[
+    0 => 1,
+    1 =>
+    2,
+];

SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc.fixed

@@ -135,3 +135,13 @@ return [
     DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class          => ['test' => true],
     Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
 ];
+
+[
+    0 => 1,
+    1 => 2,
+];
+
+[
+    0 => 1,
+    1 => 2,
+];

SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.php

@@ -51,6 +51,8 @@ protected function getErrorList(): array
             100 => 3,
             102 => 4,
             107 => 2,
+            142 => 1,
+            148 => 1,
         ];
     }