Merge branch 'master' into phpcs-fixer

Author: gsherwood

CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php

@@ -191,12 +191,15 @@ public function processBracket(PHP_CodeSniffer_File $phpcsFile, $openBracket)
 
             // Take references into account when expecting the
             // location of whitespace.
-            if ($phpcsFile->isReference(($nextParam - 1)) === true
-                || $tokens[($nextParam - 1)]['code'] === T_ELLIPSIS
-            ) {
-                $whitespace = ($nextParam - 2);
+            $checkToken = ($nextParam - 1);
+            if ($tokens[$checkToken]['code'] === T_ELLIPSIS) {
+                $checkToken--;
+            }
+
+            if ($phpcsFile->isReference($checkToken) === true) {
+                $whitespace = ($checkToken - 1);
             } else {
-                $whitespace = ($nextParam - 1);
+                $whitespace = $checkToken;
             }
 
             if (empty($params) === false) {

CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.inc

@@ -60,3 +60,4 @@ function myFunc( ) {}
 // @codingStandardsChangeSetting Squiz.Functions.FunctionDeclarationArgumentSpacing requiredSpacesBeforeClose 0
 
 function myFunc($req, $opt=null, ...$params) {}
+function myFunc($param, &...$moreParams) {}