Fixed bug #3666 : PEAR.Functions.FunctionCallSignature incorrect indent fix when checking mixed HTML/PHP files

Author: gsherwood

package.xml

@@ -44,6 +44,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Alex Panshin (@enl) for the patch
   - Fixed bug #3653 : False positives for match() in OperatorSpacingSniff
     -- Thanks to Jaroslav Hanslík (@kukulich) for the patch
+  - Fixed bug #3666 : PEAR.Functions.FunctionCallSignature incorrect indent fix when checking mixed HTML/PHP files
  </notes>
  <contents>
   <dir name="/">

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

@@ -390,11 +390,14 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
                 $padding    = str_repeat(' ', $functionIndent);
                 if ($foundFunctionIndent === 0) {
                     $phpcsFile->fixer->addContentBefore($first, $padding);
+                } else if ($tokens[$first]['code'] === T_INLINE_HTML) {
+                    $newContent = $padding.ltrim($tokens[$first]['content']);
+                    $phpcsFile->fixer->replaceToken($first, $newContent);
                 } else {
                     $phpcsFile->fixer->replaceToken(($first - 1), $padding);
                 }
             }
-        }
+        }//end if
 
         $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($openBracket + 1), null, true);
         if ($tokens[$next]['line'] === $tokens[$openBracket]['line']) {

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

@@ -548,3 +548,22 @@ array_fill_keys(
     ), value: true,
 );
 // phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments true
+
+?>
+<div>
+    <p/><?php require get_theme_file_path(
+        '/theme_extra/test_block.php'
+    ); ?></p>
+</div>
+<div>
+  <p/><?php require get_theme_file_path(
+      '/theme_extra/test_block.php'
+  ); ?></p>
+</div>
+<?php
+echo 'hi';
+?>
+content
+      <p><?php require get_theme_file_path(
+      '/theme_extra/test_block.php'
+); ?></p>

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

@@ -563,3 +563,22 @@ array_fill_keys(
     value: true,
 );
 // phpcs:set PEAR.Functions.FunctionCallSignature allowMultipleArguments true
+
+?>
+<div>
+    <p/><?php require get_theme_file_path(
+        '/theme_extra/test_block.php'
+    ); ?></p>
+</div>
+<div>
+<p/><?php require get_theme_file_path(
+    '/theme_extra/test_block.php'
+); ?></p>
+</div>
+<?php
+echo 'hi';
+?>
+content
+    <p><?php require get_theme_file_path(
+        '/theme_extra/test_block.php'
+); ?></p>

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

@@ -131,6 +131,9 @@ public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
             546 => 1,
             547 => 1,
             548 => 1,
+            559 => 1,
+            567 => 1,
+            568 => 1,
         ];
 
     }//end getErrorList()