From 33f38f1d41e898249f55dc7a971e660854cf7c40 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Mon, 27 Feb 2023 14:07:26 +0000
Subject: [PATCH] Ignore whitespace between tags in unreachable test

---
 package.xml                                   |  1 +
 .../Sniffs/PHP/NonExecutableCodeSniff.php     | 10 ++++++
 .../Tests/PHP/NonExecutableCodeUnitTest.3.inc | 31 +++++++++++++++++++
 .../Tests/PHP/NonExecutableCodeUnitTest.php   |  5 +++
 4 files changed, 47 insertions(+)
 create mode 100644 src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.3.inc

diff --git a/package.xml b/package.xml
index 9338b46e79..eff49f7791 100644
--- a/package.xml
+++ b/package.xml
@@ -1857,6 +1857,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="LowercasePHPFunctionsUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="NonExecutableCodeUnitTest.1.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="NonExecutableCodeUnitTest.2.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="NonExecutableCodeUnitTest.3.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="NonExecutableCodeUnitTest.php" role="test" />
        </dir>
        <dir name="Scope">
diff --git a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
index 343d9b29e3..dd5df2a858 100644
--- a/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
@@ -258,6 +258,16 @@ public function process(File $phpcsFile, $stackPtr)
                 continue;
             }
 
+            // Skip HTML whitespace.
+            if ($tokens[$i]['code'] === T_INLINE_HTML && \trim($tokens[$i]['content']) === '') {
+                continue;
+            }
+
+            // Skip PHP re-open tag (eg, after inline HTML).
+            if ($tokens[$i]['code'] === T_OPEN_TAG) {
+                continue;
+            }
+
             $line = $tokens[$i]['line'];
             if ($line > $lastLine) {
                 $type    = substr($tokens[$stackPtr]['type'], 2);
diff --git a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.3.inc b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.3.inc
new file mode 100644
index 0000000000..9433aed0bb
--- /dev/null
+++ b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.3.inc
@@ -0,0 +1,31 @@
+<!-- no problem here -->
+<?php if (true): ?>
+    <?php foreach ([] as $item): ?>
+        <?php continue; ?>
+    <?php endforeach; ?>
+<?php endif; ?>
+
+<!-- no problem here -->
+<?php if (true) { ?>
+    <?php foreach ([] as $item) { ?>
+        <?php continue; ?>
+    <?php } ?>
+<?php } ?>
+
+<!-- should detect an error here -->
+<?php if (true): ?>
+    <?php foreach ([] as $item): ?>
+        <?php continue; ?>
+        <div>non-executable</div>
+    <?php endforeach; ?>
+<?php endif; ?>
+
+<!-- should detect an error here -->
+<?php if (true): ?>
+    <?php foreach ([] as $item): ?>
+        <?php continue; ?>
+
+        <div>non-executable</div>
+
+    <?php endforeach; ?>
+<?php endif; ?>
diff --git a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
index f5f90c0b92..70d8244895 100644
--- a/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
+++ b/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
@@ -86,6 +86,11 @@ public function getWarningList($testFile='')
                 54 => 2,
             ];
             break;
+        case 'NonExecutableCodeUnitTest.3.inc':
+            return [
+                19 => 1,
+                28 => 1,
+            ];
         default:
             return [];
             break;