Skip to content

Commit

Permalink
Merge pull request #769 from emacs-php/release/1.25.1
Browse files Browse the repository at this point in the history
Release 1.25.1
  • Loading branch information
zonuexe authored Nov 23, 2023
2 parents f6e3a1c + 6ad1715 commit 0c55240
Show file tree
Hide file tree
Showing 15 changed files with 35 additions and 19 deletions.
20 changes: 18 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,42 @@

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

* Removed Phan-specific features from `php-project` ([#754])
* 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

Expand Down
2 changes: 1 addition & 1 deletion Eask
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 2 additions & 2 deletions README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![lang: PHP 8.2](https://img.shields.io/badge/lang-PHP%208.2-brightgreen.svg)](https://php.net/manual/migration82.php)
[![lang: PHP 7](https://img.shields.io/badge/lang-PHP%207-green.svg)](https://php.net/downloads.php)
[![Build Status](https://github.com/emacs-php/php-mode/workflows/CI/badge.svg)](https://github.com/emacs-php/php-mode/actions)
[![GPL v3](https://img.shields.io/badge/license-GPL_v3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.txt)<br>
[![GPL v3](https://img.shields.io/badge/license-GPL_v3-green.svg)][gpl-v3]<br>
[![NonGNU ELPA][nongnu-elpa-badge]][nongnu-elpa]
[![melpa badge][melpa-badge]][melpa-link]

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![lang: PHP 8.2](https://img.shields.io/badge/lang-PHP%208.2-brightgreen.svg)](https://php.net/manual/migration82.php)
[![lang: PHP 7](https://img.shields.io/badge/lang-PHP%207-green.svg)](https://php.net/downloads.php)
[![Build Status](https://github.com/emacs-php/php-mode/workflows/CI/badge.svg)](https://github.com/emacs-php/php-mode/actions)
[![GPL v3](https://img.shields.io/badge/license-GPL_v3-green.svg)](http://www.gnu.org/licenses/gpl-3.0.txt)<br>
[![GPL v3](https://img.shields.io/badge/license-GPL_v3-green.svg)][gpl-v3]<br>
[![NonGNU ELPA][nongnu-elpa-badge]][nongnu-elpa]
[![melpa badge][melpa-badge]][melpa-link]

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php-align.el
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
;; Maintainer: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php-complete.el
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
;; Author: USAMI Kenta <tadsan@zonu.me>

;; 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php-defs.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

;; Author: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php-face.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

;; Author: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php-flymake.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

;; Author: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php-ide-phpactor.el
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
;; Author: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php-ide.el
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
;; Author: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php-mode-debug.el
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
;; Author: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down
4 changes: 2 additions & 2 deletions lisp/php-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
;; Maintainer: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php-project.el
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
;; Author: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down
2 changes: 1 addition & 1 deletion lisp/php.el
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

;; Author: USAMI Kenta <tadsan@zonu.me>
;; 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
Expand Down

0 comments on commit 0c55240

Please sign in to comment.