Fixed bug #554 : ScopeIndentSniff causes errors when encountering an unmatched parenthesis

Author: gsherwood

CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php

@@ -217,6 +217,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             // the same level as where they were opened (but can be more).
             if ($checkToken !== null
                 && $tokens[$checkToken]['code'] === T_CLOSE_PARENTHESIS
+                && isset($tokens[$checkToken]['parenthesis_opener']) === true
             ) {
                 if ($this->_debug === true) {
                     $line = $tokens[$i]['line'];

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc

@@ -857,4 +857,9 @@ try {
         return false;
     }
 
+/*
+$a = array(
+    */
+);
+
 echo ""

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed

@@ -857,4 +857,9 @@ function foo()
     return false;
 }
 
+/*
+$a = array(
+    */
+);
+
 echo ""

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc

@@ -857,4 +857,9 @@ try {
 		return false;
 	}
 
+/*
+$a = array(
+	*/
+);
+
 echo ""

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed

@@ -857,4 +857,9 @@ function foo()
 	return false;
 }
 
+/*
+$a = array(
+	*/
+);
+
 echo ""

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php

@@ -141,6 +141,9 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
                 823 => 1,
                 848 => 1,
                 860 => 1,
+                861 => 1,
+                863 => 1,
+                865 => 1,
                );
 
     }//end getErrorList()

package.xml

@@ -46,6 +46,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #523 : Generic ScopeIndent errors for IF in FINALLY
   - Fixed bug #527 : Closure inside IF statement is not tokenized correctly
   - Fixed bug #551 : Multiple catch blocks not checked in Squiz.ControlStructures.ControlSignature sniff
+  - Fixed bug #554 : ScopeIndentSniff causes errors when encountering an unmatched parenthesis
  </notes>
  <contents>
   <dir name="/">