Merge branch 'master' into 3.0

Author: gsherwood

src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php

@@ -340,6 +340,15 @@ public function processMultiLineDeclaration($phpcsFile, $stackPtr, $tokens)
                 // We changed lines, so this should be a whitespace indent token.
                 if ($tokens[$i]['code'] !== T_WHITESPACE) {
                     $foundIndent = 0;
+                } else if ($tokens[$i]['line'] !== $tokens[($i + 1)]['line']) {
+                    // This is an empty line, so don't check the indent.
+                    $foundIndent = $expectedIndent;
+
+                    $error = 'Blank lines are not allowed in a multi-line function declaration';
+                    $fix   = $phpcsFile->addFixableError($error, $i, 'EmptyLine');
+                    if ($fix === true) {
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
                 } else {
                     $foundIndent = strlen($tokens[$i]['content']);
                 }

src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc

@@ -200,3 +200,12 @@ function foo(
 ): SomeClass // Comment here
 {
 }
+
+function foo(
+    $param1,
+
+    $param2,
+
+    $param3,
+) : SomeClass {
+}

src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc.fixed

@@ -205,3 +205,10 @@ function foo(
 ): SomeClass { // Comment here
 
 }
+
+function foo(
+    $param1,
+    $param2,
+    $param3,
+) : SomeClass {
+}

src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php

@@ -53,6 +53,8 @@ public function getErrorList($testFile='FunctionDeclarationUnitTest.inc')
                        171 => 1,
                        173 => 1,
                        201 => 1,
+                       206 => 1,
+                       208 => 1,
                       );
         } else {
             $errors = array(

src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php

@@ -187,7 +187,7 @@ public function processBracket($phpcsFile, $openBracket, $tokens, $type='functio
             }
 
             $next = $phpcsFile->findNext(T_WHITESPACE, ($i + 1), null, true);
-            if ($tokens[$next]['line'] !== ($tokens[$i]['line'] + 1)) {
+            if ($tokens[$next]['line'] === $tokens[$i]['line']) {
                 $error = 'Multi-line '.$type.' declarations must define one parameter per line';
                 $fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'OneParamPerLine');
                 if ($fix === true) {

src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc

@@ -152,3 +152,12 @@ function foo(
 ) {
     // body
 }
+
+function foo(
+    $param1,
+
+    $param2,
+
+    $param3,
+) : SomeClass {
+}

src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php

@@ -48,6 +48,8 @@ public function getErrorList($testFile='MultiLineFunctionDeclarationUnitTest.inc
                        137 => 1,
                        141 => 2,
                        142 => 1,
+                       158 => 1,
+                       160 => 1,
                       );
         } else {
             $errors = array(