diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 00000000..e873d9b5 --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,79 @@ +# Authors + +## Author + +- [Turadg Aleahmad](https://github.com/turadg) (Original Author) +- [Daniel Hackney](https://github.com/haxney) (Integrated with CC Mode) + +## Maintainer + +- [USAMI Kenta (@zonuexe)](https://github.com/zonuexe) + +## Retired Maintainers + +- [Aaron S. Hawley](https://users.ninthfloor.org/~ashawley/) +- [Lennart Borgman](https://www.emacswiki.org/emacs/LennartBorgman) +- [Eric James Michael Ritz](https://github.com/ejmr) +- [Syohei Yoshida](https://syohex.org/) + +## Contributors + +All contributors listed below improved PHP Mode as well. + +Names Sorted Alphabetically: + +- Alan Pearce +- Andreas Röhler +- Andrei Chițu +- Bence Kalmar +- Bob W. Hogg +- Carl Groner +- Charlie McMackin +- Christian Albrecht +- Daniel Hackney +- David Arroyo Menéndez +- David Maus +- Demis Balbach +- Elis Axelsson +- Emanuele Tomasi +- Engelke Eschner +- Eric James Michael Ritz +- François-Xavier Bois +- Gu Weigang +- Herbert Jones +- Hernawan Fa'iz Abdillah +- Jacek Wysocki +- Jakub Jankiewicz +- James Laver +- Jeff Beeman +- Joe Wreschnig +- Jon Dufresne +- Joris Steyn +- Marcin Antczak +- Mark A. Hershberger +- Maël Nison +- Michael Dwyer +- Michael Stolovitzsky +- Michele Bini +- Nate Eagleson +- Nicholas D Steeves +- Olaf The Viking +- Peter Oliver +- Philippe Ivaldi +- Sebastian Wiesner +- Serghei Iakovlev +- Syohei YOSHIDA +- Tim Landscheidt +- Tom Willemsen +- U-CPT\deb +- USAMI Kenta +- fabacino +- fallchildren +- flack +- l3msh0 +- phil-s +- takeokunn +- tangxinfa +- tijsmallaerts +- zapad +- 顾伟刚 diff --git a/AUTHORS.md.in b/AUTHORS.md.in new file mode 100644 index 00000000..130ff496 --- /dev/null +++ b/AUTHORS.md.in @@ -0,0 +1,24 @@ +# Authors + +## Author + +- [Turadg Aleahmad](https://github.com/turadg) (Original Author) +- [Daniel Hackney](https://github.com/haxney) (Integrated with CC Mode) + +## Maintainer + +- [USAMI Kenta (@zonuexe)](https://github.com/zonuexe) + +## Retired Maintainers + +- [Aaron S. Hawley](https://users.ninthfloor.org/~ashawley/) +- [Lennart Borgman](https://www.emacswiki.org/emacs/LennartBorgman) +- [Eric James Michael Ritz](https://github.com/ejmr) +- [Syohei Yoshida](https://syohex.org/) + +## Contributors + +All contributors listed below improved PHP Mode as well. + +Names Sorted Alphabetically: + diff --git a/Makefile b/Makefile index bb837709..5dc3f21e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,18 @@ ELCS = $(ELS:.el=.elc) %.elc: %.el $(EMACS) -Q -batch -L . -f batch-byte-compile $< -all: autoloads $(ELCS) +all: autoloads $(ELCS) authors + +authors: AUTHORS.md + +.PHONY: AUTHORS.md +AUTHORS.md: AUTHORS.md.in + @printf "Generating AUTHORS.md file..." + @test -d .git \ + && (cat $< > $@ \ + && git log --pretty=format:'- %aN' | sort -u >> $@ \ + && printf "FINISHED\n" ; ) \ + || printf "FAILED (non-fatal)\n" autoloads: $(AUTOLOADS) @@ -40,4 +51,4 @@ test: clean all touch tests/project/1/.git $(EMACS) -Q -batch -L . -l tests/php-mode-test.el -f ert-run-tests-batch-and-exit -.PHONY: all autoloads clean test +.PHONY: all authors autoloads clean test diff --git a/README.ja.md b/README.ja.md index b7530b95..4f8bdf53 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,4 +1,5 @@ -# Emacs PHP Mode +
+

Emacs PHP Mode

[![Emacs: 26.3](https://img.shields.io/badge/Emacs-26.3-blue.svg)](https://www.gnu.org/software/emacs/) [![lang: PHP 7](https://img.shields.io/badge/lang-PHP%207-brightgreen.svg)](http://php.net/manual/migration70.php) @@ -8,22 +9,11 @@ [![melpa stable badge][melpa-stable-badge]][melpa-stable-link] [![GPL v3](https://img.shields.io/badge/license-GPL_v3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.txt) -GNU EmacsでのPHPコーディングを支援するメジャーモードの開発プロジェクトです。 -これまで、以下の人々の作業をもとにフォークされました。 +A powerful and flexible Emacs major mode for editing PHP scripts - 1. Turadg Aleahmad (Original Author) - 2. Aaron S. Hawley - 3. Lennart Borgman - 4. Eric James Michael Ritz - 5. Syohei Yoshida +
-リストアップされたすべての貢献者たちも同様にPHPモードを改善しました。 - -現在のメンテナ： - - 1. USAMI Kenta (@zonuexe) - -[PHP ModeのGitHubプロジェクト][php-mode]にissueを作成してバグ報告や機能リクエストを送ってください。あるいは[PHP suite][php-suite]の[FeatHubページ][feathub]に機能リクエストを送っても構いません。 +[PHP ModeのGitHubプロジェクト][php-mode]にissueを作成してバグ報告や機能リクエストを送ってください。 インストール ------------ @@ -38,63 +28,15 @@ GNU Emacs 24以降では、[package][]機能(または[Cask][])を使って[MELP ### OSのパッケージマネージャからのインストール -PHP Modeは[いくつかのOSが提供するパッケージシステム](https://repology.org/project/emacs:php-mode/versions)からインストール可能です。これはEmacsにPHPを追加する最も簡単な方法で、ただ `sudo apt-get install elpa-php-mode` で導入できます。 +PHP Modeは[いくつかのOSが提供するパッケージシステム][php-mode-packages]からインストール可能です。DebianおよびUbuntuのようなDebian派生のOSではEmacsにPHPを追加する最も簡単な方法で、`sudo apt install elpa-php-mode` で導入できます。これらの "Stable" リリースは最新のPHP Modeよりも古いものの、十分にテストされた固定バージョンが提供されます。オートロードとバイトコンパイルは自動で行われます。 -Debian、Ubuntuや派生OSなどでのパッケージ名は[`elpa-php-mode`](https://packages.debian.org/buster/elpa-php-mode)です。これらのパッケージは安定版ですが、PHP Modeの最新版からは遅れているため、最新のPHP機能サポートや性能改善が反映されていない可能性があることに気をつけてください。 +最新のPHP Modeの機能とパフォーマンス改善を活用するために**sid** ("unstable"としても知られるローリングリリース)で提供されるバージョンのインストールを検討してください。最新バージョンは[`elpa-php-mode`][elpa-php-mode]にあります。"apt-pinning"を使ってアップデートを自動化することもできます。 -また、[Debian 9 (stretch)](https://packages.debian.org/stretch/php-elisp) や [Ubuntu 18.10](https://packages.ubuntu.com/cosmic/php-elisp)以前で提供されていた `php-elisp` パッケージは[あまりにも古い](https://github.com/emacs-php/php-mode/issues/430)ので、 **くれぐれもインストールしないでください**。 +また、[Debian 9 (stretch)][php-elisp-stretch]や[Ubuntu 18.10][php-elisp-ubuntu1810]以前で提供されていた `php-elisp` パッケージは[あまりにも古い][issue-430]ので、 **くれぐれもインストールしないでください**。 ### 手動でインストール -このプロジェクトを `git cline` または、[php-mode releases]からzip/tarアーカイブをダウンロードして展開してください。 - -#### A: `(load php-mode-autoloads.el)` *(推奨)* - -これはパッケージマネージャを利用した場合と同等のパフォーマンスと使いやすさを両立した初期化方法です。 - -ダウンロードしたコードを展開したディレクトリに移動し、`make`コマンドを実行すると、バイトコンパイルおよび `php-mode-autoloads.el` を生成できます。 `init.el`からファイルをロードするだけで使用準備は完了です。 - -```el -;; Put follow code into init.el -(when (file-directory-p "~/path/to/php-mode") - (load "~/path/to/php-mode/php-mode-autoloads.el")) - -;; Any code below is *unnecessary* -;; (require 'php-mode) -;; (add-to-list 'load-path (expand-file-name "~/path/to/php-mode")) -;; (add-to-list 'auto-mode-alist '("\\.php\\'" . php-mode)) -``` - -#### **B**: `(autoload 'php-mode)` - -Emacs起動時の僅かな読み込み増加をも削減したい上級ユーザー向けです。 - -この場合も `make`でバイトコンパイルしておくことを推奨します。 - -```el -;; Put follow code into init.el -(autoload 'php-mode (expand-file-name "~/path/to/php-mode/php-mode") "\ -Major mode for editing PHP code. - -\\{php-mode-map} - -\(fn)" t nil) - -(add-to-list 'auto-mode-alist '("\\.\\(?:php\\|phtml\\)\\'" . php-mode)) - -;; Any code below is *unnecessary* -;; (add-to-list 'load-path (expand-file-name "~/path/to/php-mode")) -;; (require 'php-mode) -``` - -#### **C**: `(require 'php-mode)` *(非推奨)* - -特定のパスから`php-mode`を同期的に読み込みます。 **A**の場合と比べて10倍のサイズのコードを読み込むことになり、起動時間の増加幅はCPUとファイスシステムのパフォーマンスに依存します。 - -```el -(require 'php-mode "~/path/to/php-mode/php-mode") -(add-to-list 'load-path (expand-file-name "~/path/to/php-mode")) -``` +もしパッケージマネージャに依存したくなければ、伝統的な方法によってLispファイルを直接インストールすることもできます。詳細なセットアップ方法は[手動でのインストール][wiki-manual-installation-ja]ページをご覧ください。 バグを報告する -------------- @@ -310,10 +252,6 @@ GNU Emacsには[Subword Mode][]という機能があり、このマイナーモ キーバインド `C-c C-w` はSubword Modeのオンとオフを切り替えます。 -### Amakaサポート - -Viewing and editing build scripts for [Amaka](http://trashofmasters.github.io/amaka/) will automatically enable PHP Mode. - ### 現在のclass/namespaceを挿入する ```el @@ -356,34 +294,59 @@ Wiki GitHubのプロジェクトページには[wiki][]があり、自由に編集して構いません。このWikiには今後追加する計画のある機能やバグが掲載されています。また、PHPモードをより使いやすくするためのTipsを追加できます。 -ライセンス -------- - -PHP Mode uses the [GNU General Public License 3](http://www.gnu.org/copyleft/gpl.html). - -Contributors ------------- - -PHPモードの改善に協力したすべての貢献者のリストは[README.md#contributors](https://github.com/emacs-php/php-mode/blob/master/README.md#contributors)に掲載されています。 - +## 著作権 + +PHP Modeは[GNU General Public License Version 3][gpl-v3] (GPLv3) でライセンスされています。 + +このプロジェクトは1999年に[Turadg Aleahmad][@turadg]が書いた`php-mode.el`に起源を持ちます。2013年に[Daniel Hackney][@haxney]がEmacs組み込みのCC Modeをもとに書き直し始めました。PHPモードの改善に協力した貢献者のリストは[Authors]と[Contributors]に掲載されています。 + +このプロジェクトは2017年まで[Eric James Michael Ritz][@ejmr]によりメンテナンスされていました。現在は[Friends of Emacs-PHP Development][@emacs-php]コミュニティが引き継いで開発しています。 + +> ``` +> Copyright (C) 2018-2020 Friends of Emacs-PHP development +> Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad +> 2008 Aaron S. Hawley +> 2011, 2012, 2013, 2014, 2015, 2016, 2017 Eric James Michael Ritz +> ``` +> +> This program is free software; you can redistribute it and/or modify +> it under the terms of the GNU General Public License as published by +> the Free Software Foundation, either version 3 of the License, or +> (at your option) any later version. +> +> This program is distributed in the hope that it will be useful, +> but WITHOUT ANY WARRANTY; without even the implied warranty of +> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> GNU General Public License for more details. +> +> You should have received a copy of the GNU General Public License +> along with this program. If not, see . + +[@ejmr]: https://github.com/ejmr +[@emacs-php]: https://github.com/emacs-php +[@haxney]: https://github.com/haxney +[@turadg]: https://github.com/turadg +[Authors]: https://github.com/emacs-php/php-mode/wiki/Authors [Cask]: https://github.com/cask/cask +[Contributors]: https://github.com/emacs-php/php-mode/graphs/contributors [MELPA Stable]: https://stable.melpa.org/ [MELPA]: https://melpa.org/ -[Marmalade]: http://marmalade-repo.org/ [Subword Mode]: https://www.gnu.org/software/emacs/manual/html_node/ccmode/Subword-Movement.html [Supported Version]: https://github.com/emacs-php/php-mode/wiki/Supported-Version [Web Mode]: http://web-mode.org/ [camelCase]: https://ja.wikipedia.org/wiki/%E3%82%AD%E3%83%A3%E3%83%A1%E3%83%AB%E3%82%B1%E3%83%BC%E3%82%B9 [cc mode]: https://www.gnu.org/software/emacs/manual/html_mono/ccmode.html -[feathub]: https://feathub.com/emacs-php/php-suite +[elpa-php-mode]: https://packages.debian.org/sid/elpa-php-mode +[issue-430]: https://github.com/emacs-php/php-mode/issues/430 [melpa-badge]: http://melpa.org/packages/php-mode-badge.svg [melpa-link]: http://melpa.org/#/php-mode [melpa-stable-badge]: http://stable.melpa.org/packages/php-mode-badge.svg [melpa-stable-link]: http://stable.melpa.org/#/php-mode [package]: https://www.gnu.org/software/emacs/manual/html_node/emacs/Packages.html +[php-elisp-stretch]: https://packages.debian.org/stretch/php-elisp +[php-elisp-ubuntu1810]: https://packages.ubuntu.com/cosmic/php-elisp +[php-mode-packages]: https://repology.org/project/emacs:php-mode/versions [php-mode]: https://github.com/emacs-php/php-mode -[php-mode releases]: https://github.com/emacs-php/php-mode/releases [php-suite]: https://github.com/emacs-php/php-suite -[travis-badge]: https://travis-ci.org/emacs-php/php-mode.svg -[travis-link]: https://travis-ci.org/emacs-php/php-mode [wiki]: https://github.com/emacs-php/php-mode/wiki +[wiki-manual-installation-ja]: https://github.com/emacs-php/php-mode/wiki/Manual-installation-ja diff --git a/README.md b/README.md index 159dbe1e..1b667262 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# Emacs PHP Mode +
+

Emacs PHP Mode

[![Emacs: 26.3](https://img.shields.io/badge/Emacs-26.3-blue.svg)](https://www.gnu.org/software/emacs/) [![lang: PHP 7](https://img.shields.io/badge/lang-PHP%207-brightgreen.svg)](http://php.net/manual/migration70.php) @@ -8,22 +9,11 @@ [![melpa stable badge][melpa-stable-badge]][melpa-stable-link] [![GPL v3](https://img.shields.io/badge/license-GPL_v3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.txt) -This is a major mode development project to support PHP coding in GNU Emacs. -This fork builds on the work of: +A powerful and flexible Emacs major mode for editing PHP scripts -1. Turadg Aleahmad (Original Author) -2. Aaron S. Hawley -3. Lennart Borgman -4. Eric James Michael Ritz -5. Syohei Yoshida +
-All contributors listed below improved PHP Mode as well. - -The current maintainer is: - -1. USAMI Kenta (@zonuexe) - -Please submit any bug reports or feature requests by creating issues on [the GitHub page for PHP Mode][php-mode]. Alternatively you may also request features via [the FeatHub page][feathub] for the entire [PHP suite for GNU Emacs][php-suite]. +Please submit any bug reports or feature requests by creating issues on [the GitHub page for PHP Mode][php-mode]. Installation ------------ @@ -40,64 +30,15 @@ With GNU Emacs 24 or later then you can use its [package][] feature (or [Cask][] ### Install using OS package system -PHP Mode is available from [package systems provided by several OSs](https://repology.org/project/emacs:php-mode/versions). On Debian, and operating systems derived from it, such as Ubuntu, the easiest way to add PHP support to Emacs is `sudo apt install elpa-php-mode`. "Stable" releases of these operating systems include a well-tested frozen version of this package that is always older than the latest upstream version of PHP Mode. Autoloads and byte-compilation are automatic. +PHP Mode is available from [package systems provided by several OSs][php-mode-packages]. On Debian, and operating systems derived from it, such as Ubuntu, the easiest way to add PHP support to Emacs is `sudo apt install elpa-php-mode`. "Stable" releases of these operating systems include a well-tested frozen version of this package that is always older than the latest upstream version of PHP Mode. Autoloads and byte-compilation are automatic. -Please consider installing the package provided in `sid` (aka: "unstable", a rolling release) in order to benefit from the latest PHP Mode features and performance improvements. The latest version can be found here: [`elpa-php-mode`](https://packages.debian.org/sid/elpa-php-mode). Investigate "apt-pinning" to make tracking this update stream automatic. +Please consider installing the package provided in `sid` (aka: "unstable", a rolling release) in order to benefit from the latest PHP Mode features and performance improvements. The latest version can be found here: [`elpa-php-mode`][elpa-php-mode]. Investigate "apt-pinning" to make tracking this update stream automatic. -Also, the `php-elisp` package provided by [Debian 9 (stretch)](https://packages.debian.org/stretch/php-elisp) and [Ubuntu 18.10](https://packages.ubuntu.com/cosmic/php-elisp) and earlier is [extremely old](https://github.com/emacs-php/php-mode/issues/430), so **PLEASE DO NOT INSTALL IT**. +Also, the `php-elisp` package provided by [Debian 9 (stretch)][php-elisp-stretch] and [Ubuntu 18.10][php-elisp-ubuntu1810] and earlier is [extremely old][issue-430], so **PLEASE DO NOT INSTALL IT**. ### Manual installation -Please `git clone` this project or download and unarchive tar or zip file from [php-mode releases]. - -You can choose one of the following **A**, **B**, **C** installation methods. - -#### **A**: `(load php-mode-autoloads.el)` *(RECOMMENDED)* - -This is an initialization method that achieves the same performance and ease of use as using a package manager. - -By moving the downloaded file to the extracted path of the current directory and executing the `make` command, byte compilation and `php-mode-autoloads.el` is generated. Just load the file from `init.el` and you are ready to use. - -```el -;; Put follow code into init.el -(when (file-directory-p "~/path/to/php-mode") - (load "~/path/to/php-mode/php-mode-autoloads.el")) - -;; Any code below is *unnecessary* -;; (require 'php-mode) -;; (add-to-list 'load-path (expand-file-name "~/path/to/php-mode")) -;; (add-to-list 'auto-mode-alist '("\\.php\\'" . php-mode)) -``` -#### **B**: `(autoload 'php-mode)` - -This is for advanced users who want to reduce the slight increase in reading when Emacs starts. - -Also in this case, it is recommended to byte compile with `make`. - -```el -;; Put follow code into init.el -(autoload 'php-mode (expand-file-name "~/path/to/php-mode/php-mode") "\ -Major mode for editing PHP code. - -\\{php-mode-map} - -\(fn)" t nil) - -(add-to-list 'auto-mode-alist '("\\.\\(?:php\\|phtml\\)\\'" . php-mode)) - -;; Any code below is *unnecessary* -;; (add-to-list 'load-path (expand-file-name "~/path/to/php-mode")) -;; (require 'php-mode) -``` - -#### **C**: `(require 'php-mode)` *(NOT RECOMMENDED)* - -Load `php-mode` synchronously from a specific path. It will load 10 times the size of the code compared to method **A**, and how much the startup time will depend on the performance of your machine's CPU and file system. - -```el -(require 'php-mode "~/path/to/php-mode/php-mode") -(add-to-list 'load-path (expand-file-name "~/path/to/php-mode")) -``` +If you don't want to depend on a package manager, you can install Lisp files directly in the traditional way. See [Manual installation][wiki-manual-installation] for our recommended setup method. ### Configuration @@ -291,10 +232,6 @@ If you want to always use Subword Mode for PHP files then you can add this to yo The key-binding `C-c C-w` will also toggle Subword Mode on and off. -### Amaka Support - -Viewing and editing build scripts for [Amaka](http://trashofmasters.github.io/amaka/) will automatically enable PHP Mode. - ### Insert current class/namespace ```el @@ -337,113 +274,59 @@ The Wiki The GitHub project page has a [wiki][] that you should feel free to edit. The wiki lists the features and bugs that are on plan to include in upcoming versions of PHP Mode. It is also a place to add any tips to make the mode more useful. -License -------- - -PHP Mode uses the [GNU General Public License 3](http://www.gnu.org/copyleft/gpl.html). - - -Contributors ------------- - -[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/0)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/0)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/1)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/1)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/2)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/2)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/3)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/3)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/4)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/4)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/5)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/5)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/6)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/6)[![](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/images/7)](https://sourcerer.io/fame/ejmr/emacs-php/php-mode/links/7) - -In chronological order: - -1. Juanjo -2. Torsten Martinsen -3. Vinai Kopp -4. Sean Champ -5. Doug Marcey -6. Kevin Blake -7. Rex McMaster -8. Mathias Meyer -9. Boris Folgmann -10. Roland -11. Rosenfeld -12. Fred Yankowski -13. Craig Andrews -14. John Keller -15. Ryan -16. Sammartino -17. ppercot -18. Valentin Funk -19. Stig Bakken -20. Gregory Stark -21. Chris Morris -22. Nils Rennebarth -23. Gerrit Riessen -24. Eric Mc Sween -25. Ville Skytta -26. Giacomo Tesio -27. Urban Müller -28. [Engelke Eschner](https://github.com/tekai) -29. Lennart Borgman -30. Stefan Monnier -31. Aaron S. Hawley -32. [Ian Eure](https://github.com/ieure) -33. [Bill Lovett](https://github.com/lovett) -34. Dias Badekas -35. David House -36. [Tom Willemse](https://github.com/ryuslash) -37. [Olaf the Viking](https://github.com/olavTHEviking) -38. [Maël Nison](https://github.com/arcanis) -39. [flack](https://github.com/flack) -40. [Michele Bini](https://github.com/rev22) -41. Emanuele Tomasi -42. [David Maus](https://github.com/dmj) -43. [Jakub Jankiewicz](https://github.com/jcubic) -44. [Marcin Antczak](https://github.com/marcinant) -45. [顾伟刚](https://github.com/guweigang) -46. [zapad](https://github.com/zargener) -47. [Carl Groner](https://github.com/cgroner) -48. [Michael Dwyer](https://github.com/kalifg) -49. [Daniel Hackney](https://github.com/haxney) -50. [Nate Eagleson](https://github.com/NateEag) -51. [Steve Purcell](https://github.com/purcell) -52. TatriX -53. [François-Xavier Bois](https://github.com/fxbois) -54. [James Laver](https://github.com/jjl) -55. [Jacek Wysocki](https://github.com/exu) -56. [Jon Dufrense](https://github.com/jdufresne) -57. [Andrei Chițu](https://github.com/achitu) -58. [phil-s](https://github.com/phil-s) -59. [Bence Kalmar](https://github.com/brkalmar) -60. [Elis Axelsson](https://github.com/etu) -61. [Alan Pearce](https://github.com/alanpearce) -62. Syohei Yoshida -63. Joris Steyn -64. l3msh0 -65. [Hernawan Fa'iz Abdillah](https://github.com/Abdillah) -66. [Sebastian Wiesner](https://github.com/lunaryorn) -67. [Michael Stolovitzsky](https://github.com/emestee) -68. [David Arroyo Menéndez](https://github.com/davidam) -69. [USAMI Kenta](https://tadsan.github.io/) (@zonuexe) -70. [Tim Landscheidt](http://www.tim-landscheidt.de) -71. [Fabian Wiget](https://github.com/fabacino) -72. tangxifan -73. [Serghei Iakovlev](https://github.com/sergeyklay) -74. [Christian Albrecht](https://github.com/calbrecht) -75. [Sebastian Fieber](https://github.com/fallchildren) -76. [Mark A. Hershberger](https://github.com/hexmode) - - +## Copyright + +PHP Mode is licensed under [GNU General Public License Version 3][gpl-v3] (GPLv3). + +This project originated in `php-mode.el` written by [Turadg Aleahmad][@turadg] in 1999. In 2013 [Daniel Hackney][@haxney] began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode. Other contributors are listed in [Authors] and [Contributors]. + +This project was maintained by [Eric James Michael Ritz][@ejmr] until 2017. Currently, the [Friends of Emacs-PHP Development][@emacs-php] community inherits PHP Mode. + +> ``` +> Copyright (C) 2018-2020 Friends of Emacs-PHP development +> Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad +> 2008 Aaron S. Hawley +> 2011, 2012, 2013, 2014, 2015, 2016, 2017 Eric James Michael Ritz +> ``` +> +> This program is free software; you can redistribute it and/or modify +> it under the terms of the GNU General Public License as published by +> the Free Software Foundation, either version 3 of the License, or +> (at your option) any later version. +> +> This program is distributed in the hope that it will be useful, +> but WITHOUT ANY WARRANTY; without even the implied warranty of +> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> GNU General Public License for more details. +> +> You should have received a copy of the GNU General Public License +> along with this program. If not, see . + +[@ejmr]: https://github.com/ejmr +[@emacs-php]: https://github.com/emacs-php +[@haxney]: https://github.com/haxney +[@turadg]: https://github.com/turadg +[Authors]: https://github.com/emacs-php/php-mode/wiki/Authors [Cask]: https://github.com/cask/cask +[Contributors]: https://github.com/emacs-php/php-mode/graphs/contributors [MELPA Stable]: https://stable.melpa.org/ [MELPA]: https://melpa.org/ -[Marmalade]: http://marmalade-repo.org/ [Subword Mode]: https://www.gnu.org/software/emacs/manual/html_node/ccmode/Subword-Movement.html [Supported Version]: https://github.com/emacs-php/php-mode/wiki/Supported-Version [Web Mode]: http://web-mode.org/ [camelCase]: https://ja.wikipedia.org/wiki/%E3%82%AD%E3%83%A3%E3%83%A1%E3%83%AB%E3%82%B1%E3%83%BC%E3%82%B9 [cc mode]: https://www.gnu.org/software/emacs/manual/html_mono/ccmode.html -[feathub]: https://feathub.com/emacs-php/php-suite +[elpa-php-mode]: https://packages.debian.org/sid/elpa-php-mode +[issue-430]: https://github.com/emacs-php/php-mode/issues/430 [melpa-badge]: http://melpa.org/packages/php-mode-badge.svg [melpa-link]: http://melpa.org/#/php-mode [melpa-stable-badge]: http://stable.melpa.org/packages/php-mode-badge.svg [melpa-stable-link]: http://stable.melpa.org/#/php-mode [package]: https://www.gnu.org/software/emacs/manual/html_node/emacs/Packages.html +[php-elisp-stretch]: https://packages.debian.org/stretch/php-elisp +[php-elisp-ubuntu1810]: https://packages.ubuntu.com/cosmic/php-elisp +[php-mode-packages]: https://repology.org/project/emacs:php-mode/versions [php-mode]: https://github.com/emacs-php/php-mode -[php-mode releases]: https://github.com/emacs-php/php-mode/releases [php-suite]: https://github.com/emacs-php/php-suite [wiki]: https://github.com/emacs-php/php-mode/wiki +[wiki-manual-installation]: https://github.com/emacs-php/php-mode/wiki/Manual-installation diff --git a/php-mode.el b/php-mode.el index 3750b9e2..bf0d40a9 100644 --- a/php-mode.el +++ b/php-mode.el @@ -263,16 +263,11 @@ have any tags inside a PHP string, it will be fooled." This variable can take one of the following symbol values: `Default' - use a reasonable default style for PHP. - +`PSR-2' - use PSR standards (PSR-2, PSR-12). `PEAR' - use coding styles preferred for PEAR code and modules. - `Drupal' - use coding styles preferred for working with Drupal projects. - `WordPress' - use coding styles preferred for working with WordPress projects. - -`Symfony2' - use coding styles preferred for working with Symfony2 projects. - -`PSR-2' - use coding styles preferred for working with projects using PSR-2 standards." +`Symfony2' - use coding styles preferred for working with Symfony2 projects." :group 'php-mode :tag "PHP Mode Coding Style" :type '(choice (const :tag "Default" php) @@ -338,13 +333,6 @@ In that case set to `NIL'." ;; Remove menu item for c-mode (define-key map [menu-bar C] nil) - ;; (define-key map [menu-bar php complete-function] - ;; '("Complete function name" . php-complete-function)) - ;; (define-key map [menu-bar php browse-manual] - ;; '("Browse manual" . php-browse-manual)) - ;; (define-key map [menu-bar php search-documentation] - ;; '("Search documentation" . php-search-documentation)) - ;; By default PHP Mode binds C-M-h to c-mark-function, which it ;; inherits from cc-mode. But there are situations where ;; c-mark-function fails to properly mark a function. For @@ -570,8 +558,7 @@ PHP does not have an \"enum\"-like keyword." "strict_types" ;;; self for static references: - "self" - )) + "self")) ;; PHP does not have <> templates/generics (c-lang-defconst c-recognize-<>-arglists