Fixed bug #1221 : Indented function call with multiple closure arguments can cause scope indent error

Author: gsherwood

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

@@ -236,9 +236,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 && $tokens[$checkToken]['code'] === T_CLOSE_PARENTHESIS
                 && isset($tokens[$checkToken]['parenthesis_opener']) === true)
                 || ($tokens[$i]['code'] === T_CLOSE_PARENTHESIS
-                && isset($tokens[$i]['parenthesis_opener']) === true
-                && isset($tokens[$i]['parenthesis_owner']) === true
-                && $tokens[$tokens[$i]['parenthesis_owner']]['code'] === T_ARRAY)
+                && isset($tokens[$i]['parenthesis_opener']) === true)
             ) {
                 if ($checkToken !== null) {
                     $parenCloser = $checkToken;

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

@@ -1135,6 +1135,13 @@ $foo = [
         },
 ];
 
+$foo
+    ->bar(foo(function () {
+    }), foo(function () {
+    }));
+
+echo 'foo';
+
 class Test {
 
     public function a() {

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

@@ -1135,6 +1135,13 @@ $foo = [
         },
 ];
 
+$foo
+    ->bar(foo(function () {
+    }), foo(function () {
+    }));
+
+echo 'foo';
+
 class Test {
 
     public function a() {

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

@@ -1135,6 +1135,13 @@ $foo = [
 		},
 ];
 
+$foo
+	->bar(foo(function () {
+	}), foo(function () {
+	}));
+
+echo 'foo';
+
 class Test {
 
 	public function a() {

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

@@ -1135,6 +1135,13 @@ $foo = [
 		},
 ];
 
+$foo
+	->bar(foo(function () {
+	}), foo(function () {
+	}));
+
+echo 'foo';
+
 class Test {
 
 	public function a() {

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

@@ -154,11 +154,11 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
                 823  => 1,
                 858  => 1,
                 879  => 1,
-                1156 => 1,
-                1164 => 1,
-                1169 => 1,
+                1163 => 1,
                 1171 => 1,
-                1174 => 1,
+                1176 => 1,
+                1178 => 1,
+                1181 => 1,
                );
 
     }//end getErrorList()

package.xml

@@ -54,6 +54,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #1191 : Javascript sniffer fails with function called "Function"
   - Fixed bug #1203 : Inconsistent behavior of PHP_CodeSniffer_File::findEndOfStatement
   - Fixed bug #1218 : CASE conditions using class constants named NAMESPACE/INTERFACE/TRAIT etc are incorrectly tokenized
+  - Fixed bug #1221 : Indented function call with multiple closure arguments can cause scope indent error
  </notes>
  <contents>
   <dir name="/">