T_OPEN_TAG_WITH_ECHO should not be considered monotonic

PHP-CS-Fixer · Jan 8, 2024 · d453856 · d453856
1 parent 953425a
commit d453856
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 34 deletions.
diff --git a/src/Fixer/Comment/HeaderCommentFixer.php b/src/Fixer/Comment/HeaderCommentFixer.php
@@ -266,11 +266,7 @@ private function findHeaderCommentCurrentIndex(Tokens $tokens, int $headerNewInd
      */
     private function findHeaderCommentInsertionIndex(Tokens $tokens, string $location): int
     {
-        $openTagIndex = $tokens[0]->isGivenKind(T_OPEN_TAG) ? 0 : $tokens->getNextTokenOfKind(0, [[T_OPEN_TAG]]);
-
-        if (null === $openTagIndex) {
-            return 1;
-        }
+        $openTagIndex = $tokens[0]->isGivenKind(T_INLINE_HTML) ? 1 : 0;
 
         if ('after_open' === $location) {
             return $openTagIndex + 1;

diff --git a/src/Fixer/PhpTag/BlankLineAfterOpeningTagFixer.php b/src/Fixer/PhpTag/BlankLineAfterOpeningTagFixer.php
@@ -48,18 +48,13 @@ public function getPriority(): int
 
     public function isCandidate(Tokens $tokens): bool
     {
-        return $tokens->isTokenKindFound(T_OPEN_TAG);
+        return $tokens->isMonolithicPhp() && $tokens->isTokenKindFound(T_OPEN_TAG);
     }
 
     protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
     {
         $lineEnding = $this->whitespacesConfig->getLineEnding();
 
-        // ignore files with short open tag and ignore non-monolithic files
-        if (!$tokens[0]->isGivenKind(T_OPEN_TAG) || !$tokens->isMonolithicPhp()) {
-            return;
-        }
-
         $newlineFound = false;
 
         /** @var Token $token */

diff --git a/src/Fixer/PhpTag/LinebreakAfterOpeningTagFixer.php b/src/Fixer/PhpTag/LinebreakAfterOpeningTagFixer.php
@@ -37,16 +37,11 @@ public function getDefinition(): FixerDefinitionInterface
 
     public function isCandidate(Tokens $tokens): bool
     {
-        return $tokens->isTokenKindFound(T_OPEN_TAG);
+        return $tokens->isMonolithicPhp() && $tokens->isTokenKindFound(T_OPEN_TAG);
     }
 
     protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
     {
-        // ignore files with short open tag and ignore non-monolithic files
-        if (!$tokens[0]->isGivenKind(T_OPEN_TAG) || !$tokens->isMonolithicPhp()) {
-            return;
-        }
-
         // ignore if linebreak already present
         if (str_contains($tokens[0]->getContent(), "\n")) {
             return;

diff --git a/src/Fixer/PhpTag/NoClosingTagFixer.php b/src/Fixer/PhpTag/NoClosingTagFixer.php
@@ -38,15 +38,11 @@ public function getDefinition(): FixerDefinitionInterface
 
     public function isCandidate(Tokens $tokens): bool
     {
-        return $tokens->isTokenKindFound(T_CLOSE_TAG);
+        return \count($tokens) >= 2 && $tokens->isMonolithicPhp() && $tokens->isTokenKindFound(T_CLOSE_TAG);
     }
 
     protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
     {
-        if (\count($tokens) < 2 || !$tokens->isMonolithicPhp() || !$tokens->isTokenKindFound(T_CLOSE_TAG)) {
-            return;
-        }
-
         $closeTags = $tokens->findGivenKind(T_CLOSE_TAG);
         $index = array_key_first($closeTags);
 

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
@@ -1107,7 +1107,7 @@ public function clearRange(int $indexStart, int $indexEnd): void
      */
     public function isMonolithicPhp(): bool
     {
-        if (1 !== ($this->countTokenKind(T_OPEN_TAG) + $this->countTokenKind(T_OPEN_TAG_WITH_ECHO))) {
+        if (1 !== $this->countTokenKind(T_OPEN_TAG) || 0 !== $this->countTokenKind(T_OPEN_TAG_WITH_ECHO)) {
             return false;
         }
 

diff --git a/tests/Fixer/PhpTag/NoClosingTagFixerTest.php b/tests/Fixer/PhpTag/NoClosingTagFixerTest.php
@@ -174,14 +174,5 @@ public static function provideWithShortOpenTagCases(): iterable
         yield [
             '<? /**/', '<? /**/?>',
         ];
-
-        yield [
-            '<?= "somestring"; ?> <?= "anotherstring"; ?>',
-        ];
-
-        yield [
-            '<?= 1;',
-            '<?= 1; ?>',
-        ];
     }
 }
diff --git a/tests/Tokenizer/TokensTest.php b/tests/Tokenizer/TokensTest.php
@@ -436,9 +436,9 @@ public static function provideMonolithicPhpDetectionCases(): iterable
         yield [false, "<?=' '\n?><?\n"];
 
         // short open tag echo
-        yield [true, "<?=' ';\n"];
+        yield [false, "<?=' ';\n"];
 
-        yield [true, "<?=' '?>"];
+        yield [false, "<?=' '?>"];
 
         yield [false, " <?=' ';\n"];