diff --git a/lua/ow/lsp/config/intelephense.lua b/lua/ow/lsp/config/intelephense.lua index 84eb475..971f195 100644 --- a/lua/ow/lsp/config/intelephense.lua +++ b/lua/ow/lsp/config/intelephense.lua @@ -10,7 +10,7 @@ return { dependencies = { "npm", }, - mason = { "intelephense", dependencies = { {"phpcs", "pretty-php" } } }, + mason = { "intelephense", dependencies = { "phpcs" } }, linters = { { cmd = { @@ -39,35 +39,22 @@ return { mode = "n", lhs = "lf", rhs = function() + vim.lsp.buf.format() utils.format({ cmd = { - "pretty-php", - "--psr12", - "--enable=align-comments", - "-qq", - "-", + "php-cs-fixer", + "fix", + "%file%", + "--quiet", }, - output = "stdout", - }) - end, - }, - { - mode = "x", - lhs = "lf", - rhs = function() - utils.format({ - cmd = { - "pretty-php", - "--psr12", - "--enable=align-comments", - "-qq", - "-", - }, - output = "stdout", + output = "in_place", + ignore_stderr = true, + env = { PHP_CS_FIXER_IGNORE_ENV = "1" }, }) end, }, }, + settings_file = ".intelephense.json", lspconfig = { filetypes = { "php", @@ -77,10 +64,11 @@ return { settings = { intelephense = { environment = { - phpVersion = "7.4", + phpVersion = "8.4", }, format = { - enable = false, + enable = true, + braces = "psr12", }, }, },