From ed94779bffb571e917204a834af8e74d925b3196 Mon Sep 17 00:00:00 2001 From: wangruichao Date: Wed, 21 Oct 2020 20:58:19 +0800 Subject: [PATCH 1/3] fix: add explanation for php document Add some explanation for phpactor server and its prerequisites. --- modules/lang/php/README.org | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/lang/php/README.org b/modules/lang/php/README.org index 22f7b8f56..d731be6c3 100644 --- a/modules/lang/php/README.org +++ b/modules/lang/php/README.org @@ -46,7 +46,7 @@ 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. Requires the ~:tools lsp~ module - and the phpactor server to be installed on your system. + 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]] @@ -65,7 +65,9 @@ This module has no dedicated maintainers. * Prerequisites ** PHP -To get started with PHP, you'll need ~php~ (5.3+) and ~composer~: +To get started with PHP, you'll need ~php~ (5.3+) and ~composer~. + +Note: in order to make full use of phpactor server, ~php~ (7.3+) is recommended. *** MacOS PHP 5.5 comes prepackaged with newer versions of MacOS. These instructions are provided for reference: From c356d75d528b5d54a422ab7face40e32ef245af6 Mon Sep 17 00:00:00 2001 From: wangruichao Date: Thu, 22 Oct 2020 18:28:19 +0800 Subject: [PATCH 2/3] fix: add info for intelephense Signed-off-by: wangruichao <793160615@qq.com> --- modules/lang/php/README.org | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/modules/lang/php/README.org b/modules/lang/php/README.org index d731be6c3..2d12c6062 100644 --- a/modules/lang/php/README.org +++ b/modules/lang/php/README.org @@ -45,9 +45,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. 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]] @@ -67,7 +66,9 @@ This module has no dedicated maintainers. ** PHP To get started with PHP, you'll need ~php~ (5.3+) and ~composer~. -Note: in order to make full use of phpactor server, ~php~ (7.3+) is recommended. +Note for =+lsp=: +1. In order to make full use of phpactor server, ~php~ (7.3+) is recommended. +2. If you use intelephense, ~node~ and ~npm~ is needed. *** MacOS PHP 5.5 comes prepackaged with newer versions of MacOS. These instructions are provided for reference: @@ -76,16 +77,26 @@ PHP 5.5 comes prepackaged with newer versions of MacOS. These instructions are p brew tap homebrew/homebrew-php brew install php71 # or php53, php54, php55 brew install composer + +# If you use intelephense: +brew install node +brew install npm #+END_SRC *** Arch Linux #+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 *** openSUSE #+BEGIN_SRC sh :dir /sudo:: sudo zypper install php-composer + +# If you use intelephense: +sudo zypper install nodejs npm #+END_SRC ** Dependencies @@ -110,6 +121,8 @@ Ensure that ~\~/.composer/vendor/bin~ is in ~PATH~: export PATH="~/.composer/vendor/bin:$PATH" #+END_SRC +By the way, if you use intelephense, running =M-x lsp-install-server= and +choose ~iph~ to install lsp-intelephense. * TODO Features # An in-depth list of features, how to use them, and their dependencies. From bb29a84521773ea8788f32aa3ca1bc80ae8b6b83 Mon Sep 17 00:00:00 2001 From: wangruichao Date: Wed, 28 Oct 2020 16:24:20 +0800 Subject: [PATCH 3/3] fix: fix grammar misuse Signed-off-by: wangruichao <793160615@qq.com> --- modules/lang/php/README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/php/README.org b/modules/lang/php/README.org index 2d12c6062..e4a183229 100644 --- a/modules/lang/php/README.org +++ b/modules/lang/php/README.org @@ -68,7 +68,7 @@ To get started with PHP, you'll need ~php~ (5.3+) and ~composer~. Note for =+lsp=: 1. In order to make full use of phpactor server, ~php~ (7.3+) is recommended. -2. If you use intelephense, ~node~ and ~npm~ is needed. +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: