Fixed bug #2623 : PSR12.ControlStructures.ControlStructureSpacing not ignoring indentation inside multi-line string arguments

Author: gsherwood

package.xml

@@ -31,6 +31,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #2619 : PSR12.Files.FileHeader locks up when inline comment is the last content in a file
   - Fixed bug #2621 : PSR12.Classes.AnonClassDeclaration.CloseBraceSameLine false positive for anon class passed as function argument
     -- Thanks to Martins Sipenko for the patch
+  - Fixed bug #2623 : PSR12.ControlStructures.ControlStructureSpacing not ignoring indentation inside multi-line string arguments
   - Fixed bug #2624 : PSR12.Traits.UseDeclaration doesnt apply the correct indent during auto fixing
  </notes>
  <contents>

src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php

@@ -103,6 +103,13 @@ public function process(File $phpcsFile, $stackPtr)
                 break;
             }
 
+            // Leave indentation inside multi-line strings.
+            if (isset(Tokens::$textStringTokens[$tokens[$i]['code']]) === true
+                || isset(Tokens::$heredocTokens[$tokens[$i]['code']]) === true
+            ) {
+                continue;
+            }
+
             if ($tokens[$i]['code'] !== T_WHITESPACE) {
                 $foundIndent = 0;
             } else {

src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.inc

@@ -60,3 +60,16 @@ $i < 10;
     $i++;
 ) {
 }
+
+if (
+    foo(
+            'this
+            is a
+            string',
+            <<<EOD
+foobar!
+EOD
+        )
+) {
+    return;
+}

src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.inc.fixed

@@ -61,3 +61,16 @@ for (
     $i++;
 ) {
 }
+
+if (
+    foo(
+            'this
+            is a
+            string',
+            <<<EOD
+foobar!
+EOD
+        )
+) {
+    return;
+}