From 2302fb0dc030c622bda1646fcccbe3f022bf724d Mon Sep 17 00:00:00 2001
From: Dextheking1 <Dextheking1@users.noreply.github.com>
Date: Thu, 24 Sep 2026 12:26:24 +0200
Subject: [PATCH 1/2] fix: strip pseudo inline placeholder from
 string/heredoc/nowdoc output

parser.mjs injects ___PSEUDO_INLINE_PLACEHOLDER___ into the source text for
top-level ?>\n<? sequences. When a heredoc/nowdoc/string happened to contain
that sequence, the sentinel leaked into the formatted output, corrupting the
string contents.

Fixes prettier/plugin-php#2087
---
 src/printer.mjs                               | 45 +++++++++++++----
 .../heredoc/__snapshots__/jsfmt.spec.mjs.snap | 49 +++++++++++++++++++
 tests/heredoc/heredoc.php                     | 19 +++++++
 tests/heredoc/jsfmt.spec.mjs                  |  1 +
 4 files changed, 105 insertions(+), 9 deletions(-)
 create mode 100644 tests/heredoc/__snapshots__/jsfmt.spec.mjs.snap
 create mode 100644 tests/heredoc/heredoc.php
 create mode 100644 tests/heredoc/jsfmt.spec.mjs

diff --git a/src/printer.mjs b/src/printer.mjs
index f789a340b..cf358c093 100644
--- a/src/printer.mjs
+++ b/src/printer.mjs
@@ -66,6 +66,13 @@ const {
   isPreviousLineEmpty,
 } = prettierUtil;
 
+// Sentinel injected by parser.mjs into the source text for top-level `?>\n<?`
+// sequences (see https://github.com/glayzzle/php-parser/issues/170). It can
+// also end up inside string/heredoc/nowdoc contents; strip it when printing
+// those so it never leaks into the output.
+// https://github.com/prettier/plugin-php/issues/2087
+const PSEUDO_INLINE_PLACEHOLDER = "___PSEUDO_INLINE_PLACEHOLDER___";
+
 /**
  * Determine if we should print a trailing comma based on the config & php version
  *
@@ -618,13 +625,23 @@ function printArgumentsList(path, options, print, argumentsKey = "arguments") {
   const { node } = path;
   const lastArg = getLast(args);
 
+  // A first-class callable `foo(...)` is a single `variadicplaceholder`
+  // argument: PHP never allows a trailing comma after it, so emitting one
+  // produces a syntax error.
+  // https://github.com/prettier/plugin-php/issues/2149
+  const isFirstClassCallable =
+    node.kind === "call" &&
+    args.length === 1 &&
+    args[0].kind === "variadicplaceholder";
+
   const maybeTrailingComma =
-    (shouldPrintComma(options, 7.3) &&
+    !isFirstClassCallable &&
+    ((shouldPrintComma(options, 7.3) &&
       ["call", "new", "unset", "isset"].includes(node.kind)) ||
-    (shouldPrintComma(options, 8.0) &&
-      ["function", "closure", "method", "arrowfunc", "attribute"].includes(
-        node.kind
-      ))
+      (shouldPrintComma(options, 8.0) &&
+        ["function", "closure", "method", "arrowfunc", "attribute"].includes(
+          node.kind
+        )))
       ? indent([
           lastArg && shouldPrintHardlineBeforeTrailingComma(lastArg)
             ? hardline
@@ -2732,9 +2749,12 @@ function printNode(path, options, print) {
             closingTagIndentation = lines[lines.length - 2].search(/\S/);
           }
         }
+        // Strip the pseudo inline placeholder the parser injected into the
+        // source text (see https://github.com/prettier/plugin-php/issues/2087)
+        const raw = node.raw.replaceAll(PSEUDO_INLINE_PLACEHOLDER, "");
         return join(
           linebreak,
-          node.raw
+          raw
             .split("\n")
             .map((s, i) =>
               i > 0 || node.loc.start.column === 0
@@ -2746,7 +2766,7 @@ function printNode(path, options, print) {
 
       const quote = useDoubleQuote(node, options) ? '"' : "'";
 
-      let stringValue = node.raw;
+      let stringValue = node.raw.replaceAll(PSEUDO_INLINE_PLACEHOLDER, "");
 
       if (node.raw[0] === "b") {
         stringValue = stringValue.slice(1);
@@ -2811,7 +2831,7 @@ function printNode(path, options, print) {
     case "inline":
       return join(
         literalline,
-        node.raw.replace("___PSEUDO_INLINE_PLACEHOLDER___", "").split("\n")
+        node.raw.replaceAll(PSEUDO_INLINE_PLACEHOLDER, "").split("\n")
       );
     case "magic":
       return node.value;
@@ -2823,7 +2843,14 @@ function printNode(path, options, print) {
         node.label,
         "'",
         linebreak,
-        join(linebreak, node.value.split("\n")),
+        // The parser injects `___PSEUDO_INLINE_PLACEHOLDER___` into the raw
+        // source text for top-level `?>\n<?` sequences; strip it back out so
+        // it never leaks into string contents.
+        // https://github.com/prettier/plugin-php/issues/2087
+        join(
+          linebreak,
+          node.value.replaceAll(PSEUDO_INLINE_PLACEHOLDER, "").split("\n")
+        ),
         linebreak,
         node.label,
         docShouldHaveTrailingNewline(path) ? hardline : "",
diff --git a/tests/heredoc/__snapshots__/jsfmt.spec.mjs.snap b/tests/heredoc/__snapshots__/jsfmt.spec.mjs.snap
new file mode 100644
index 000000000..f8e964be3
--- /dev/null
+++ b/tests/heredoc/__snapshots__/jsfmt.spec.mjs.snap
@@ -0,0 +1,49 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`heredoc.php 1`] = `
+====================================options=====================================
+parsers: ["php"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<?php
+
+class A
+{
+    const liftDataWithInlineRanges = <<<EOD
+<?xml version="1.0" encoding="UTF-8" ?>
+<?oxygen RNGSchema="lift.rng" type="xml"?>
+<?blueprint schema="lift.rng"?>
+
+<lift version="0.13" producer="LexiquePro.3.6">
+EOD;
+}
+
+$nowdoc = <<<'EOD'
+<?xml version="1.0" encoding="UTF-8" ?>
+<?oxygen RNGSchema="lift.rng" type="xml"?>
+EOD;
+
+$string = "<?xml version=\\"1.0\\" ?>\\n<?oxygen RNGSchema=\\"lift.rng\\"?>";
+
+=====================================output=====================================
+<?php
+
+class A
+{
+    const liftDataWithInlineRanges = <<<EOD
+    <?xml version="1.0" encoding="UTF-8" ?>
+    <?oxygen RNGSchema="lift.rng" type="xml"?>
+    <?blueprint schema="lift.rng"?>
+
+    <lift version="0.13" producer="LexiquePro.3.6">
+    EOD;
+}
+$nowdoc = <<<'EOD'
+<?xml version="1.0" encoding="UTF-8" ?>
+<?oxygen RNGSchema="lift.rng" type="xml"?>
+EOD;
+$string = "<?xml version=\\"1.0\\" ?>\\n<?oxygen RNGSchema=\\"lift.rng\\"?>";
+
+================================================================================
+`;
diff --git a/tests/heredoc/heredoc.php b/tests/heredoc/heredoc.php
new file mode 100644
index 000000000..716deadd7
--- /dev/null
+++ b/tests/heredoc/heredoc.php
@@ -0,0 +1,19 @@
+<?php
+
+class A
+{
+    const liftDataWithInlineRanges = <<<EOD
+<?xml version="1.0" encoding="UTF-8" ?>
+<?oxygen RNGSchema="lift.rng" type="xml"?>
+<?blueprint schema="lift.rng"?>
+
+<lift version="0.13" producer="LexiquePro.3.6">
+EOD;
+}
+
+$nowdoc = <<<'EOD'
+<?xml version="1.0" encoding="UTF-8" ?>
+<?oxygen RNGSchema="lift.rng" type="xml"?>
+EOD;
+
+$string = "<?xml version=\"1.0\" ?>\n<?oxygen RNGSchema=\"lift.rng\"?>";
diff --git a/tests/heredoc/jsfmt.spec.mjs b/tests/heredoc/jsfmt.spec.mjs
new file mode 100644
index 000000000..8829c872f
--- /dev/null
+++ b/tests/heredoc/jsfmt.spec.mjs
@@ -0,0 +1 @@
+run_spec(import.meta, ["php"]);

From 4a9bb5bfc0c92cf6f105f1a6015be1e9cc257115 Mon Sep 17 00:00:00 2001
From: Dextheking1 <Dextheking1@users.noreply.github.com>
Date: Mon, 28 Sep 2026 02:29:44 +0200
Subject: [PATCH 2/2] fix: strip pseudo inline placeholder in clean.mjs for
 AST_COMPARE

parser.mjs injects ___PSEUDO_INLINE_PLACEHOLDER___ into the source text for
top-level ?> newline <? sequences. When it lands inside string, heredoc or
nowdoc values, the AST parsed from the original source keeps the sentinel
while the formatted output does not, so AST_COMPARE fails. Strip it from
string and nowdoc values in clean.mjs. Heredoc parts are string nodes, so
they are covered too.
---
 src/clean.mjs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/clean.mjs b/src/clean.mjs
index 3622417ca..7262bf3f6 100644
--- a/src/clean.mjs
+++ b/src/clean.mjs
@@ -43,6 +43,20 @@ function clean(node, newObj) {
     newObj.value = newObj.value.replace(/\n/g, "");
   }
 
+  // The parser injects `___PSEUDO_INLINE_PLACEHOLDER___` into the source text
+  // for top-level `?>\n<?` sequences; it can land inside string-like values
+  // too, so strip it there for AST_COMPARE.
+  // https://github.com/prettier/plugin-php/issues/2087
+  if (
+    ["string", "nowdoc"].includes(node.kind) &&
+    typeof newObj.value === "string"
+  ) {
+    newObj.value = newObj.value.replaceAll(
+      "___PSEUDO_INLINE_PLACEHOLDER___",
+      ""
+    );
+  }
+
   // continue ((2)); -> continue 2;
   // continue 1; -> continue;
   if ((node.kind === "continue" || node.kind === "break") && node.level) {