fix: support for php again

README.md

@@ -20,12 +20,4 @@ For best editing experience, the following settings are recommended:
 
 ## Supported languages
 
-JavaScript, TypeScript, Flow, JSX, JSON, CSS, SCSS, Less, HTML, Vue, Angular, GraphQL, Markdown, YAML, C#, Elm, Java, Twig, XML, Svelte
-
-## Important
-
-Because of breaking changes with Prettier v2, the following languages are currently not supported:
-
-- Php
-
-You can downgrade this extension to version 1.1.22 which still supports those languages.
+JavaScript, TypeScript, Flow, JSX, JSON, CSS, SCSS, Less, HTML, Vue, Angular, GraphQL, Markdown, YAML, C#, Elm, Java, Twig, XML, Svelte, Php

package.json

@@ -23,7 +23,7 @@
     "semantic-release": "^17.0.7",
     "semantic-release-vsce": "^3.0.1",
     "ts-loader": "^7.0.1",
-    "typescript": "^3.8.3",
+    "typescript": "^3.9.3",
     "webpack": "^5.0.0-beta.13",
     "webpack-bundle-analyzer": "^3.7.0",
     "webpack-cli": "^3.3.11"
@@ -54,7 +54,7 @@
     },
     {
       "path": "./dist/packages/server/dist/worker.js",
-      "maxSize": "7 kB",
+      "maxSize": "8 kB",
       "compression": "none"
     }
   ],

packages/extension-test/src/basic/format.test.ts

@@ -238,18 +238,18 @@ class HelloWorld {
     })
   })
 
-  // test('php', async () => {
-  //   await createTestFile('index.php')
-  //   const testCases: TestCase[] = [
-  //     {
-  //       input: `<?php echo '<p>Hello World</p>'  ; ?>`,
-  //       expect: `<?php echo '<p>Hello World</p>'; ?>\n`,
-  //     },
-  //   ]
-  //   await run(testCases, {
-  //     afterCommands,
-  //   })
-  // })
+  test('php', async () => {
+    await createTestFile('index.php')
+    const testCases: TestCase[] = [
+      {
+        input: `<?php echo '<p>Hello World</p>'  ; ?>`,
+        expect: `<?php echo '<p>Hello World</p>'; ?>\n`,
+      },
+    ]
+    await run(testCases, {
+      afterCommands,
+    })
+  })
 
   test('postcss', async () => {
     await createTestFile('index2.css')

packages/server/package.json

@@ -16,6 +16,6 @@
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.1",
     "@types/source-map-support": "^0.5.1",
-    "typescript": "^3.8.3"
+    "typescript": "^3.9.3"
   }
 }

packages/service/package.json

@@ -18,6 +18,7 @@
     "vscode-languageserver": "^6.1.1"
   },
   "dependencies": {
+    "@prettier/plugin-php": "^0.14.1",
     "@prettier/plugin-pug": "^1.2.0",
     "@prettier/plugin-ruby": "^0.18.1",
     "@prettier/plugin-xml": "^0.7.2",

packages/service/src/formatDocument.ts

@@ -98,10 +98,10 @@ const FORMATTING_MAP: { [key: string]: () => Promise<Formatter> } = {
     const { formatMdx } = await import('./plugins/mdx/mdx')
     return formatMdx
   },
-  // async php() {
-  //   const { formatPhp } = await import('./plugins/php/php')
-  //   return formatPhp
-  // },
+  async php() {
+    const { formatPhp } = await import('./plugins/php/php')
+    return formatPhp
+  },
   async postcss() {
     const { formatPostcss } = await import('./plugins/postcss/postcss')
     return formatPostcss

packages/service/src/plugins/csharp/csharp.ts

@@ -1,5 +1,5 @@
 import * as csharp from 'prettier-plugin-csharp'
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatCsharp: Formatter = format => (text, options) =>
+export const formatCsharp: Formatter = (format) => (text, options) =>
   format(text, { ...options, plugins: [csharp] })

packages/service/src/plugins/css/css.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatCss: Formatter = format => (text, options) =>
+export const formatCss: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/elm/elm.ts

@@ -1,5 +1,5 @@
 import * as elm from 'prettier-plugin-elm'
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatElm: Formatter = format => (text, options) =>
+export const formatElm: Formatter = (format) => (text, options) =>
   format(text, { ...options, plugins: [elm] })

packages/service/src/plugins/flow/flow.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatFlow: Formatter = format => (text, options) =>
+export const formatFlow: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/graphql/graphql.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatGraphql: Formatter = format => (text, options) =>
+export const formatGraphql: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/handlebars/handlebars.ts

@@ -1,5 +1,5 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatHandlebars: Formatter = format => (text, options) =>
+export const formatHandlebars: Formatter = (format) => (text, options) =>
   // @ts-ignore
   format(text, { ...options, parser: 'glimmer' })

packages/service/src/plugins/html/html.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatHtml: Formatter = format => (text, options) =>
+export const formatHtml: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/java/java.ts

@@ -1,5 +1,5 @@
 import * as java from 'prettier-plugin-java'
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatJava: Formatter = format => (text, options) =>
+export const formatJava: Formatter = (format) => (text, options) =>
   format(text, { ...options, plugins: [java] })

packages/service/src/plugins/javascript/javascript.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatJavascript: Formatter = format => (text, options) =>
+export const formatJavascript: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/javascriptreact/javascriptreact.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatJavascriptReact: Formatter = format => (text, options) =>
+export const formatJavascriptReact: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/json/json.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatJson: Formatter = format => (text, options) =>
+export const formatJson: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/jsonc/jsonc.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatJsonc: Formatter = format => (text, options) =>
+export const formatJsonc: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/less/less.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatLess: Formatter = format => (text, options) =>
+export const formatLess: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/markdown/markdown.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatMarkdown: Formatter = format => (text, options) =>
+export const formatMarkdown: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/mdx/mdx.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatMdx: Formatter = format => (text, options) =>
+export const formatMdx: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/php/php.ts

@@ -0,0 +1,5 @@
+import * as php from '@prettier/plugin-php'
+import type { Formatter } from '../pluginApi'
+
+export const formatPhp: Formatter = (format) => (text, options) =>
+  format(text, { ...options, plugins: [php] })

packages/service/src/plugins/pluginApi.ts

@@ -1,4 +1,4 @@
-import { Options } from 'prettier'
+import type { Options } from 'prettier'
 
 type Prettier = typeof import('prettier')
 

packages/service/src/plugins/postcss/postcss.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatPostcss: Formatter = format => (text, options) =>
+export const formatPostcss: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/scss/scss.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatScss: Formatter = format => (text, options) =>
+export const formatScss: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/svelte/svelte.ts

@@ -1,5 +1,5 @@
 import * as svelte from 'prettier-plugin-svelte'
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
 // TODO this has an implicit dependency on svelte, might be difficult to bundle
 export const formatSvelte: Formatter = (format) => (text, options) =>

packages/service/src/plugins/twig/twig.ts

@@ -1,5 +1,5 @@
 import * as twig from 'prettier-plugin-twig-melody'
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatTwig: Formatter = format => (text, options) =>
+export const formatTwig: Formatter = (format) => (text, options) =>
   format(text, { ...options, plugins: [twig] })

packages/service/src/plugins/typescript/typescript.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatTypescript: Formatter = format => (text, options) =>
+export const formatTypescript: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/typescriptreact/typescriptreact.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatTypescriptreact: Formatter = format => (text, options) =>
+export const formatTypescriptreact: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/vue/vue.ts

@@ -1,4 +1,4 @@
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatVue: Formatter = format => (text, options) =>
+export const formatVue: Formatter = (format) => (text, options) =>
   format(text, options)

packages/service/src/plugins/xml/xml.ts

@@ -1,5 +1,5 @@
 import * as xml from '@prettier/plugin-xml'
-import { Formatter } from '../pluginApi'
+import type { Formatter } from '../pluginApi'
 
-export const formatXml: Formatter = format => (text, options) =>
+export const formatXml: Formatter = (format) => (text, options) =>
   format(text, { ...options, plugins: [xml] })