Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
### Added

* Add some functions/variables in `php-project` package
* `php-project-get-php-executable` ([#436](https://github.com/ejmr/php-mode/pull/436))
* `php-project-get-phan-executable` ([#436](https://github.com/ejmr/php-mode/pull/436))
* `php-project-get-php-executable` ([#436](https://github.com/emacs-php/php-mode/pull/436))
* `php-project-get-phan-executable` ([#436](https://github.com/emacs-php/php-mode/pull/436))
* Add `php-debug` command for reporting a bug

### Changed

* Add highlighting of return types for abstract functions ([#461](https://github.com/ejmr/php-mode/pull/461) by [@fabacino](https://github.com/fabacino))
* Add highlighting of return types for abstract functions ([#461](https://github.com/emacs-php/php-mode/pull/461) by [@fabacino](https://github.com/fabacino))

### Fixed

* Fix `c-anchored-cpp-prefix` in Emacs 26 ([#453](https://github.com/ejmr/php-mode/pull/453))
* Fix (re-implemteed) `php-complete-function` ([#454](https://github.com/ejmr/php-mode/pull/454))
* Fix `c-anchored-cpp-prefix` in Emacs 26 ([#453](https://github.com/emacs-php/php-mode/pull/453))
* Fix (re-implemteed) `php-complete-function` ([#454](https://github.com/emacs-php/php-mode/pull/454))
* Fix some problem of `php-set-style` *(disabled on default)*
* Fix lazy evaluation of php-set-style ([#444](https://github.com/ejmr/php-mode/pull/444))
* Do not use `php-mode-enable-backup-style-variables` in initialize ([#452](https://github.com/ejmr/php-mode/pull/452))
* Temporarily disable `php-mode-enable-project-coding-style` ([#450](https://github.com/ejmr/php-mode/pull/450))
* Fix heredoc/nowdoc syntax problem ([#440](https://github.com/ejmr/php-mode/pull/440))
* Delete duplicate font locks with keywords not related to PHP language ([#432](https://github.com/ejmr/php-mode/pull/432))
* Make `php-project-root` variable accept a string ([#458](https://github.com/ejmr/php-mode/pull/458))
* Fix lazy evaluation of php-set-style ([#444](https://github.com/emacs-php/php-mode/pull/444))
* Do not use `php-mode-enable-backup-style-variables` in initialize ([#452](https://github.com/emacs-php/php-mode/pull/452))
* Temporarily disable `php-mode-enable-project-coding-style` ([#450](https://github.com/emacs-php/php-mode/pull/450))
* Fix heredoc/nowdoc syntax problem ([#440](https://github.com/emacs-php/php-mode/pull/440))
* Delete duplicate font locks with keywords not related to PHP language ([#432](https://github.com/emacs-php/php-mode/pull/432))
* Make `php-project-root` variable accept a string ([#458](https://github.com/emacs-php/php-mode/pull/458))

## Before 1.19.0

See [Changelog · ejmr/php-mode Wiki](https://github.com/ejmr/php-mode/wiki/Changelog).
See [Changelog · emacs-php/php-mode Wiki](https://github.com/emacs-php/php-mode/wiki/Changelog).
12 changes: 6 additions & 6 deletions README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PHP 5.4以降を開発しやすくするための機能をアップデートす

1. USAMI Kenta (@zonuexe)

[PHPモードのGitHubプロジェクト](https://github.com/ejmr/php-mode)にissueを作成してバグ報告や機能リクエストを送ってください。
[PHPモードのGitHubプロジェクト](https://github.com/emacs-php/php-mode)にissueを作成してバグ報告や機能リクエストを送ってください。

インストール
------------
Expand Down Expand Up @@ -79,7 +79,7 @@ Settings

### CC Mode, CEDET, EDE, and Semantic ###

In 2013 Daniel Haxney began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode. This laid the foundation for incorporating some of the inherit IDE-ish features of Emacs, such as CEDET, EDE, and Semantic. Support for these tools continues to improve thanks to the work of Andrea Turso, Steven Rémot, Joris Steyn, and others. If you wish to test, contribute to, or simply experiment with such features then [this thread is a good place to start](https://github.com/ejmr/php-mode/issues/256).
In 2013 Daniel Haxney began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode. This laid the foundation for incorporating some of the inherit IDE-ish features of Emacs, such as CEDET, EDE, and Semantic. Support for these tools continues to improve thanks to the work of Andrea Turso, Steven Rémot, Joris Steyn, and others. If you wish to test, contribute to, or simply experiment with such features then [this thread is a good place to start](https://github.com/emacs-php/php-mode/issues/256).

### PHP7サポート

Expand Down Expand Up @@ -336,9 +336,9 @@ PHP Mode uses the [GNU General Public License 3](http://www.gnu.org/copyleft/gpl
Contributors
------------

PHPモードの改善に協力したすべての貢献者のリストは[README.md#contributors](https://github.com/ejmr/php-mode/blob/master/README.md#contributors)に掲載されています。
PHPモードの改善に協力したすべての貢献者のリストは[README.md#contributors](https://github.com/emacs-php/php-mode/blob/master/README.md#contributors)に掲載されています。

[wiki]: https://github.com/ejmr/php-mode/wiki
[wiki]: https://github.com/emacs-php/php-mode/wiki
[ert]: http://www.gnu.org/software/emacs/manual/html_node/ert/index.html
[cc mode]: https://www.gnu.org/software/emacs/manual/html_mono/ccmode.html
[Subword Mode]: https://www.gnu.org/software/emacs/manual/html_node/ccmode/Subword-Movement.html
Expand All @@ -347,8 +347,8 @@ PHPモードの改善に協力したすべての貢献者のリストは[README.
[MELPA]: http://melpa.milkbox.net/
[Marmalade]: http://marmalade-repo.org/
[Web Mode]: http://web-mode.org/
[travis-badge]: https://travis-ci.org/ejmr/php-mode.svg
[travis-link]: https://travis-ci.org/ejmr/php-mode
[travis-badge]: https://travis-ci.org/emacs-php/php-mode.svg
[travis-link]: https://travis-ci.org/emacs-php/php-mode
[melpa-link]: http://melpa.org/#/php-mode
[melpa-stable-link]: http://stable.melpa.org/#/php-mode
[melpa-badge]: http://melpa.org/packages/php-mode-badge.svg
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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](https://github.com/ejmr/php-mode).
Please submit any bug reports or feature requests by creating issues on [the GitHub page for PHP Mode](https://github.com/emacs-php/php-mode).


Installation
Expand Down Expand Up @@ -51,7 +51,7 @@ Experimental and In-Progress Features

### CC Mode, CEDET, EDE, and Semantic ###

In 2013 Daniel Haxney began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode. This laid the foundation for incorporating some of the inherit IDE-ish features of Emacs, such as CEDET, EDE, and Semantic. Support for these tools continues to improve thanks to the work of Andrea Turso, Steven Rémot, Joris Steyn, and others. If you wish to test, contribute to, or simply experiment with such features then [this thread is a good place to start](https://github.com/ejmr/php-mode/issues/256).
In 2013 Daniel Haxney began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode. This laid the foundation for incorporating some of the inherit IDE-ish features of Emacs, such as CEDET, EDE, and Semantic. Support for these tools continues to improve thanks to the work of Andrea Turso, Steven Rémot, Joris Steyn, and others. If you wish to test, contribute to, or simply experiment with such features then [this thread is a good place to start](https://github.com/emacs-php/php-mode/issues/256).

### PHP 7 Support ###

Expand Down Expand Up @@ -400,7 +400,7 @@ In chronological order:
76. [Mark A. Hershberger](https://github.com/hexmode)


[wiki]: https://github.com/ejmr/php-mode/wiki
[wiki]: https://github.com/emacs-php/php-mode/wiki
[ert]: http://www.gnu.org/software/emacs/manual/html_node/ert/index.html
[cc mode]: https://www.gnu.org/software/emacs/manual/html_mono/ccmode.html
[Subword Mode]: https://www.gnu.org/software/emacs/manual/html_node/ccmode/Subword-Movement.html
Expand All @@ -409,8 +409,8 @@ In chronological order:
[MELPA]: http://melpa.milkbox.net/
[Marmalade]: http://marmalade-repo.org/
[Web Mode]: http://web-mode.org/
[travis-badge]: https://travis-ci.org/ejmr/php-mode.svg
[travis-link]: https://travis-ci.org/ejmr/php-mode
[travis-badge]: https://travis-ci.org/emacs-php/php-mode.svg
[travis-link]: https://travis-ci.org/emacs-php/php-mode
[melpa-link]: http://melpa.org/#/php-mode
[melpa-stable-link]: http://stable.melpa.org/#/php-mode
[melpa-badge]: http://melpa.org/packages/php-mode-badge.svg
Expand Down
4 changes: 2 additions & 2 deletions php-mode-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
;; 2014, 2015 Eric James Michael Ritz

;; Author: Daniel Hackney <dan@haxney.org>
;; URL: https://github.com/ejmr/php-mode
;; URL: https://github.com/emacs-php/php-mode

;;; License

Expand Down Expand Up @@ -371,7 +371,7 @@ style from Drupal."
(search-forward "@copyright")
(should (equal (get-text-property (match-beginning 0) 'face)
'(php-doc-annotation-tag font-lock-doc-face)))
(search-forward-regexp "@link +\\(https://github.com/ejmr/php-mode\\)")
(search-forward-regexp "@link +\\(https://github.com/emacs-php/php-mode\\)")
(should (equal (get-text-property (match-beginning 1) 'face)
'(link font-lock-doc-face)))
(search-forward-regexp "@package +\\(Emacs\\\\PHPMode\\)")
Expand Down
10 changes: 5 additions & 5 deletions php-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

;; Author: Eric James Michael Ritz
;; Maintainer: USAMI Kenta <tadsan@zonu.me>
;; URL: https://github.com/ejmr/php-mode
;; URL: https://github.com/emacs-php/php-mode
;; Keywords: languages php
;; Version: 1.19.1
;; Package-Requires: ((emacs "24.3") (cl-lib "0.5"))
Expand Down Expand Up @@ -101,7 +101,7 @@
(if (and (= emacs-major-version 24) (>= emacs-minor-version 4))
(require 'cl)))

;; Work around https://github.com/ejmr/php-mode/issues/310.
;; Work around https://github.com/emacs-php/php-mode/issues/310.
;;
;; In emacs 24.4 and 24.5, lines after functions with a return type
;; are incorrectly analyzed as member-init-cont.
Expand All @@ -126,8 +126,8 @@
:tag "PHP"
:prefix "php-"
:group 'languages
:link '(url-link :tag "Official Site" "https://github.com/ejmr/php-mode")
:link '(url-link :tag "PHP Mode Wiki" "https://github.com/ejmr/php-mode/wiki"))
:link '(url-link :tag "Official Site" "https://github.com/emacs-php/php-mode")
:link '(url-link :tag "PHP Mode Wiki" "https://github.com/emacs-php/php-mode/wiki"))

(defcustom php-executable (or (executable-find "php")
"/usr/bin/php")
Expand Down Expand Up @@ -1190,7 +1190,7 @@ After setting the stylevars run hooks according to STYLENAME
(require 'pkg-info nil t)
(php-mode-debug--buffer 'init)
(php-mode-debug--message "Feel free to report on GitHub what you noticed!")
(php-mode-debug--message "https://github.com/ejmr/php-mode/issues/new")
(php-mode-debug--message "https://github.com/emacs-php/php-mode/issues/new")
(php-mode-debug--message "")
(php-mode-debug--message "Pasting the following information on the issue will help us to investigate the cause.")
(php-mode-debug--message "```")
Expand Down
2 changes: 1 addition & 1 deletion php-project.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

;; Author: USAMI Kenta <tadsan@zonu.me>
;; Keywords: tools, files
;; URL: https://github.com/ejmr/php-mode
;; URL: https://github.com/emacs-php/php-mode
;; Version: 1.19.1
;; Package-Requires: ((emacs "24.3") (cl-lib "0.5"))
;; License: GPL-3.0-or-later
Expand Down
2 changes: 1 addition & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ tests cases.



[github]: https://github.com/ejmr/php-mode
[github]: https://github.com/emacs-php/php-mode
2 changes: 1 addition & 1 deletion tests/comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @copyright 2008 Aaron S. Hawley
* @copyright 2011, 2012, 2013, 2014, 2015, 2016 Eric James Michael Ritz
* @author USAMI Kenta <tadsan@pixiv.com>
* @link https://github.com/ejmr/php-mode
* @link https://github.com/emacs-php/php-mode
* @package Emacs\PHPMode
*/

Expand Down
2 changes: 1 addition & 1 deletion tests/comments.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
(" USAMI Kenta <tadsan@pixiv.com>\n * " . font-lock-doc-face)
("@link" php-doc-annotation-tag font-lock-doc-face)
(" " . font-lock-doc-face)
("https://github.com/ejmr/php-mode" link font-lock-doc-face)
("https://github.com/emacs-php/php-mode" link font-lock-doc-face)
("\n * " . font-lock-doc-face)
("@package" php-doc-annotation-tag font-lock-doc-face)
(" " . font-lock-doc-face)
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-100.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/100
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/100
*
* The code below should appear like so:
*
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-102.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* Github Issue: https://github.com/ejmr/php-mode/issues/102
* Github Issue: https://github.com/emacs-php/php-mode/issues/102
*
* Every line of code in the form of
*
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-115.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* Github Issue: https://github.com/ejmr/php-mode/issues/115
* Github Issue: https://github.com/emacs-php/php-mode/issues/115
*
* This tests for aligning method calls within arrays, similar to what
* we do in the test for issue 19. The method calls below should all
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-124.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/124
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/124
*
* PHP Mode must highlight the heredoc string below using
* font-lock-string-face. The presence of the apostrophe or anything
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-129.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/129
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/129
*
* PHP Mode should use 'font-lock-keyword-face' to highlight 'final'
* in the method below.
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-130.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/130
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/130
*
* Test indentation arrays
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-135.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/135
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/135
*
* Test indentation of method calls
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-136.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/136
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/136
*
* The code below contains strings with interpolated variables. PHP
* Mode must use font-lock-variable-name-face to highlight all of
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-136.php.faces
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
(" USAMI Kenta <tadsan@pixiv.com>\n * " . font-lock-doc-face)
("@link" php-doc-annotation-tag font-lock-doc-face)
(" " . font-lock-doc-face)
("https://github.com/ejmr/php-mode" link font-lock-doc-face)
("https://github.com/emacs-php/php-mode" link font-lock-doc-face)
("\n * " . font-lock-doc-face)
("@package" php-doc-annotation-tag font-lock-doc-face)
(" " . font-lock-doc-face)
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-14.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* Github Issue: https://github.com/ejmr/php-mode/issues/14
* Github Issue: https://github.com/emacs-php/php-mode/issues/14
*
* The code below should be formatted like so if we run indent-region
* on it:
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-144.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/144
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/144
*
* Indentation test '#' comment line has single quote.
*
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-145.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/145
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/145
*
* This tests closure indentation.
*
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-16.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* Github Issue: https://github.com/ejmr/php-mode/issues16
* Github Issue: https://github.com/emacs-php/php-mode/issues16
*
* The third 'use' statement, with comma-separated namespaces, should
* appear in the same syntax highlighting as the first two 'use'
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-174.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/174
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/174
*
* Test highlighting of string literals containing escaped quotes
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-175.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/175
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/175
*
* PHP mode should not highlight more than 2 digit charcter
*
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-178.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/178
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/178
*
* Test highlighting of "as" keyword
*/
Expand Down
8 changes: 4 additions & 4 deletions tests/issue-18.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?php

/**
* Github Issue: https://github.com/ejmr/php-mode/issues/18
* Github Issue: https://github.com/emacs-php/php-mode/issues/18
*
* If we run indent-region on the code below then it should appear
* like so:
*
* $a = 'github';
*
* if ($a === 'github') {
* header('Location: http://github.com');
* header('Location: https://github.com');
* }
*
* This tests for a bug where '//' inside of a string would cause an
Expand All @@ -19,5 +19,5 @@
$a = 'github';

if ($a === 'github') {
header('Location: http://github.com'); // ###php-mode-test### ((indent c-basic-offset))
}
header('Location: https://github.com'); // ###php-mode-test### ((indent c-basic-offset))
}
2 changes: 1 addition & 1 deletion tests/issue-184.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/184
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/184
*
* Test indentation of statements at beginning of line.
*
Expand Down
2 changes: 1 addition & 1 deletion tests/issue-186.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/**
* GitHub Issue: https://github.com/ejmr/php-mode/issues/186
* GitHub Issue: https://github.com/emacs-php/php-mode/issues/186
*
* Test indentation of case body preceeded by multiple case labels
* that fall through
Expand Down
Loading