Added more guard code for syntax errors to various sniffs (ref #580)

Author: gsherwood

CodeSniffer/Standards/AbstractPatternSniff.php

@@ -440,6 +440,10 @@ protected function processPattern(
         $patternLen        = count($pattern);
 
         for ($i = $patternInfo['listen_pos']; $i < $patternLen; $i++) {
+            if (isset($tokens[$stackPtr]) === false) {
+                break;
+            }
+
             if ($pattern[$i]['type'] === 'token') {
                 if ($pattern[$i]['token'] === T_WHITESPACE) {
                     if ($this->ignoreComments === true) {
@@ -452,7 +456,9 @@ protected function processPattern(
                         // If the next token is a comment, the we need to skip the
                         // current token as we should allow a space before a
                         // comment for readability.
-                        if (isset(PHP_CodeSniffer_Tokens::$commentTokens[$tokens[($stackPtr + 1)]['code']]) === true) {
+                        if (isset($tokens[($stackPtr + 1)]) === true
+                            && isset(PHP_CodeSniffer_Tokens::$commentTokens[$tokens[($stackPtr + 1)]['code']]) === true
+                        ) {
                             continue;
                         }
                     }

CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php

@@ -74,6 +74,10 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
+        if (isset($tokens[$stackPtr]['parenthesis_opener']) === false) {
+            return;
+        }
+
         $openBracket    = $tokens[$stackPtr]['parenthesis_opener'];
         $closeBracket   = $tokens[$stackPtr]['parenthesis_closer'];
         $spaceAfterOpen = 0;

CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php

@@ -72,6 +72,10 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
+        if (isset($tokens[($stackPtr + 1)]) === false) {
+            return;
+        }
+
         // Single space after the keyword.
         $found = 1;
         if ($tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
@@ -202,6 +206,10 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
         // Only want to check multi-keyword structures from here on.
         if ($tokens[$stackPtr]['code'] === T_DO) {
+            if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+                return;
+            }
+
             $closer = $tokens[$stackPtr]['scope_closer'];
         } else if ($tokens[$stackPtr]['code'] === T_ELSE
             || $tokens[$stackPtr]['code'] === T_ELSEIF

CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php

@@ -74,6 +74,12 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
 
         $openingBracket = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr);
+        if ($openingBracket === false) {
+            $error = 'Possible parse error: FOREACH has no opening parenthesis';
+            $phpcsFile->addWarning($error, $stackPtr, 'MissingParenthesis');
+            return;
+        }
+
         $closingBracket = $tokens[$openingBracket]['parenthesis_closer'];
 
         if ($this->requiredSpacesAfterOpen === 0 && $tokens[($openingBracket + 1)]['code'] === T_WHITESPACE) {

CodeSniffer/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php

@@ -152,9 +152,17 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
                 $start = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($i + 1), null, true);
             } else {
+                if (isset($tokens[$stackPtr]['parenthesis_opener']) === false) {
+                    return;
+                }
+
                 $start = $tokens[$end]['parenthesis_opener'];
             }//end if
         } else {
+            if (isset($tokens[$stackPtr]['parenthesis_opener']) === false) {
+                return;
+            }
+
             $start = $tokens[$stackPtr]['parenthesis_opener'];
             $end   = $tokens[$stackPtr]['parenthesis_closer'];
         }//end if

package.xml

@@ -30,6 +30,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Klaus Purer for the patch
   - Defined tokens for lower PHP versions are now phpcs-specific string instead of ints
     -- Stops conflict with other projects, like PHP_CodeCoverage
+  - Added more guard code for syntax errors to various sniffs
   - Fixed bug #584 : Squiz.Arrays.ArrayDeclaration sniff gives incorrect NoComma error for multiline string values
  </notes>
  <contents>