@prettier/plugin-php 0.22.4 → 0.24.0

package/README.md

@@ -8,26 +8,23 @@
 <h2 align="center">Prettier PHP Plugin</h2>
 
 <p align="center">
-  <a href="https://github.com/prettier/plugin-php/actions">
-    <img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/prettier/plugin-php/Node CI?style=flat-square">
+  <a href="https://github.com/prettier/plugin-php/actions?query=branch%3Amain">
+    <img alt="CI Status" src="https://img.shields.io/github/actions/workflow/status/prettier/plugin-php/nodejs.yml?style=flat-square&label=CI&branch=main">
   </a>
   <a href="https://www.npmjs.com/package/@prettier/plugin-php">
     <img alt="npm version" src="https://img.shields.io/npm/v/@prettier/plugin-php.svg?style=flat-square">
   </a>
   <a href="https://codecov.io/gh/prettier/plugin-php">
-    <img alt="Codecov Coverage Status" src="https://img.shields.io/codecov/c/github/prettier/plugin-php.svg?style=flat-square">
+    <img alt="Coverage Status" src="https://img.shields.io/codecov/c/github/prettier/plugin-php.svg?style=flat-square">
   </a>
   <!-- <a href="https://www.npmjs.com/package/@prettier/plugin-php">
     <img alt="monthly downloads" src="https://img.shields.io/npm/dm/@prettier/plugin-php.svg?style=flat-square">
   </a> -->
-  <a href="#badge">
+  <a href="https://github.com/prettier/prettier#badge">
     <img alt="code style: prettier" src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square">
   </a>
-  <a href="https://gitter.im/jlongster/prettier">
-    <img alt="Gitter" src="https://img.shields.io/gitter/room/jlongster/prettier.svg?style=flat-square">
-  </a>
-  <a href="https://twitter.com/PrettierCode">
-    <img alt="Follow+Prettier+on+Twitter" src="https://img.shields.io/twitter/follow/prettiercode.svg?label=follow+prettier&style=flat-square">
+  <a href="https://x.com/intent/follow?screen_name=PrettierCode">
+    <img alt="Follow Prettier on X" src="https://img.shields.io/badge/%40PrettierCode-9f9f9f?style=flat-square&logo=x&labelColor=555">
   </a>
 </p>
 
@@ -179,17 +176,33 @@ await prettier.format(YOUR_CODE, {
 
 Prettier for PHP supports the following options. We recommend that all users set the `phpVersion` option.
 
-| Name               | Default    | Description                                                                                                                                                                                                                                                                            |
-| ------------------ | ---------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `phpVersion`       | `"7.0"`    | Allows specifying the PHP version you're using. If you're using PHP 7.1 or later, setting this option will make use of modern language features in the printed output. If you're using PHP lower than 7.0, you'll have to set this option or Prettier will generate incompatible code. |
-| `printWidth`       | `80`       | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#print-width))                                                                                                                                                                                        |
-| `tabWidth`         | `4`        | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#tab-width)), The default is `4` based on the `PSR-2` coding standard.                                                                                                                                |
-| `useTabs`          | `false`    | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#tabs))                                                                                                                                                                                               |
-| `singleQuote`      | `false`    | If set to `"true"`, strings that use double quotes but do not rely on the features they add, will be reformatted. Example: `"foo" -> 'foo'`, `"foo $bar" -> "foo $bar"`.                                                                                                               |
-| `trailingCommaPHP` | `true`     | If set to `true`, trailing commas will be added wherever possible. <br> If set to `false`, no trailing commas are printed.                                                                                                                                                             |
-| `braceStyle`       | `"per-cs"` | If set to `"per-cs"`, prettier will move open brace for code blocks (classes, functions and methods) onto new line. <br> If set to `"1tbs"`, prettier will move open brace for code blocks (classes, functions and methods) onto same line.                                            |
-| `requirePragma`    | `false`    | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#require-pragma))                                                                                                                                                                                     |
-| `insertPragma`     | `false`    | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#insert-pragma))                                                                                                                                                                                      |
+| Name               | Default     | Description                                                                                                                                                                                                                                 |
+| ------------------ | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `phpVersion`       | `"auto"` \* | Allows specifying the PHP version you're using. (See Notes Below)                                                                                                                                                                           |
+| `printWidth`       | `80`        | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#print-width))                                                                                                                                             |
+| `tabWidth`         | `4`         | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#tab-width)), The default is `4` based on the `PSR-2` coding standard.                                                                                     |
+| `useTabs`          | `false`     | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#tabs))                                                                                                                                                    |
+| `singleQuote`      | `false`     | If set to `"true"`, strings that use double quotes but do not rely on the features they add, will be reformatted. Example: `"foo" -> 'foo'`, `"foo $bar" -> "foo $bar"`.                                                                    |
+| `trailingCommaPHP` | `true`      | If set to `true`, trailing commas will be added wherever possible. <br> If set to `false`, no trailing commas are printed.                                                                                                                  |
+| `braceStyle`       | `"per-cs"`  | If set to `"per-cs"`, prettier will move open brace for code blocks (classes, functions and methods) onto new line. <br> If set to `"1tbs"`, prettier will move open brace for code blocks (classes, functions and methods) onto same line. |
+| `requirePragma`    | `false`     | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#require-pragma))                                                                                                                                          |
+| `insertPragma`     | `false`     | Same as in Prettier ([see prettier docs](https://prettier.io/docs/en/options.html#insert-pragma))                                                                                                                                           |
+
+### \* `phpVersion` Configuration Notes :
+
+The default setting `auto`, attempts to auto-detect your supported php versions from a `composer.json` with in the
+current directory or any parent directory, the plugin will use a minimum supported php version from
+`{"require":{"php":"..."}}` to set the phpVersion. If not found or not able to be parsed, it will default to latest
+supported PHP version.
+
+You set the `phpVersion` to `composer` and this will only use the `composer.json` file to determine the php
+version, prettier will crash if the PHP cannot be determined.
+
+You can also set the `phpVersion` to a specific version, such as `7.4`, `8.0`, `8.1`, `8.2`, or `8.3`.
+
+**Please Note:** If the phpVersion is not set correctly for your environment, this plugin will produce code that could
+be incompatible with your PHP runtime. For example, if you are using PHP 7.4, but the plugin is set to PHP 8.3, it will
+produce code that uses features not available in PHP 7.4.
 
 ## Ignoring code
 
@@ -227,10 +240,6 @@ matrix(
 
 ## Editor integration
 
-### Atom
-
-The official [prettier plugin for atom](https://github.com/prettier/prettier-atom) supports plugins.
-
 ### Visual Studio Code
 
 The official [prettier plugin for vscode](https://github.com/prettier/prettier-vscode) supports plugins since Version 1.10.0. To enable it, install the extension and make sure the plugin is installed _locally_ (in your project folder).
@@ -276,6 +285,10 @@ Sublime Text support is available through Package Control and the [JsPrettier](h
 
 The official [prettier plugin for vim](https://github.com/prettier/vim-prettier) has built-in support for plugin-php since 1.0.
 
+### Nova
+
+The [Prettier⁺ Extension](https://extensions.panic.com/extensions/stonerl/stonerl.prettier/) has built-in support for plugin-php.
+
 #### ALE
 
 The linting plugin ALE has built-in support for prettier and its plugins. Just add prettier to your [list of fixers](https://github.com/w0rp/ale#2ii-fixing). For example:

package/index.d.ts

@@ -0,0 +1,4 @@
+import type { Plugin } from "prettier";
+
+declare const plugin: Plugin;
+export default plugin;

package/package.json

@@ -1,30 +1,36 @@
 {
   "name": "@prettier/plugin-php",
-  "version": "0.22.4",
+  "version": "0.24.0",
   "description": "Prettier PHP Plugin",
   "repository": "prettier/prettier-php",
   "author": "Lucas Azzola <@azz>",
   "license": "MIT",
   "unpkg": "./standalone.js",
   "browser": "./standalone.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
+      "types": "./index.d.ts",
       "browser": "./standalone.js",
       "default": "./src/index.mjs"
     },
-    "./standalone": "./standalone.js",
+    "./standalone": {
+      "types": "./index.d.ts",
+      "default": "./standalone.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
     "src",
-    "standalone.js"
+    "standalone.js",
+    "index.d.ts"
   ],
   "dependencies": {
-    "linguist-languages": "^7.27.0",
-    "php-parser": "^3.1.5"
+    "linguist-languages": "^8.0.0",
+    "php-parser": "^3.2.5"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.23.6",
+    "@babel/preset-env": "^7.27.2",
     "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-commonjs": "^25.0.7",
@@ -33,7 +39,7 @@
     "@rollup/plugin-node-resolve": "^15.2.1",
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-terser": "^0.4.3",
-    "c8": "^9.1.0",
+    "c8": "^10.1.3",
     "cross-env": "^7.0.2",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
@@ -41,11 +47,11 @@
     "eslint-plugin-jest": "27.6.3",
     "eslint-plugin-prettier": "5.1.3",
     "eslint-plugin-prettier-doc": "^1.1.0",
-    "jest": "29.7.0",
-    "jest-environment-jsdom": "29.7.0",
-    "jest-light-runner": "^0.6.0",
+    "jest": "30.0.3",
+    "jest-environment-jsdom": "30.0.2",
+    "jest-light-runner": "^0.7.9",
     "jest-snapshot-serializer-raw": "^2.0.0",
-    "prettier": "^3.0.1",
+    "prettier": "^3.6.1",
     "rollup": "^3.28.1",
     "strip-ansi": "^7.1.0"
   },

package/src/index.mjs

@@ -1,8 +1,6 @@
 import { doc } from "prettier";
-import {
-  LINGUIST_LANGUAGES_PHP,
-  LINGUIST_LANGUAGES_HTML_PHP,
-} from "./linguist-languages.cjs";
+import LINGUIST_LANGUAGES_PHP from "linguist-languages/data/PHP";
+import LINGUIST_LANGUAGES_HTML_PHP from "linguist-languages/data/HTML_2b_PHP";
 import parse from "./parser.mjs";
 import print from "./printer.mjs";
 import clean from "./clean.mjs";

package/src/needs-parens.mjs

@@ -1,6 +1,6 @@
 import { getPrecedence, shouldFlatten, isBitwiseOperator } from "./util.mjs";
 
-function needsParens(path) {
+function needsParens(path, options) {
   const { parent } = path;
 
   if (!parent) {
@@ -128,13 +128,16 @@ function needsParens(path) {
     }
     case "clone":
     case "new": {
+      const requiresParens =
+        node.kind === "clone" ||
+        (node.kind === "new" && options.phpVersion < 8.4);
       switch (parent.kind) {
         case "propertylookup":
         case "nullsafepropertylookup":
         case "staticlookup":
         case "offsetlookup":
         case "call":
-          return key === "what";
+          return key === "what" && requiresParens;
         default:
           return false;
       }

package/src/options.mjs

@@ -1,28 +1,124 @@
+import fs from "fs";
+import path from "path";
+
 const CATEGORY_PHP = "PHP";
 
+// prettier-ignore
+const SUPPORTED_PHP_VERSIONS = [
+  5.0, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6,
+  7.0, 7.1, 7.2, 7.3, 7.4,
+  8.0, 8.1, 8.2, 8.3, 8.4,
+];
+
+export const LATEST_SUPPORTED_PHP_VERSION = Math.max(...SUPPORTED_PHP_VERSIONS);
+
+let getComposerError = "";
+
+/**
+ * Detect the minimum PHP version from the composer.json file
+ * @return {number|null} The PHP version to use in the composer.json file, null when not found
+ */
+function getComposerPhpVersion() {
+  // Try to find composer.json
+  const currentDir = process.cwd();
+  let composerPath = null;
+
+  const directComposerPath = path.join(currentDir, "composer.json");
+  if (fs.existsSync(directComposerPath)) {
+    composerPath = directComposerPath;
+  }
+
+  if (!composerPath) {
+    let searchDir = path.dirname(currentDir);
+    while (searchDir !== path.parse(searchDir).root) {
+      const potentialComposerPath = path.join(searchDir, "composer.json");
+      if (fs.existsSync(potentialComposerPath)) {
+        composerPath = potentialComposerPath;
+        break;
+      }
+      searchDir = path.dirname(searchDir);
+    }
+  }
+
+  if (composerPath) {
+    try {
+      const fileContent = fs.readFileSync(composerPath, "utf8");
+      const composerJson = JSON.parse(fileContent);
+
+      if (composerJson.require && composerJson.require.php) {
+        // Check for a wildcard pattern like "7.*"
+        const wildcardMatch = composerJson.require.php.match(
+          /^(?:[^0-9]*)?([0-9]+)\.\*/
+        );
+        if (wildcardMatch) {
+          return parseFloat(`${wildcardMatch[1]}.0`);
+        }
+
+        // Extract version from composer semver format
+        const versionMatch = composerJson.require.php.match(
+          /^(?:[^0-9]*)?([0-9]+)\.([0-9]+)/
+        );
+
+        if (versionMatch) {
+          return parseFloat(`${versionMatch[1]}.${versionMatch[2]}`);
+        } else {
+          getComposerError = `Could not decode PHP version (${composerJson.require.php}})`;
+          return null;
+        }
+      }
+    } catch (e) {
+      getComposerError = `Error reading composer.json: ${e.message}`;
+    }
+  } else {
+    getComposerError = "Could not find composer.json";
+  }
+
+  return null;
+}
+
+export { getComposerPhpVersion };
+
+/**
+ * Resolve the PHP version to a number based on the provided options.
+ *
+ */
+export function resolvePhpVersion(options) {
+  if (!options) {
+    return;
+  }
+  if (options.phpVersion === "auto") {
+    options.phpVersion =
+      getComposerPhpVersion() ?? LATEST_SUPPORTED_PHP_VERSION;
+  } else if (options.phpVersion === "composer") {
+    const v = getComposerPhpVersion();
+    if (v === null) {
+      throw new Error(
+        `Could not determine PHP version from composer; ${getComposerError}`
+      );
+    }
+    options.phpVersion = v;
+  } else {
+    options.phpVersion = parseFloat(options.phpVersion);
+  }
+}
+
 export default {
   phpVersion: {
     since: "0.13.0",
     category: CATEGORY_PHP,
     type: "choice",
-    default: "7.0",
+    default: "auto",
     description: "Minimum target PHP version.",
     choices: [
-      { value: "5.0" },
-      { value: "5.1" },
-      { value: "5.2" },
-      { value: "5.3" },
-      { value: "5.4" },
-      { value: "5.5" },
-      { value: "5.6" },
-      { value: "7.0" },
-      { value: "7.1" },
-      { value: "7.2" },
-      { value: "7.3" },
-      { value: "7.4" },
-      { value: "8.0" },
-      { value: "8.1" },
-      { value: "8.2" },
+      ...SUPPORTED_PHP_VERSIONS.map((v) => ({ value: v.toFixed(1) })),
+      {
+        value: "composer",
+        description: "Use the PHP version defined in composer.json",
+      },
+      {
+        value: "auto",
+        description: `Try composer.json, else latest PHP Version (${LATEST_SUPPORTED_PHP_VERSION})`,
+      },
     ],
   },
   trailingCommaPHP: {

package/src/parser.mjs

@@ -1,4 +1,6 @@
 import engine from "php-parser";
+import { LATEST_SUPPORTED_PHP_VERSION } from "./options.mjs";
+import { resolvePhpVersion } from "./options.mjs";
 
 function parse(text, opts) {
   const inMarkdown = opts && opts.parentParser === "markdown";
@@ -6,6 +8,7 @@ function parse(text, opts) {
   if (!text && inMarkdown) {
     return "";
   }
+  resolvePhpVersion(opts);
 
   // Todo https://github.com/glayzzle/php-parser/issues/170
   text = text.replace(/\?>\n<\?/g, "?>\n___PSEUDO_INLINE_PLACEHOLDER___<?");
@@ -14,6 +17,7 @@ function parse(text, opts) {
   const parser = new engine({
     parser: {
       extractDoc: true,
+      version: `${LATEST_SUPPORTED_PHP_VERSION}`,
     },
     ast: {
       withPositions: true,

package/src/printer.mjs

@@ -65,16 +65,19 @@ const {
   isPreviousLineEmpty,
 } = prettierUtil;
 
-function isMinVersion(actualVersion, requiredVersion) {
-  return parseFloat(actualVersion) >= parseFloat(requiredVersion);
-}
-
+/**
+ * Determine if we should print a trailing comma based on the config & php version
+ *
+ * @param options {object} Prettier Options
+ * @param requiredVersion {number}
+ * @returns {boolean}
+ */
 function shouldPrintComma(options, requiredVersion) {
   if (!options.trailingCommaPHP) {
     return false;
   }
 
-  return isMinVersion(options.phpVersion, requiredVersion);
+  return options.phpVersion >= requiredVersion;
 }
 
 function shouldPrintHardlineForOpenBrace(options) {
@@ -615,9 +618,9 @@ function printArgumentsList(path, options, print, argumentsKey = "arguments") {
   const lastArg = getLast(args);
 
   const maybeTrailingComma =
-    (shouldPrintComma(options, "7.3") &&
+    (shouldPrintComma(options, 7.3) &&
       ["call", "new", "unset", "isset"].includes(node.kind)) ||
-    (shouldPrintComma(options, "8.0") &&
+    (shouldPrintComma(options, 8.0) &&
       ["function", "closure", "method", "arrowfunc", "attribute"].includes(
         node.kind
       ))
@@ -1189,7 +1192,7 @@ function printAttrs(path, options, print, { inline = false } = {}) {
     allAttrs.push(
       group([
         indent(attrGroup),
-        ifBreak(shouldPrintComma(options, "8.0") ? "," : ""),
+        ifBreak(shouldPrintComma(options, 8.0) ? "," : ""),
         softline,
         "]",
         inline ? ifBreak(softline, " ") : "",
@@ -1661,11 +1664,7 @@ function printNode(path, options, print) {
           join([",", line], path.map(print, "items")),
         ]),
         node.name
-          ? [
-              ifBreak(shouldPrintComma(options, "7.2") ? "," : ""),
-              softline,
-              "}",
-            ]
+          ? [ifBreak(shouldPrintComma(options, 7.2) ? "," : ""), softline, "}"]
           : "",
       ]);
     case "useitem":
@@ -2308,6 +2307,7 @@ function printNode(path, options, print) {
         node.final ? "final " : "",
         node.visibility ? [node.visibility, " "] : "",
         "const",
+        node.type ? [node.nullable ? " ?" : " ", print("type")] : "",
         firstVariable ? [" ", firstVariable] : "",
         indent(printed.slice(1).map((p) => [",", hardline, p])),
       ]);
@@ -2358,9 +2358,8 @@ function printNode(path, options, print) {
     case "list":
     case "array": {
       const useShortForm =
-        (node.kind === "array" && isMinVersion(options.phpVersion, "5.4")) ||
-        (node.kind === "list" &&
-          (node.shortForm || isMinVersion(options.phpVersion, "7.1")));
+        (node.kind === "array" && options.phpVersion >= 5.4) ||
+        (node.kind === "list" && (node.shortForm || options.phpVersion >= 7.1));
       const open = useShortForm ? "[" : [node.kind, "("];
       const close = useShortForm ? "]" : ")";
 
@@ -2410,7 +2409,7 @@ function printNode(path, options, print) {
           indent([softline, printArrayItems(path, options, print)]),
           needsForcedTrailingComma ? "," : "",
           ifBreak(
-            !needsForcedTrailingComma && shouldPrintComma(options, "5.0")
+            !needsForcedTrailingComma && shouldPrintComma(options, 5.0)
               ? [
                   lastElem && shouldPrintHardlineBeforeTrailingComma(lastElem)
                     ? hardline
@@ -2677,7 +2676,7 @@ function printNode(path, options, print) {
       if (parent.kind === "encapsedpart") {
         const parentParent = path.grandparent;
         let closingTagIndentation = 0;
-        const flexible = isMinVersion(options.phpVersion, "7.3");
+        const flexible = options.phpVersion >= 7.3;
         let linebreak = literalline;
         if (parentParent.type === "heredoc") {
           linebreak = flexible ? hardline : literalline;
@@ -2746,7 +2745,7 @@ function printNode(path, options, print) {
         case "string":
         case "shell":
         case "heredoc": {
-          const flexible = isMinVersion(options.phpVersion, "7.3");
+          const flexible = options.phpVersion >= 7.3;
           const linebreak = flexible ? hardline : literalline;
           return [
             getEncapsedQuotes(node),
@@ -2771,7 +2770,7 @@ function printNode(path, options, print) {
     case "magic":
       return node.value;
     case "nowdoc": {
-      const flexible = isMinVersion(options.phpVersion, "7.3");
+      const flexible = options.phpVersion >= 7.3;
       const linebreak = flexible ? hardline : literalline;
       return [
         "<<<'",