Merge branch 'issues/3065' of https://github.com/morozov/php-code-sniffer

Author: gsherwood

src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php

@@ -450,9 +450,14 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                             $error = 'Expected 0 spaces before comma; %s found';
                             $data  = [$spaceLength];
 
-                            $fix = $phpcsFile->addFixableError($error, $nextToken, 'SpaceBeforeComma', $data);
-                            if ($fix === true) {
-                                $phpcsFile->fixer->replaceToken(($nextToken - 1), '');
+                            // The error is only fixable if there is only whitespace between the tokens.
+                            if ($prev === $phpcsFile->findPrevious(T_WHITESPACE, ($nextToken - 1), null, true)) {
+                                $fix = $phpcsFile->addFixableError($error, $nextToken, 'SpaceBeforeComma', $data);
+                                if ($fix === true) {
+                                    $phpcsFile->fixer->replaceToken(($nextToken - 1), '');
+                                }
+                            } else {
+                                $phpcsFile->addError($error, $nextToken, 'SpaceBeforeComma', $data);
                             }
                         }
                     }//end if

src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc

@@ -460,6 +460,13 @@ array()
  (unset) array(),
 );
 
+array(
+ 'foo',
+ 'bar'
+ // This is a non-fixable error.
+ ,
+);
+
 // Intentional syntax error.
 $a = array(
       'a' =>

src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc.fixed

@@ -496,6 +496,13 @@ array()
  (unset) array(),
 );
 
+array(
+ 'foo',
+ 'bar'
+ // This is a non-fixable error.
+ ,
+);
+
 // Intentional syntax error.
 $a = array(
       'a' =>

src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc

@@ -449,6 +449,13 @@ $c];
  (unset) [],
 ];
 
+[
+ 'foo',
+ 'bar'
+ // This is a non-fixable error.
+ ,
+];
+
 // Intentional syntax error.
 $a = [
       'a' =>

src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed

@@ -483,6 +483,13 @@ $foo = [
  (unset) [],
 ];
 
+[
+ 'foo',
+ 'bar'
+ // This is a non-fixable error.
+ ,
+];
+
 // Intentional syntax error.
 $a = [
       'a' =>

src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php

@@ -121,6 +121,7 @@ public function getErrorList($testFile='')
                 445 => 2,
                 447 => 2,
                 448 => 3,
+                467 => 1,
             ];
         case 'ArrayDeclarationUnitTest.2.inc':
             return [
@@ -204,6 +205,7 @@ public function getErrorList($testFile='')
                 434 => 2,
                 436 => 2,
                 437 => 3,
+                456 => 1,
             ];
         default:
             return [];