@prettier/plugin-php 0.22.4 → 0.23.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>
 
@@ -227,10 +224,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 +269,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.23.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,11 @@
-import { getPrecedence, shouldFlatten, isBitwiseOperator } from "./util.mjs";
-
-function needsParens(path) {
+import {
+  getPrecedence,
+  shouldFlatten,
+  isBitwiseOperator,
+  isMinVersion,
+} from "./util.mjs";
+
+function needsParens(path, options) {
   const { parent } = path;
 
   if (!parent) {
@@ -128,13 +133,16 @@ function needsParens(path) {
     }
     case "clone":
     case "new": {
+      const requiresParens =
+        node.kind === "clone" ||
+        (node.kind === "new" && !isMinVersion(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

@@ -23,6 +23,8 @@ export default {
       { value: "8.0" },
       { value: "8.1" },
       { value: "8.2" },
+      { value: "8.3" },
+      { value: "8.4" },
     ],
   },
   trailingCommaPHP: {

package/src/parser.mjs

@@ -1,4 +1,5 @@
 import engine from "php-parser";
+import options from "./options.mjs";
 
 function parse(text, opts) {
   const inMarkdown = opts && opts.parentParser === "markdown";
@@ -10,10 +11,15 @@ function parse(text, opts) {
   // Todo https://github.com/glayzzle/php-parser/issues/170
   text = text.replace(/\?>\n<\?/g, "?>\n___PSEUDO_INLINE_PLACEHOLDER___<?");
 
+  const latestSupportedPhpVersion = Math.max(
+    ...options.phpVersion.choices.map((c) => parseFloat(c.value))
+  );
+
   // initialize a new parser instance
   const parser = new engine({
     parser: {
       extractDoc: true,
+      version: `${latestSupportedPhpVersion}`,
     },
     ast: {
       withPositions: true,

package/src/printer.mjs

@@ -37,6 +37,7 @@ import {
   isReferenceLikeNode,
   normalizeMagicMethodName,
   isSimpleCallArgument,
+  isMinVersion,
 } from "./util.mjs";
 
 const {
@@ -65,10 +66,6 @@ const {
   isPreviousLineEmpty,
 } = prettierUtil;
 
-function isMinVersion(actualVersion, requiredVersion) {
-  return parseFloat(actualVersion) >= parseFloat(requiredVersion);
-}
-
 function shouldPrintComma(options, requiredVersion) {
   if (!options.trailingCommaPHP) {
     return false;
@@ -2308,6 +2305,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])),
       ]);

package/src/util.mjs

@@ -709,6 +709,10 @@ function memoize(fn) {
   };
 }
 
+function isMinVersion(actualVersion, requiredVersion) {
+  return parseFloat(actualVersion) >= parseFloat(requiredVersion);
+}
+
 export {
   printNumber,
   getPrecedence,
@@ -740,4 +744,5 @@ export {
   normalizeMagicMethodName,
   isSimpleCallArgument,
   memoize,
+  isMinVersion,
 };