| @@ 434-464 (lines=31) @@ | ||
| 431 | return; |
|
| 432 | } |
|
| 433 | ||
| 434 | if ($keyUsed === false) { |
|
| 435 | if ($tokens[($nextToken - 1)]['code'] === T_WHITESPACE) { |
|
| 436 | $content = $tokens[($nextToken - 2)]['content']; |
|
| 437 | if ($tokens[($nextToken - 1)]['content'] === $phpcsFile->eolChar) { |
|
| 438 | $spaceLength = 'newline'; |
|
| 439 | } else { |
|
| 440 | $spaceLength = $tokens[($nextToken - 1)]['length']; |
|
| 441 | } |
|
| 442 | ||
| 443 | $error = 'Expected 0 spaces between "%s" and comma; %s found'; |
|
| 444 | $data = array( |
|
| 445 | $content, |
|
| 446 | $spaceLength, |
|
| 447 | ); |
|
| 448 | ||
| 449 | $fix = $phpcsFile->addFixableError($error, $nextToken, 'SpaceBeforeComma', $data); |
|
| 450 | if ($fix === true) { |
|
| 451 | $phpcsFile->fixer->replaceToken(($nextToken - 1), ''); |
|
| 452 | } |
|
| 453 | } |
|
| 454 | ||
| 455 | $valueContent = $phpcsFile->findNext( |
|
| 456 | PHP_CodeSniffer_Tokens::$emptyTokens, |
|
| 457 | ($lastToken + 1), |
|
| 458 | $nextToken, |
|
| 459 | true |
|
| 460 | ); |
|
| 461 | ||
| 462 | $indices[] = array('value' => $valueContent); |
|
| 463 | $singleUsed = true; |
|
| 464 | }//end if |
|
| 465 | ||
| 466 | $lastToken = $nextToken; |
|
| 467 | continue; |
|
| @@ 236-266 (lines=31) @@ | ||
| 233 | continue; |
|
| 234 | } |
|
| 235 | ||
| 236 | if ( false === $keyUsed ) { |
|
| 237 | if ( T_WHITESPACE === $tokens[ ( $nextToken - 1 ) ]['code'] ) { |
|
| 238 | $content = $tokens[ ( $nextToken - 2 ) ]['content']; |
|
| 239 | if ( $tokens[ ( $nextToken - 1 ) ]['content'] === $phpcsFile->eolChar ) { |
|
| 240 | $spaceLength = 'newline'; |
|
| 241 | } else { |
|
| 242 | $spaceLength = $tokens[ ( $nextToken - 1 ) ]['length']; |
|
| 243 | } |
|
| 244 | ||
| 245 | $error = 'Expected 0 spaces between "%s" and comma; %s found'; |
|
| 246 | $data = array( |
|
| 247 | $content, |
|
| 248 | $spaceLength, |
|
| 249 | ); |
|
| 250 | ||
| 251 | $fix = $phpcsFile->addFixableError( $error, $nextToken, 'SpaceBeforeComma', $data ); |
|
| 252 | if ( true === $fix ) { |
|
| 253 | $phpcsFile->fixer->replaceToken( ( $nextToken - 1 ), '' ); |
|
| 254 | } |
|
| 255 | } |
|
| 256 | ||
| 257 | $valueContent = $phpcsFile->findNext( |
|
| 258 | PHP_CodeSniffer_Tokens::$emptyTokens, |
|
| 259 | ( $lastToken + 1 ), |
|
| 260 | $nextToken, |
|
| 261 | true |
|
| 262 | ); |
|
| 263 | ||
| 264 | $indices[] = array( 'value' => $valueContent ); |
|
| 265 | $singleUsed = true; |
|
| 266 | } // end if |
|
| 267 | ||
| 268 | $lastToken = $nextToken; |
|
| 269 | continue; |
|