Merge pull request #140 from VincentLanglet/bug

Bug

Author: VincentLanglet

SymfonyCustom/Sniffs/Arrays/ArrayDeclarationSniff.php

@@ -391,6 +391,16 @@ public function processMultiLineArray(File $phpcsFile, int $stackPtr, int $start
                 $indexEnd = $phpcsFile->findPrevious(T_WHITESPACE, $nextToken - 1, $start, true);
                 $indexStart = $phpcsFile->findStartOfStatement($indexEnd);
 
+                // Handle multi-lines index.
+                while ($tokens[$indexStart]['line'] !== $tokens[$indexEnd]['line']) {
+                    $indexStart = $phpcsFile->findNext(
+                        Tokens::$emptyTokens,
+                        $indexStart + 1,
+                        $indexEnd + 1,
+                        true
+                    );
+                }
+
                 if ($indexStart === $indexEnd) {
                     $currentEntry['index'] = $indexEnd;
                     $currentEntry['index_content'] = $tokens[$indexEnd]['content'];

SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc

@@ -149,3 +149,15 @@ return [
 ];
 
 [1    =>   2 ,   2=>3,4 => 5];
+
+$array = [
+    'lonnnnnnggggg' => 'good',
+    'short'
+                => 'bad',
+];
+
+$array = [
+    'lonnnnnngggggg' => 'good',
+    $ab .
+    'second' => 'bad',
+];

SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.inc.fixed

@@ -147,3 +147,14 @@ return [
 ];
 
 [1 => 2, 2 => 3, 4 => 5];
+
+$array = [
+    'lonnnnnnggggg' => 'good',
+    'short'         => 'bad',
+];
+
+$array = [
+    'lonnnnnngggggg' => 'good',
+    $ab .
+    'second'         => 'bad',
+];

SymfonyCustom/Tests/Arrays/ArrayDeclarationUnitTest.php

@@ -47,6 +47,8 @@ protected function getErrorList(): array
             142 => 1,
             148 => 1,
             151 => 7,
+            156 => 1,
+            162 => 1,
         ];
     }
 

build.xml

@@ -29,13 +29,10 @@
 
     <target name="phpunit" depends="symlink-cs" description="Run unit tests with PHPUnit">
         <exec executable="${phpunit.bin}" failonerror="true" >
-            <arg value="--verbose"/>
-            <arg value="--filter=SymfonyCustom"/>
-            <arg value="${phpcs.dir}/tests/AllTests.php"/>
+            <arg value="--testsuite=SymfonyCustom"/>
         </exec>
         <exec executable="${phpunit.bin}" failonerror="true" >
-            <arg value="--verbose"/>
-            <arg value="TwigCS"/>
+            <arg value="--testsuite=TwigCS"/>
         </exec>
     </target>
 

phpunit.xml.dist

@@ -10,9 +10,12 @@
          stopOnFailure="false"
          bootstrap="./bootstrap.php"
 >
-    <filter>
-        <whitelist>
-            <directory>./vendor/squizlabs/php_codesniffer/src/Standards/SymfonyCustom</directory>
-        </whitelist>
-    </filter>
+    <testsuites>
+        <testsuite name="SymfonyCustom">
+            <file>./vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php</file>
+        </testsuite>
+        <testsuite name="TwigCS">
+            <directory>./TwigCS</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>