From a739193c1789e5b7c0e1b219cf663815ac487456 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Sun, 7 Mar 2021 23:36:48 +0900 Subject: [PATCH 1/2] Update CHANGELOG for v1.24.0 --- CHANGELOG.md | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 804783b3..eaeeed12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,47 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this ## Unreleased +### Added + + * Support new PHP 8.0 and 8.1 syntax hilighting and indentation + * [8.0] `#[Attributes]` + +## [1.24.0] - 2021-03-07 + +### Added + + * Support new PHP 8.0 and 8.1 syntax hilighting and indentation + * [8.0] `match` expression ([#632]) + * [8.0] `mixed` pseudo type declaration ([#633]) + * [8.1] `enum` statement ([#653]) + ### Changed - * Drop support for Emacs 24 and 25.1 + * Drop support for Emacs 24 and 25.1 ([#654]) + * Raises an error when the byte-compiled Cc Mode version does not match that version at runtime. + * You will need to recompile php-mode after the GNU Emacs version changes. + +## Removed + + * Remove `(require 'add-log)` + +### Fixed + + * Fix font-lock highlighting + * `!=` ([#630]) + * Fix Heredoc and Nowdoc highlighting ([]) + * Fix documentation mistake + * `php-mode-lineup-cascaded-calls` in README.md ([#644] thanks [@cweiske]!) + +[#630]: https://github.com/emacs-php/php-mode/pull/630 +[#632]: https://github.com/emacs-php/php-mode/pull/632 +[#633]: https://github.com/emacs-php/php-mode/pull/633 +[#644]: https://github.com/emacs-php/php-mode/pull/644 +[#651]: https://github.com/emacs-php/php-mode/pull/651 +[#653]: https://github.com/emacs-php/php-mode/pull/653 +[#654]: https://github.com/emacs-php/php-mode/pull/654 +[@antoineB]: https://github.com/antoineB +[@cweiske]: https://github.com/cweiske ## [1.23.0] - 2020-05-06 From dc23d929cd1a852722f183c74aeada1a29be01ff Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Sun, 7 Mar 2021 23:38:43 +0900 Subject: [PATCH 2/2] Bump up version 1.24.0 --- Cask | 2 +- lisp/php-align.el | 2 +- lisp/php-face.el | 2 +- lisp/php-mode-debug.el | 2 +- lisp/php-mode.el | 4 ++-- lisp/php-project.el | 2 +- lisp/php.el | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cask b/Cask index a37bc60b..a9fde9ec 100644 --- a/Cask +++ b/Cask @@ -1,4 +1,4 @@ -(package "php-mode" "1.23.0" "Major mode for editing PHP code") +(package "php-mode" "1.24.0" "Major mode for editing PHP code") (source melpa) (package-file "php-mode.el") diff --git a/lisp/php-align.el b/lisp/php-align.el index 648ceac0..1e144893 100644 --- a/lisp/php-align.el +++ b/lisp/php-align.el @@ -7,7 +7,7 @@ ;; Maintainer: USAMI Kenta ;; Keywords: php languages convenience align ;; Homepage: https://github.com/emacs-php/php-mode -;; Version: 1.23.0 +;; Version: 1.24.0 ;; License: GPL-3.0-or-later ;; 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 ac6f48da..1cbc800f 100644 --- a/lisp/php-face.el +++ b/lisp/php-face.el @@ -4,7 +4,7 @@ ;; Author: USAMI Kenta ;; Created: 5 May 2019 -;; Version: 1.23.0 +;; Version: 1.24.0 ;; Keywords: faces, php ;; Homepage: https://github.com/emacs-php/php-mode ;; License: GPL-3.0-or-later diff --git a/lisp/php-mode-debug.el b/lisp/php-mode-debug.el index 01f02a04..35dfea42 100644 --- a/lisp/php-mode-debug.el +++ b/lisp/php-mode-debug.el @@ -5,7 +5,7 @@ ;; Author: USAMI Kenta ;; URL: https://github.com/emacs-php/php-mode ;; Keywords: maint -;; Version: 1.23.0 +;; Version: 1.24.0 ;; 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 1b88a8a7..7c4480c4 100644 --- a/lisp/php-mode.el +++ b/lisp/php-mode.el @@ -9,11 +9,11 @@ ;; Maintainer: USAMI Kenta ;; URL: https://github.com/emacs-php/php-mode ;; Keywords: languages php -;; Version: 1.23.0 +;; Version: 1.24.0 ;; Package-Requires: ((emacs "25.2")) ;; License: GPL-3.0-or-later -(defconst php-mode-version-number "1.23.0" +(defconst php-mode-version-number "1.24.0" "PHP Mode version number.") ;; 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 5f4236d1..8f45ad6a 100644 --- a/lisp/php-project.el +++ b/lisp/php-project.el @@ -5,7 +5,7 @@ ;; Author: USAMI Kenta ;; Keywords: tools, files ;; URL: https://github.com/emacs-php/php-mode -;; Version: 1.23.0 +;; Version: 1.24.0 ;; 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 e417fa18..c9ba5e2c 100644 --- a/lisp/php.el +++ b/lisp/php.el @@ -4,7 +4,7 @@ ;; Author: USAMI Kenta ;; Created: 5 Dec 2018 -;; Version: 1.23.0 +;; Version: 1.24.0 ;; Keywords: languages, php ;; Homepage: https://github.com/emacs-php/php-mode ;; License: GPL-3.0-or-later