branch: elpa/php-mode
commit 0c5524073c35c954a25424c914cf249a5fe05d76
Merge: f6e3a1c6fb 6ad1715ef0
Author: USAMI Kenta <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #769 from emacs-php/release/1.25.1
Release 1.25.1
---
CHANGELOG.md | 20 ++++++++++++++++++--
Eask | 2 +-
README.ja.md | 4 ++--
README.md | 4 ++--
lisp/php-align.el | 2 +-
lisp/php-complete.el | 2 +-
lisp/php-defs.el | 2 +-
lisp/php-face.el | 2 +-
lisp/php-flymake.el | 2 +-
lisp/php-ide-phpactor.el | 2 +-
lisp/php-ide.el | 2 +-
lisp/php-mode-debug.el | 2 +-
lisp/php-mode.el | 4 ++--
lisp/php-project.el | 2 +-
lisp/php.el | 2 +-
15 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d811d4181..3ffd269358 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,24 @@
All notable changes of the PHP Mode 1.19.1 release series are documented in
this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
-## Unreleased
+<!-- ## Unreleased -->
+
+## [1.25.1] - 2023-11-24
### Added
* Add `php-topsy-beginning-of-defun-with-class` to display classname with
function signature. ([#766])
+ * Add missing `__DIR__` to `php-magical-constants` ([#756], thanks
[@piotrkwiecinski])
+
+### Changed
+
+ * Make developer build task in Makefile now depends on Eask. ([#762], thanks
[@jcs090218])
+ * This change does not affect package installation users
+ * Read [CONTRIBUTING.md] if you prefer to build it yourself from zip or tar
ball
### Fixed
- * Fixed build failure in Emacs on master branch ([#764], [#767])
+ * Fixed build failure in Emacs on master branch ([#764], [#765], [#767],
thanks [@takeokunn])
### Removed
@@ -18,10 +27,17 @@ All notable changes of the PHP Mode 1.19.1 release series
are documented in this
* Removed [Cask](https://cask.readthedocs.io/) and
[Keg](https://github.com/conao3/keg.el) metadata files for building ([#770])
[#754]: https://github.com/emacs-php/php-mode/pull/754
+[#756]: https://github.com/emacs-php/php-mode/pull/756
+[#762]: https://github.com/emacs-php/php-mode/pull/762
[#764]: https://github.com/emacs-php/php-mode/issues/764
+[#765]: https://github.com/emacs-php/php-mode/pull/765
[#766]: https://github.com/emacs-php/php-mode/pull/766
[#767]: https://github.com/emacs-php/php-mode/pull/767
[#770]: https://github.com/emacs-php/php-mode/pull/770
+[@jcs090218]: https://github.com/jcs090218
+[@piotrkwiecinski]: https://github.com/piotrkwiecinski
+[@takeokunn]: https://github.com/takeokunn
+[CONTRIBUTING.md]:
https://github.com/emacs-php/php-mode/blob/master/CONTRIBUTING.md
## [1.25.0] - 2023-07-24
diff --git a/Eask b/Eask
index 5c0a8558fd..23cc346365 100644
--- a/Eask
+++ b/Eask
@@ -1,5 +1,5 @@
(package "php-mode"
- "1.25.0"
+ "1.25.1"
"Major mode for editing PHP code")
(website-url "https://github.com/emacs-php/php-mode";)
diff --git a/README.ja.md b/README.ja.md
index 54b6ba7ddd..f6c61ba1c1 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -5,7 +5,7 @@
[](https://php.net/manual/migration82.php)
[](https://php.net/downloads.php)
[](https://github.com/emacs-php/php-mode/actions)
-[](http://www.gnu.org/licenses/gpl-3.0.txt)<br>
+[][gpl-v3]<br>
[![NonGNU ELPA][nongnu-elpa-badge]][nongnu-elpa]
[![melpa badge][melpa-badge]][melpa-link]
@@ -115,7 +115,7 @@ PHP Modeは[GNU General Public License Version 3][gpl-v3]
(GPLv3) でライセ
[Authors]: https://github.com/emacs-php/php-mode/wiki/Authors
[Contributors]: https://github.com/emacs-php/php-mode/graphs/contributors
[Supported Version]:
https://github.com/emacs-php/php-mode/wiki/Supported-Version
-[gpl-v3]: https://www.gnu.org/licenses/quick-guide-gplv3.html
+[gpl-v3]: https://www.gnu.org/licenses/gpl-3.0
[nongnu-elpa-badge]: https://elpa.nongnu.org/nongnu/php-mode.svg
[nongnu-elpa]: https://elpa.nongnu.org/nongnu/php-mode.html
[melpa-badge]: http://melpa.org/packages/php-mode-badge.svg
diff --git a/README.md b/README.md
index 38ef01b082..f02e9428b8 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
[](https://php.net/manual/migration82.php)
[](https://php.net/downloads.php)
[](https://github.com/emacs-php/php-mode/actions)
-[](http://www.gnu.org/licenses/gpl-3.0.txt)<br>
+[][gpl-v3]<br>
[![NonGNU ELPA][nongnu-elpa-badge]][nongnu-elpa]
[![melpa badge][melpa-badge]][melpa-link]
@@ -115,7 +115,7 @@ This project was maintained by [Eric James Michael
Ritz][@ejmr] until 2017. Curr
[Authors]: https://github.com/emacs-php/php-mode/wiki/Authors
[Contributors]: https://github.com/emacs-php/php-mode/graphs/contributors
[Supported Version]:
https://github.com/emacs-php/php-mode/wiki/Supported-Version
-[gpl-v3]: https://www.gnu.org/licenses/quick-guide-gplv3.html
+[gpl-v3]: https://www.gnu.org/licenses/gpl-3.0
[nongnu-elpa-badge]: https://elpa.nongnu.org/nongnu/php-mode.svg
[nongnu-elpa]: https://elpa.nongnu.org/nongnu/php-mode.html
[melpa-badge]: http://melpa.org/packages/php-mode-badge.svg
diff --git a/lisp/php-align.el b/lisp/php-align.el
index 2615495f0e..de4fe3cf3c 100644
--- a/lisp/php-align.el
+++ b/lisp/php-align.el
@@ -7,7 +7,7 @@
;; Maintainer: USAMI Kenta <[email protected]>
;; Keywords: php languages convenience align
;; Homepage: https://github.com/emacs-php/php-mode
-;; Version: 1.25.0
+;; Version: 1.25.1
;; License: GPL-3.0-or-later
;; This program is free software; you can redistribute it and/or modify
diff --git a/lisp/php-complete.el b/lisp/php-complete.el
index 605f462687..28ac52fe19 100644
--- a/lisp/php-complete.el
+++ b/lisp/php-complete.el
@@ -6,7 +6,7 @@
;; Author: USAMI Kenta <[email protected]>
;; Created: 18 Sep 2022
-;; Version: 1.25.0
+;; Version: 1.25.1
;; Keywords: languages, php
;; This program is free software; you can redistribute it and/or modify
diff --git a/lisp/php-defs.el b/lisp/php-defs.el
index 810e26f185..37bd682dbd 100644
--- a/lisp/php-defs.el
+++ b/lisp/php-defs.el
@@ -4,7 +4,7 @@
;; Author: USAMI Kenta <[email protected]>
;; Created: 5 Mar 2022
-;; Version: 1.25.0
+;; Version: 1.25.1
;; Keywords: languages, php
;; This program is free software; you can redistribute it and/or modify
diff --git a/lisp/php-face.el b/lisp/php-face.el
index a9ce85f9c8..70db33e0da 100644
--- a/lisp/php-face.el
+++ b/lisp/php-face.el
@@ -4,7 +4,7 @@
;; Author: USAMI Kenta <[email protected]>
;; Created: 5 May 2019
-;; Version: 1.25.0
+;; Version: 1.25.1
;; Keywords: faces, php
;; Homepage: https://github.com/emacs-php/php-mode
;; License: GPL-3.0-or-later
diff --git a/lisp/php-flymake.el b/lisp/php-flymake.el
index a55a22a8d3..37e4aea426 100644
--- a/lisp/php-flymake.el
+++ b/lisp/php-flymake.el
@@ -4,7 +4,7 @@
;; Author: USAMI Kenta <[email protected]>
;; Created: 5 Mar 2022
-;; Version: 1.25.0
+;; Version: 1.25.1
;; Keywords: tools, languages, php
;; This program is free software; you can redistribute it and/or modify
diff --git a/lisp/php-ide-phpactor.el b/lisp/php-ide-phpactor.el
index ff9b8d7809..831f49be26 100644
--- a/lisp/php-ide-phpactor.el
+++ b/lisp/php-ide-phpactor.el
@@ -5,7 +5,7 @@
;; Author: USAMI Kenta <[email protected]>
;; Keywords: tools, files
;; URL: https://github.com/emacs-php/php-mode
-;; Version: 1.25.0
+;; Version: 1.25.1
;; License: GPL-3.0-or-later
;; This program is free software; you can redistribute it and/or modify
diff --git a/lisp/php-ide.el b/lisp/php-ide.el
index 26c8fd7eef..9f63cdee9b 100644
--- a/lisp/php-ide.el
+++ b/lisp/php-ide.el
@@ -5,7 +5,7 @@
;; Author: USAMI Kenta <[email protected]>
;; Keywords: tools, files
;; URL: https://github.com/emacs-php/php-mode
-;; Version: 1.25.0
+;; Version: 1.25.1
;; License: GPL-3.0-or-later
;; This program is free software; you can redistribute it and/or modify
diff --git a/lisp/php-mode-debug.el b/lisp/php-mode-debug.el
index 4526253180..a3e2d1dacc 100644
--- a/lisp/php-mode-debug.el
+++ b/lisp/php-mode-debug.el
@@ -5,7 +5,7 @@
;; Author: USAMI Kenta <[email protected]>
;; URL: https://github.com/emacs-php/php-mode
;; Keywords: maint
-;; Version: 1.25.0
+;; Version: 1.25.1
;; License: GPL-3.0-or-later
;; This program is free software; you can redistribute it and/or modify
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index efcdd2a333..022b2a62f0 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -9,13 +9,13 @@
;; Maintainer: USAMI Kenta <[email protected]>
;; URL: https://github.com/emacs-php/php-mode
;; Keywords: languages php
-;; Version: 1.25.0
+;; Version: 1.25.1
;; Package-Requires: ((emacs "26.1"))
;; License: GPL-3.0-or-later
(eval-and-compile
(make-obsolete-variable
- (defconst php-mode-version-number "1.25.0" "PHP Mode version number.")
+ (defconst php-mode-version-number "1.25.1" "PHP Mode version number.")
"Please call (php-mode-version :as-number t) for compatibility." "1.24.2"))
;; This program is free software; you can redistribute it and/or modify
diff --git a/lisp/php-project.el b/lisp/php-project.el
index 55a45ec2b9..6d20e455cf 100644
--- a/lisp/php-project.el
+++ b/lisp/php-project.el
@@ -5,7 +5,7 @@
;; Author: USAMI Kenta <[email protected]>
;; Keywords: tools, files
;; URL: https://github.com/emacs-php/php-mode
-;; Version: 1.25.0
+;; Version: 1.25.1
;; License: GPL-3.0-or-later
;; This program is free software; you can redistribute it and/or modify
diff --git a/lisp/php.el b/lisp/php.el
index 7188c0c61b..3c5f34901c 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -5,7 +5,7 @@
;; Author: USAMI Kenta <[email protected]>
;; Created: 5 Dec 2018
-;; Version: 1.25.0
+;; Version: 1.25.1
;; Keywords: languages, php
;; Homepage: https://github.com/emacs-php/php-mode
;; License: GPL-3.0-or-later
