Fixed bug #945 : Incorrect indent behavior using deep-nested function…

… and arrays
squizlabs · May 31, 2016 · d38b2f5 · d38b2f5
1 parent 59cfbc2
commit d38b2f5
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 5 deletions.
diff --git a/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php b/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
@@ -253,6 +253,18 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
                 $parenOpener = $tokens[$parenCloser]['parenthesis_opener'];
                 if ($tokens[$parenCloser]['line'] !== $tokens[$parenOpener]['line']) {
+                    if (isset($tokens[$parenCloser]['nested_parenthesis']) === true
+                        && empty($tokens[$parenCloser]['nested_parenthesis']) === false
+                    ) {
+                        end($tokens[$parenCloser]['nested_parenthesis']);
+                        $parenOpener = key($tokens[$parenCloser]['nested_parenthesis']);
+                        if ($this->_debug === true) {
+                            $line = $tokens[$parens]['line'];
+                            echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+                            echo "\t* using parenthesis *".PHP_EOL;
+                        }
+                    }
+
                     $first       = $phpcsFile->findFirstOnLine(T_WHITESPACE, $parenOpener, true);
                     $checkIndent = ($tokens[$first]['column'] - 1);
                     if (isset($adjustments[$first]) === true) {

diff --git a/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc b/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc
@@ -1053,6 +1053,15 @@ class SomeClass
     }
 }
 
+$params = self::validate_parameters(self::read_competency_framework_parameters(),
+                                    array(
+                                        'id' => $id,
+                                    ));
+
+$framework = api::read_framework($params['id']);
+self::validate_context($framework->get_context());
+$output = $PAGE->get_renderer('tool_lp');
+
     function foo()
     {
         $foo = array(

diff --git a/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed b/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed
@@ -1053,6 +1053,15 @@ class SomeClass
     }
 }
 
+$params = self::validate_parameters(self::read_competency_framework_parameters(),
+                                    array(
+                                        'id' => $id,
+                                    ));
+
+$framework = api::read_framework($params['id']);
+self::validate_context($framework->get_context());
+$output = $PAGE->get_renderer('tool_lp');
+
 function foo()
 {
     $foo = array(

diff --git a/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc b/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc
@@ -1053,6 +1053,15 @@ class SomeClass
 	}
 }
 
+$params = self::validate_parameters(self::read_competency_framework_parameters(),
+									array(
+										'id' => $id,
+									));
+
+$framework = api::read_framework($params['id']);
+self::validate_context($framework->get_context());
+$output = $PAGE->get_renderer('tool_lp');
+
 	function foo()
 	{
 		$foo = array(

diff --git a/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed b/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed
@@ -1053,6 +1053,15 @@ class SomeClass
 	}
 }
 
+$params = self::validate_parameters(self::read_competency_framework_parameters(),
+									array(
+										'id' => $id,
+									));
+
+$framework = api::read_framework($params['id']);
+self::validate_context($framework->get_context());
+$output = $PAGE->get_renderer('tool_lp');
+
 function foo()
 {
 	$foo = array(

diff --git a/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php b/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
@@ -154,10 +154,10 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
                 823  => 1,
                 858  => 1,
                 879  => 1,
-                1056 => 1,
-                1061 => 1,
-                1063 => 1,
-                1066 => 1,
+                1065 => 1,
+                1070 => 1,
+                1072 => 1,
+                1075 => 1,
                );
 
     }//end getErrorList()

diff --git a/package.xml b/package.xml
@@ -26,7 +26,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
  <notes>
-  - Fixed bug ##961 : Two anonymous functions passed as function/method arguments cause indentation false positive
+  - Fixed bug #945 : Incorrect indent behavior using deep-nested function and arrays
+  - Fixed bug #961 : Two anonymous functions passed as function/method arguments cause indentation false positive
  </notes>
  <contents>
   <dir name="/">