Fixed bug #897 : Generic.Functions.CallTimePassByReference.NotAllowed…

… false positive when short array syntax
squizlabs · Feb 19, 2016 · d91641d · d91641d
1 parent 3fb060d
commit d91641d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/CodeSniffer/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php b/CodeSniffer/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php
@@ -98,11 +98,21 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
 
         $nextSeparator = $openBracket;
-        while (($nextSeparator = $phpcsFile->findNext(T_VARIABLE, ($nextSeparator + 1), $closeBracket)) !== false) {
+        $find          = array(
+                          T_VARIABLE,
+                          T_OPEN_SHORT_ARRAY,
+                         );
+
+        while (($nextSeparator = $phpcsFile->findNext($find, ($nextSeparator + 1), $closeBracket)) !== false) {
             if (isset($tokens[$nextSeparator]['nested_parenthesis']) === false) {
                 continue;
             }
 
+            if ($tokens[$nextSeparator]['code'] === T_OPEN_SHORT_ARRAY) {
+                $nextSeparator = $tokens[$nextSeparator]['bracket_closer'];
+                continue;
+            }
+
             // Make sure the variable belongs directly to this function call
             // and is not inside a nested function call or array.
             $brackets    = $tokens[$nextSeparator]['nested_parenthesis'];

diff --git a/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.inc b/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.inc
@@ -24,3 +24,5 @@ $foo(&$myvar);
 
 if (is_array($foo = &$this->bar())) {
 }
+
+Hooks::run( 'SecondaryDataUpdates', [ $title, $old, $recursive, $parserOutput, &$updates ] );
diff --git a/package.xml b/package.xml
@@ -65,6 +65,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #887 : Using curly braces for a shared CASE/DEFAULT statement can generate an error in PSR2 SwitchDeclaration
   - Fixed bug #889 : Closure inside catch/else/elseif causes indentation error
   - Fixed bug #890 : Function call inside returned short array value can cause indentation error inside CASE statements
+  - Fixed bug #897 : Generic.Functions.CallTimePassByReference.NotAllowed false positive when short array syntax
  </notes>
  <contents>
   <dir name="/">