From b80a993175cbd2e59d5140247a16ebc901ba61e0 Mon Sep 17 00:00:00 2001 From: Ellis Kenyo Date: Wed, 15 Sep 2021 20:22:33 +0100 Subject: [PATCH 1/6] feat(php): add composer.el --- modules/lang/php/config.el | 18 ++++++++++++++++++ modules/lang/php/packages.el | 1 + 2 files changed, 19 insertions(+) diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el index 8ec078bdd..2ca2b5d8a 100644 --- a/modules/lang/php/config.el +++ b/modules/lang/php/config.el @@ -127,6 +127,24 @@ :mode "\\.hh$") +(use-package! composer + :defer t + :init + (map! :after php-mode + :localleader + :map php-mode-map + :prefix ("c" . "composer") + "c" #'composer + "i" #'composer-install + "r" #'composer-require + "u" #'composer-update + "d" #'composer-dump-autoload + "s" #'composer-run-script + "v" #'composer-run-vendor-bin-command + "o" #'composer-find-json-file + "l" #'composer-view-lock-file)) + + ;; ;; Projects diff --git a/modules/lang/php/packages.el b/modules/lang/php/packages.el index a1dd63ff9..d5244fe58 100644 --- a/modules/lang/php/packages.el +++ b/modules/lang/php/packages.el @@ -8,6 +8,7 @@ (package! php-mode :pin "535aec81739e8e766e0420fda616efc8846f2911") (package! php-refactor-mode :pin "7a794b0618df2882b1bd586fdd698dba0bc5130d") (package! phpunit :pin "fe6bc91c3bd8b329c6d26ad883a025f06b5121ee") +(package! composer :pin "7c7f89df226cac69664d7eca5e913b544dc475c5") (when (featurep! +hack) (package! hack-mode From 18941dacad351e03ff083bf469d479cdb44d86a2 Mon Sep 17 00:00:00 2001 From: Ellis Kenyo Date: Wed, 15 Sep 2021 20:22:52 +0100 Subject: [PATCH 2/6] docs(php): expand readme --- modules/lang/php/README.org | 129 +++++++++++++++++++++++++++++++----- 1 file changed, 113 insertions(+), 16 deletions(-) diff --git a/modules/lang/php/README.org b/modules/lang/php/README.org index e945cacaf..df7d51eed 100644 --- a/modules/lang/php/README.org +++ b/modules/lang/php/README.org @@ -15,8 +15,13 @@ - [[#opensuse][openSUSE]] - [[#dependencies][Dependencies]] - [[#features][Features]] + - [[#lsp-support][LSP Support]] + - [[#phpunit][PHPUnit]] + - [[#composer][Composer]] - [[#configuration][Configuration]] + - [[#docker-compose][Docker Compose]] - [[#troubleshooting][Troubleshooting]] + - [[#im-missing-functionality-on-lsp-mode]["I'm missing functionality on lsp-mode"]] * Description This module adds support for PHP 5.3+ (including PHP7). @@ -27,6 +32,7 @@ This module adds support for PHP 5.3+ (including PHP7). + Code refactoring commands (~php-refactor-mode~) + Unit-test commands (~phpunit~) + Support for ~laravel~ and ~composer~ projects (with project-specific snippets) ++ Shortcuts for composer commands + [[../../editor/file-templates/templates/php-mode][File templates]] + [[https://github.com/hlissner/doom-snippets/tree/master/php-mode][Snippets]] @@ -45,8 +51,8 @@ This module has no dedicated maintainers. ** Module Flags + =+hack= Add support for the [[https://hacklang.org/][Hack dialect of PHP]] by Facebook. -+ =+lsp= Enable LSP support through phpactor or intelephense. Requires the - ~:tools lsp~ module and the [[https://phpactor.readthedocs.io/en/develop/usage/standalone.html][phpactor server]] to be installed on your system. ++ =+lsp= Enable LSP support through phpactor or intelephense. Requires the ~:tools + lsp~ module and the [[https://phpactor.readthedocs.io/en/develop/usage/standalone.html][phpactor server]] to be installed on your system. ** Plugins + [[https://github.com/tomterl/php-boris][async]] + [[https://github.com/tomterl/php-boris][php-boris]] @@ -54,6 +60,7 @@ This module has no dedicated maintainers. + [[https://github.com/emacs-php/php-mode][php-mode]] + [[https://github.com/keelerm84/php-refactor-mode.el][php-refactor-mode]] + [[https://github.com/nlamirault/phpunit.el][phpunit]] ++ [[https://github.com/emacs-php/composer.el][composer.el]] + =+hack= + [[https://github.com/hhvm/hack-mode][hack-mode]] + =+lsp= @@ -71,7 +78,8 @@ Note for =+lsp=: 2. If you use intelephense, ~node~ and ~npm~ are needed. *** MacOS -PHP 5.5 comes prepackaged with newer versions of MacOS. These instructions are provided for reference: +PHP 5.5 comes prepackaged with newer versions of MacOS. These instructions are +provided for reference: #+BEGIN_SRC sh :tangle (if (doom-system-os 'macos) "yes") brew tap homebrew/homebrew-php @@ -106,21 +114,23 @@ This module has no required dependencies, but it has a couple optional ones. + ~phpctags~ (better code completion) + ~phpunit~ (unit test commands) + ~php-cs-fixer~ and ~@prettier/plugin-php~ (for code formatting) ++ ~phpactor~ (for LSP if intelephense isn't desired) #+BEGIN_SRC sh composer global require \ d11wtq/boris \ phpunit/phpunit \ techlivezheng/phpctags \ - friendsofphp/php-cs-fixer + friendsofphp/php-cs-fixer \ + phpactor/phpactor # Needed by php-cs-fixer, otherwise you'll get "Couldn't resolve parser # 'php'" errors npm install -g @prettier/plugin-php #+END_SRC -You must ensure that ~\~/.composer/vendor/bin~ is in ~PATH~, so these -executables are visible to Emacs: +You must ensure that ~~/.composer/vendor/bin~ is in ~PATH~, so these executables are +visible to Emacs: #+BEGIN_SRC sh # place this in your profile file, like ~/.bash_profile or ~/.zshenv @@ -130,16 +140,103 @@ export PATH="~/.composer/vendor/bin:$PATH" You may also need to regenerate your envvar file by running ~doom env~ on the command line. -#+begin_quote -To use intelephense instead of , run =M-x lsp-install-server= and choose ~iph~ to -install lsp-intelephense. -#+end_quote +*NOTE* phpactor doesn't have to be installed via =composer=, just has to exist in +your =$PATH=. -* TODO Features -# An in-depth list of features, how to use them, and their dependencies. +* Features +** LSP Support +There are a number of currently supported LSP servers: -* TODO Configuration -# How to configure this module, including common problems and how to address them. ++ [[https://emacs-lsp.github.io/lsp-mode/page/lsp-intelephense/][Intelephense]] (_Recommended_) ++ [[https://emacs-lsp.github.io/lsp-mode/page/lsp-phpactor/][phpactor]] ++ [[https://emacs-lsp.github.io/lsp-mode/page/lsp-serenata/][Serenata]] ++ [[https://emacs-lsp.github.io/lsp-mode/page/lsp-php/][felixbecker]] (Considered unsupported) -* TODO Troubleshooting -# Common issues and their solution, or places to look for help. +Intelephense is currently the only server that supports automatic installation, +which will trigger either when you open a PHP project or manually invoke +=lsp-install-server= through =M-x=. + +The others have to be installed manually and added to your =$PATH=. + +** PHPUnit +This module provides an interface to PHPUnit through a number of commands as +detailed below. By default, it loads configuration from the root ~phpunit.xml~. + ++ ~phpunit-current-project~ Launch all tests for the project ++ ~phpunit-current-class~ Launch all tests for the current class/fixture ++ ~phpunit-current-test~ Launch the current test at point + +If for some reason, the default ~phpunit.xml~ is in a different location (or you +use the ~phpunit.xml.dist~ convention) , the path can be changed via +=phpunit-configuration-file= + +#+begin_src emacs-lisp +(setq phpunit-configuration-file "phpunit.xml") +#+end_src + +** Composer +This module provides several convenience methods for triggering composer +commands: + +| Binding | Function | +|---------------------+---------------------------------| +| ~ m c c~ | ~composer~ | +| ~ m c i~ | ~composer-install~ | +| ~ m c r~ | ~composer-require~ | +| ~ m c u~ | ~composer-update~ | +| ~ m c d~ | ~composer-dump-autoload~ | +| ~ m c s~ | ~composer-run-scripts~ | +| ~ m c v~ | ~composer-run-vendor-bin-command~ | +| ~ m c o~ | ~composer-find-json-file~ | +| ~ m c l~ | ~composer-view-lock-file~ | + +These are all invokable via =M-x= too. + +* Configuration +** Docker Compose +A lot of projects rely on running inside docker compose (ie Laravel), and as +such a minor mode has been configured to attempt to run tests inside the =php-fpm= +(by default) container. + +If for some reason you wish to specify a different container, modify the +~+php/default-docker-container~ variable (ideally inside a ~.dir-locals.el~ file) + +#+begin_src emacs-lisp +((php-mode . ((+php/default-docker-container . "php-octane")))) +#+end_src + +* Troubleshooting +** "I'm missing functionality on lsp-mode" +Unfortunately, [[https://intelephense.com/][intelephense]] currently operates under a "freemium" model, and as +such requires a license for extended features. Once purchased, this can be +(insecurely) added directly to your config: + +#+begin_src emacs-lisp +(setq lsp-intelephense-licence-key "") +#+end_src + +A more recommended approach would be to utilise Emacs' own ~auth-sources~ for +storing authentication info, which can also be encrypted. + +Create a file in your home directory (which can optionally be encrypted, verify +your ~auth-sources~ has the correct values) called ~~/.authinfo~ + +#+begin_src +machine * login intelephense password +#+end_src + +And add the following to your config + +#+BEGIN_SRC emacs-lisp +(defun my-fetch-password (&rest params) + (require 'auth-source) + (let ((match (car (apply #'auth-source-search params)))) + (if match + (let ((secret (plist-get match :secret))) + (if (functionp secret) + (funcall secret) + secret)) + (error "Password not found for %S" params)))) + +(setq lsp-intelephense-license-key (my-fetch-password :user intelephense)) +#+END_SRC From 8f5ce2a9def8d98ef4c124fa7c08898e1e799055 Mon Sep 17 00:00:00 2001 From: Ellis Kenyo Date: Wed, 15 Sep 2021 20:22:59 +0100 Subject: [PATCH 3/6] feat(php): add project mode for phpunit/docker --- modules/lang/php/config.el | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el index 2ca2b5d8a..c75c4513a 100644 --- a/modules/lang/php/config.el +++ b/modules/lang/php/config.el @@ -3,6 +3,9 @@ (defvar +php--company-backends nil "List of company backends to use in `php-mode'.") +(defvar +php/default-docker-container "php-fpm" + "The default docker container to run commands in") + (after! projectile (add-to-list 'projectile-project-root-files "composer.json")) @@ -15,7 +18,7 @@ :config ;; Disable HTML compatibility in php-mode. `web-mode' has superior support for ;; php+html. Use the .phtml extension instead. - (setq php-template-compatibility nil) + (setq php-mode-template-compatibility nil) (set-docsets! 'php-mode "PHP" "PHPUnit" "Laravel" "CakePHP" "CodeIgniter" "Doctrine_ORM") (set-repl-handler! 'php-mode #'php-boris) @@ -23,7 +26,7 @@ (set-formatter! 'php-mode #'php-cs-fixer-fix) (set-ligatures! 'php-mode ;; Functional - :lambda "function()" + :lambda "function()" :lambda "fn" :def "function" ;; Types :null "null" @@ -155,3 +158,10 @@ (def-project-mode! +php-composer-mode :modes '(web-mode php-mode) :files ("composer.json")) + +(def-project-mode! +phpunit-docker-compose-mode + :modes '(php-mode docker-compose-mode) + :files (and "phpunit.xml" "docker-compose.yml") + :on-enter + (setq phpunit-args `("exec" ,+php/default-docker-container "php" "vendor/bin/phpunit") + phpunit-executable (executable-find "docker-compose"))) From bfa55ba34c0153e5ac64db34dc12577eeb9752f7 Mon Sep 17 00:00:00 2001 From: Ellis Kenyo Date: Tue, 14 Sep 2021 18:22:54 +0100 Subject: [PATCH 4/6] feat(php): add rainbow-delimiter-mode --- modules/lang/php/config.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el index c75c4513a..1e089b7d1 100644 --- a/modules/lang/php/config.el +++ b/modules/lang/php/config.el @@ -15,6 +15,7 @@ (use-package! php-mode :mode "\\.inc\\'" + :hook (php-mode . rainbow-delimiters-mode) :config ;; Disable HTML compatibility in php-mode. `web-mode' has superior support for ;; php+html. Use the .phtml extension instead. From 9092b466ee26c11ee5d03292a4ff040486f7e965 Mon Sep 17 00:00:00 2001 From: Ellis Kenyo Date: Wed, 15 Sep 2021 20:10:42 +0100 Subject: [PATCH 5/6] docs(php): adjust case on babel blocks --- modules/lang/php/README.org | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/lang/php/README.org b/modules/lang/php/README.org index df7d51eed..d0b2c6d92 100644 --- a/modules/lang/php/README.org +++ b/modules/lang/php/README.org @@ -81,7 +81,7 @@ Note for =+lsp=: PHP 5.5 comes prepackaged with newer versions of MacOS. These instructions are provided for reference: -#+BEGIN_SRC sh :tangle (if (doom-system-os 'macos) "yes") +#+begin_src sh :tangle (if (doom-system-os 'macos) "yes") brew tap homebrew/homebrew-php brew install php71 # or php53, php54, php55 brew install composer @@ -89,23 +89,23 @@ brew install composer # If you use intelephense: brew install node brew install npm -#+END_SRC +#+end_src *** Arch Linux -#+BEGIN_SRC sh :dir /sudo:: :tangle (if (doom-system-os 'arch) "yes") +#+begin_src sh :dir /sudo:: :tangle (if (doom-system-os 'arch) "yes") sudo pacman --needed --noconfirm -S php composer # or php53, php54, php55 # If you use intelephense: sudo pacman -S nodejs npm -#+END_SRC +#+end_src *** openSUSE -#+BEGIN_SRC sh :dir /sudo:: +#+begin_src sh :dir /sudo:: sudo zypper install php-composer # If you use intelephense: sudo zypper install nodejs npm -#+END_SRC +#+end_src ** Dependencies This module has no required dependencies, but it has a couple optional ones. @@ -116,7 +116,7 @@ This module has no required dependencies, but it has a couple optional ones. + ~php-cs-fixer~ and ~@prettier/plugin-php~ (for code formatting) + ~phpactor~ (for LSP if intelephense isn't desired) -#+BEGIN_SRC sh +#+begin_src sh composer global require \ d11wtq/boris \ phpunit/phpunit \ @@ -127,15 +127,15 @@ composer global require \ # Needed by php-cs-fixer, otherwise you'll get "Couldn't resolve parser # 'php'" errors npm install -g @prettier/plugin-php -#+END_SRC +#+end_src You must ensure that ~~/.composer/vendor/bin~ is in ~PATH~, so these executables are visible to Emacs: -#+BEGIN_SRC sh +#+begin_src sh # place this in your profile file, like ~/.bash_profile or ~/.zshenv export PATH="~/.composer/vendor/bin:$PATH" -#+END_SRC +#+end_src You may also need to regenerate your envvar file by running ~doom env~ on the command line. @@ -227,7 +227,7 @@ machine * login intelephense password And add the following to your config -#+BEGIN_SRC emacs-lisp +#+begin_src emacs-lisp (defun my-fetch-password (&rest params) (require 'auth-source) (let ((match (car (apply #'auth-source-search params)))) @@ -239,4 +239,4 @@ And add the following to your config (error "Password not found for %S" params)))) (setq lsp-intelephense-license-key (my-fetch-password :user intelephense)) -#+END_SRC +#+end_src From a4e6de722da3c394d03c3e67547daebe40e9f1e4 Mon Sep 17 00:00:00 2001 From: Ellis Kenyo Date: Wed, 15 Sep 2021 20:11:12 +0100 Subject: [PATCH 6/6] feat(php): add default docker compose file --- modules/lang/php/config.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el index 1e089b7d1..78623c4a2 100644 --- a/modules/lang/php/config.el +++ b/modules/lang/php/config.el @@ -3,8 +3,11 @@ (defvar +php--company-backends nil "List of company backends to use in `php-mode'.") -(defvar +php/default-docker-container "php-fpm" - "The default docker container to run commands in") +(defvar +php-default-docker-container "php-fpm" + "The default docker container to run commands in.") + +(defvar +php-default-docker-compose "docker-compose.yml" + "Path to docker-compose file.") (after! projectile (add-to-list 'projectile-project-root-files "composer.json")) @@ -162,7 +165,7 @@ (def-project-mode! +phpunit-docker-compose-mode :modes '(php-mode docker-compose-mode) - :files (and "phpunit.xml" "docker-compose.yml") + :files (and "phpunit.xml" (or +php-default-docker-compose "docker-compose.yml")) :on-enter - (setq phpunit-args `("exec" ,+php/default-docker-container "php" "vendor/bin/phpunit") + (setq phpunit-args `("exec" ,+php-default-docker-container "php" "vendor/bin/phpunit") phpunit-executable (executable-find "docker-compose")))