Clean up Mix HTML+PHP take 2 (#3286)

* Clean up Mix HTML+PHP take 2

* reduce possible tag surplus on purpose

* remove unneeded count

* [ci-review] Rector Rectify

Co-authored-by: GitHub Action <action@github.com>

src/PhpParser/Printer/BetterStandardPrinter.php

@@ -114,13 +114,13 @@ public function printFormatPreserving(array $stmts, array $origStmts, array $ori
             $content .= $this->nl;
         }
 
-        if (count($newStmts) <= 1) {
-            return $content;
-        }
-
         $firstStmt = current($newStmts);
         $lastStmt = end($newStmts);
 
+        if ($firstStmt === $lastStmt) {
+            return $content;
+        }
+
         if (! $firstStmt instanceof InlineHTML && ! $lastStmt instanceof InlineHTML) {
             return $content;
         }
@@ -514,15 +514,20 @@ protected function pParam(Param $param): string
     private function cleanSurplusTag(string $content): string
     {
         if (str_starts_with($content, '<?php' . $this->nl . $this->nl . '?>')) {
-            $content = substr($content, 10);
+            return substr($content, 10);
         }
 
-        if (str_starts_with($content, '?>' . $this->nl)) {
-            $content = str_replace('<?php <?php' . $this->nl, '<?php' . $this->nl, $content);
-            $content = substr($content, 3);
+        if (! str_starts_with($content, '?>' . $this->nl)) {
+            return $content;
         }
 
-        return $content;
+        if (! str_contains($content, '<?php <?php' . $this->nl)) {
+            return $content;
+        }
+
+        $content = str_replace('<?php <?php' . $this->nl, '<?php' . $this->nl, $content);
+
+        return substr($content, 3);
     }
 
     private function shouldPrintNewRawValue(LNumber|DNumber $lNumber): bool