Merge pull request #34 from PHPCSStandards/feature/universal-mixedkey…

…edunkeyedarray-add-extra-unit-test Universal/MixedKeyedUnkeyedArray: improve defensive coding
PHPCSStandards · Feb 18, 2020 · d931865 · d931865
2 parents 42d0b67 + 7e52d2f
commit d931865
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Universal/Sniffs/Arrays/MixedKeyedUnkeyedArraySniff.php b/Universal/Sniffs/Arrays/MixedKeyedUnkeyedArraySniff.php
@@ -112,8 +112,8 @@ public function processKey(File $phpcsFile, $startPtr, $endPtr, $itemNr)
     public function processNoKey(File $phpcsFile, $startPtr, $itemNr)
     {
         $firstNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $startPtr, null, true);
-        if ($firstNonEmpty === false) {
-            // Shouldn't be possible.
+        if ($firstNonEmpty === false || $this->tokens[$firstNonEmpty]['code'] === \T_COMMA) {
+            // Shouldn't really be possible, but this must be a parse error (empty array item).
             return;
         }
 

diff --git a/Universal/Tests/Arrays/MixedKeyedUnkeyedArrayUnitTest.inc b/Universal/Tests/Arrays/MixedKeyedUnkeyedArrayUnitTest.inc
@@ -18,3 +18,9 @@ $array = [
     'string' => 'string key',
     'value',
 ];
+
+// Test handling of empty array item.
+$array = [
+    'value', /*comment*/,
+    'another value',
+];