If the opening statement is adjusted, adjust all included lines as well (ref #1793)

This only happens during fixing, which allows the OpeningIndent message to be muted and not cause other errors to be reported. But if you don't mute this error, the fixing happens properly and still ensures no auto-fixer conflicts.

Author: gsherwood

package.xml

@@ -26,9 +26,9 @@ 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>
-  - PEAR.Functions.FunctionCallSignature now ensures the closing brace is aligned with the opening statement again
-    -- Previously, it was enforcing positioning on an exact tab stop, like the opening brace
-    -- This fixes an incorrect error when using the PSR2 standard with some code blocks
+  - PEAR.Functions.FunctionCallSignature now only forces alignment at a specific tab stop while fixing
+    -- It was enforcing this during checking, but this meant invalid errors if the OpeningIndent message was being muted
+    -- This fixes incorrect errors when using the PSR2 standard with some code blocks
   - Fixed bug #1793 : PSR2 forcing exact indent for function call opening statements
  </notes>
  <contents>

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

@@ -368,6 +368,8 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
         // at a tab stop. Without this, the function will be indented a further
         // $indent spaces to the right.
         $functionIndent = (int) (floor($foundFunctionIndent / $this->indent) * $this->indent);
+        $adjustment     = 0;
+
         if ($foundFunctionIndent !== $functionIndent) {
             $error = 'Opening statement of multi-line function call not indented correctly; expected %s spaces but found %s';
             $data  = [
@@ -377,7 +379,8 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
 
             $fix = $phpcsFile->addFixableError($error, $first, 'OpeningIndent', $data);
             if ($fix === true) {
-                $padding = str_repeat(' ', $functionIndent);
+                $adjustment = ($functionIndent - $foundFunctionIndent);
+                $padding    = str_repeat(' ', $functionIndent);
                 if ($foundFunctionIndent === 0) {
                     $phpcsFile->fixer->addContentBefore($first, $padding);
                 } else {
@@ -393,7 +396,7 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
             if ($fix === true) {
                 $phpcsFile->fixer->addContent(
                     $openBracket,
-                    $phpcsFile->eolChar.str_repeat(' ', ($functionIndent + $this->indent))
+                    $phpcsFile->eolChar.str_repeat(' ', ($foundFunctionIndent + $this->indent))
                 );
             }
         }
@@ -406,7 +409,7 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
             if ($fix === true) {
                 $phpcsFile->fixer->addContentBefore(
                     $closeBracket,
-                    $phpcsFile->eolChar.str_repeat(' ', ($functionIndent + $this->indent))
+                    $phpcsFile->eolChar.str_repeat(' ', ($foundFunctionIndent + $this->indent))
                 );
             }
         }
@@ -477,9 +480,9 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
                         // Closing brace needs to be indented to the same level
                         // as the function call.
                         $inArg          = false;
-                        $expectedIndent = $foundFunctionIndent;
+                        $expectedIndent = ($foundFunctionIndent + $adjustment);
                     } else {
-                        $expectedIndent = ($functionIndent + $this->indent);
+                        $expectedIndent = ($foundFunctionIndent + $this->indent + $adjustment);
                     }
 
                     if ($tokens[$i]['code'] !== T_WHITESPACE
@@ -565,7 +568,7 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
 
                             $phpcsFile->fixer->addContentBefore(
                                 $next,
-                                $phpcsFile->eolChar.str_repeat(' ', ($functionIndent + $this->indent))
+                                $phpcsFile->eolChar.str_repeat(' ', ($foundFunctionIndent + $this->indent))
                             );
                             $phpcsFile->fixer->endChangeset();
                         }

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

@@ -100,8 +100,12 @@ public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
             354 => 1,
             355 => 2,
             377 => 1,
+            378 => 1,
+            379 => 1,
             380 => 1,
             385 => 1,
+            386 => 1,
+            387 => 1,
             388 => 1,
             393 => 1,
             394 => 1,