From 89b949672a935da21e66d65bbca9d9c0b0955c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Mon, 10 Jan 2022 22:20:31 +0100
Subject: [PATCH 1/5] Update Tokens::isMonolithicPhp

---
 src/Tokenizer/Tokens.php       | 10 ++++++----
 tests/Tokenizer/TokensTest.php |  5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
index 15044fef033..9a8142f326f 100644
--- a/src/Tokenizer/Tokens.php
+++ b/src/Tokenizer/Tokens.php
@@ -1088,16 +1088,18 @@ public function clearRange(int $indexStart, int $indexEnd): void
      */
     public function isMonolithicPhp(): bool
     {
-        $size = $this->count();
-
-        if (0 === $size) {
+        if (0 === $this->count()) {
             return false;
         }
 
-        if ($this->isTokenKindFound(T_INLINE_HTML)) {
+        if ($this->countTokenKind(T_INLINE_HTML) > 1) {
             return false;
         }
 
+        if (1 === $this->countTokenKind(T_INLINE_HTML)) {
+            return 1 === Preg::match('/^#!.*$/m', $this[0]->getContent());
+        }
+
         return 1 >= ($this->countTokenKind(T_OPEN_TAG) + $this->countTokenKind(T_OPEN_TAG_WITH_ECHO));
     }
 
diff --git a/tests/Tokenizer/TokensTest.php b/tests/Tokenizer/TokensTest.php
index 458c448ac98..28da0240074 100644
--- a/tests/Tokenizer/TokensTest.php
+++ b/tests/Tokenizer/TokensTest.php
@@ -353,9 +353,12 @@ public function provideMonolithicPhpDetectionCases(): iterable
     {
         yield [true, "<?php\n"];
         yield [true, "<?php\n?>"];
+        yield [true, "#!/usr/bin/php\n<?php\n"];
+        yield [true, "#!/usr/bin/env php\n<?php\n"];
+        yield [true, "#!/usr/bin/env php7.4\n<?php\n"];
+        yield [true, "#!/usr/bin/env this-is\ntoo-much\n<?php\n"];
         yield [false, ''];
         yield [false, ' '];
-        yield [false, "#!/usr/bin/env php\n<?php\n"];
         yield [false, " <?php\n"];
         yield [false, "<?php\n?> "];
         yield [false, "<?php\n?><?php\n"];

From fd9d8b310b82997283f7d23137b5473967045cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Thu, 13 Jan 2022 22:14:06 +0100
Subject: [PATCH 2/5] Update tests/Tokenizer/TokensTest.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dariusz Rumiński <dariusz.ruminski@gmail.com>
---
 tests/Tokenizer/TokensTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Tokenizer/TokensTest.php b/tests/Tokenizer/TokensTest.php
index 28da0240074..7a1796489e7 100644
--- a/tests/Tokenizer/TokensTest.php
+++ b/tests/Tokenizer/TokensTest.php
@@ -362,6 +362,8 @@ public function provideMonolithicPhpDetectionCases(): iterable
         yield [false, " <?php\n"];
         yield [false, "<?php\n?> "];
         yield [false, "<?php\n?><?php\n"];
+        yield [false, 'Hello<?php echo "World!"; ?>'];
+        yield [false, '<?php echo "Hello"; ?> World!'];
         // short open tag
         yield [(bool) ini_get('short_open_tag'), "<?\n"];
         yield [(bool) ini_get('short_open_tag'), "<?\n?>"];

From a406b754f428daefa9cbd374632c4079107ac61f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Thu, 13 Jan 2022 22:21:42 +0100
Subject: [PATCH 3/5] Update multiline handling

---
 src/Tokenizer/Tokens.php       | 2 +-
 tests/Tokenizer/TokensTest.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
index 9a8142f326f..473f74b8cff 100644
--- a/src/Tokenizer/Tokens.php
+++ b/src/Tokenizer/Tokens.php
@@ -1097,7 +1097,7 @@ public function isMonolithicPhp(): bool
         }
 
         if (1 === $this->countTokenKind(T_INLINE_HTML)) {
-            return 1 === Preg::match('/^#!.*$/m', $this[0]->getContent());
+            return 1 === Preg::match('/^#!.*$/', $this[0]->getContent());
         }
 
         return 1 >= ($this->countTokenKind(T_OPEN_TAG) + $this->countTokenKind(T_OPEN_TAG_WITH_ECHO));
diff --git a/tests/Tokenizer/TokensTest.php b/tests/Tokenizer/TokensTest.php
index 7a1796489e7..f8f88fc49a9 100644
--- a/tests/Tokenizer/TokensTest.php
+++ b/tests/Tokenizer/TokensTest.php
@@ -356,7 +356,9 @@ public function provideMonolithicPhpDetectionCases(): iterable
         yield [true, "#!/usr/bin/php\n<?php\n"];
         yield [true, "#!/usr/bin/env php\n<?php\n"];
         yield [true, "#!/usr/bin/env php7.4\n<?php\n"];
-        yield [true, "#!/usr/bin/env this-is\ntoo-much\n<?php\n"];
+        yield [false, "#!/usr/bin/env this-is\ntoo-much\n<?php\n"];
+        yield [false, "#!/usr/bin/php\nFoo bar<?php\n"];
+        yield [false, "#!/usr/bin/env php -n \nFoo bar\n<?php\n"];
         yield [false, ''];
         yield [false, ' '];
         yield [false, " <?php\n"];

From 229b1dc05ccab83c30a314294a07042eeec93458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Thu, 13 Jan 2022 22:25:36 +0100
Subject: [PATCH 4/5] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dariusz Rumiński <dariusz.ruminski@gmail.com>
---
 src/Tokenizer/Tokens.php       | 2 +-
 tests/Tokenizer/TokensTest.php | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
index 473f74b8cff..4c9165ccb4d 100644
--- a/src/Tokenizer/Tokens.php
+++ b/src/Tokenizer/Tokens.php
@@ -1100,7 +1100,7 @@ public function isMonolithicPhp(): bool
             return 1 === Preg::match('/^#!.*$/', $this[0]->getContent());
         }
 
-        return 1 >= ($this->countTokenKind(T_OPEN_TAG) + $this->countTokenKind(T_OPEN_TAG_WITH_ECHO));
+        return 1 === ($this->countTokenKind(T_OPEN_TAG) + $this->countTokenKind(T_OPEN_TAG_WITH_ECHO));
     }
 
     /**
diff --git a/tests/Tokenizer/TokensTest.php b/tests/Tokenizer/TokensTest.php
index f8f88fc49a9..3b8fa38dea3 100644
--- a/tests/Tokenizer/TokensTest.php
+++ b/tests/Tokenizer/TokensTest.php
@@ -353,9 +353,14 @@ public function provideMonolithicPhpDetectionCases(): iterable
     {
         yield [true, "<?php\n"];
         yield [true, "<?php\n?>"];
+        yield [false, "#!/usr/bin/bash\ncat <?php\n"];
+        yield [false, "#!/usr/bin/env bash\ncat <?php\n"];
         yield [true, "#!/usr/bin/php\n<?php\n"];
+        yield [true, "#!/usr/bin/php7.4-cli\n<?php\n"];
+        yield [true, "#!/usr/bin/php8\n<?php\n"];
         yield [true, "#!/usr/bin/env php\n<?php\n"];
         yield [true, "#!/usr/bin/env php7.4\n<?php\n"];
+        yield [true, "#!/usr/bin/env php7.4-cli\n<?php\n"];
         yield [false, "#!/usr/bin/env this-is\ntoo-much\n<?php\n"];
         yield [false, "#!/usr/bin/php\nFoo bar<?php\n"];
         yield [false, "#!/usr/bin/env php -n \nFoo bar\n<?php\n"];

From 9624c0cb5c58cf82f7027d6b4150b1d087550561 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Wer=C5=82os?= <werlos@gmail.com>
Date: Thu, 13 Jan 2022 23:44:30 +0100
Subject: [PATCH 5/5] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Dariusz Rumiński <dariusz.ruminski@gmail.com>
---
 src/Tokenizer/Tokens.php       | 2 +-
 tests/Tokenizer/TokensTest.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
index 4c9165ccb4d..edb321167f5 100644
--- a/src/Tokenizer/Tokens.php
+++ b/src/Tokenizer/Tokens.php
@@ -1097,7 +1097,7 @@ public function isMonolithicPhp(): bool
         }
 
         if (1 === $this->countTokenKind(T_INLINE_HTML)) {
-            return 1 === Preg::match('/^#!.*$/', $this[0]->getContent());
+            return 1 === Preg::match('/^#!.+$/', $this[0]->getContent());
         }
 
         return 1 === ($this->countTokenKind(T_OPEN_TAG) + $this->countTokenKind(T_OPEN_TAG_WITH_ECHO));
diff --git a/tests/Tokenizer/TokensTest.php b/tests/Tokenizer/TokensTest.php
index 3b8fa38dea3..202a9220b00 100644
--- a/tests/Tokenizer/TokensTest.php
+++ b/tests/Tokenizer/TokensTest.php
@@ -353,10 +353,12 @@ public function provideMonolithicPhpDetectionCases(): iterable
     {
         yield [true, "<?php\n"];
         yield [true, "<?php\n?>"];
+        yield [false, "#!\n<?php\n"];
         yield [false, "#!/usr/bin/bash\ncat <?php\n"];
         yield [false, "#!/usr/bin/env bash\ncat <?php\n"];
         yield [true, "#!/usr/bin/php\n<?php\n"];
         yield [true, "#!/usr/bin/php7.4-cli\n<?php\n"];
+        yield [false, "#!/usr/bin/php\n\n<?php\n"]; // empty line after shebang would be printed to console before PHP executes
         yield [true, "#!/usr/bin/php8\n<?php\n"];
         yield [true, "#!/usr/bin/env php\n<?php\n"];
         yield [true, "#!/usr/bin/env php7.4\n<?php\n"];