From f7beda8e0a3a508af71e43bcc2ccf796c49ab31e Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Sun, 26 Nov 2023 08:37:33 +0900
Subject: [PATCH 01/24] Update full copy of GPL Version 3

https://www.gnu.org/licenses/gpl-3.0.txt
---
 LICENSE | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index 94a9ed02..f288702d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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 <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

From 0b598a96760bfc09c29984fe1ca7d7ac660caa98 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Wed, 29 Nov 2023 02:37:19 +0900
Subject: [PATCH 02/24] Add php-base-mode for common parent mode for php
 editing modes

---
 CHANGELOG.md | 9 ++++++++-
 lisp/php.el  | 9 +++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ffd2693..62f59096 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,14 @@
 
 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
+
+### Added
+
+ * Add `php-base-mode` which is the base of php related modes ([#772])
+   * `php-base-mode` is designed as a common parent mode for `php-mode` and [`php-ts-mode`](https://github.com/emacs-php/php-ts-mode).
+
+[#772]: https://github.com/emacs-php/php-mode/pull/772
 
 ## [1.25.1] - 2023-11-24
 
diff --git a/lisp/php.el b/lisp/php.el
index 3c5f3490..8fa7a6d5 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -627,6 +627,15 @@ Look at the `php-executable' variable instead of the constant \"php\" command."
         (setq mode nil)))
     (or mode php-default-major-mode)))
 
+;;;###autoload
+(define-derived-mode php-base-mode prog-mode "PHP"
+  "Generic major mode for editing PHP.
+
+This mode is intended to be inherited by concrete major modes.
+Currently there are `php-mode' and `php-ts-mode'."
+  :group 'php
+  nil)
+
 ;;;###autoload
 (defun php-mode-maybe ()
   "Select PHP mode or other major mode."

From 52f82976069d002d8be10bd17b1cf476f83811d3 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Wed, 29 Nov 2023 02:38:15 +0900
Subject: [PATCH 03/24] Make php-mode inherit from php-base-mode instead of
 c-mode

---
 CHANGELOG.md     |  4 ++++
 lisp/php-mode.el | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f59096..649c8132 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
  * Add `php-base-mode` which is the base of php related modes ([#772])
    * `php-base-mode` is designed as a common parent mode for `php-mode` and [`php-ts-mode`](https://github.com/emacs-php/php-ts-mode).
 
+### Changed
+
+ * Make `php-mode` inherit from `php-base-mode` instead of `c-mode` ([#772])
+
 [#772]: https://github.com/emacs-php/php-mode/pull/772
 
 ## [1.25.1] - 2023-11-24
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 022b2a62..e19faea8 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -327,6 +327,7 @@ as a function.  Call with AS-NUMBER keyword to compare by `version<'.
 
 (defvar php-mode-map
   (let ((map (make-sparse-keymap "PHP Mode")))
+    (set-keymap-parent map c-mode-base-map)
     ;; Remove menu item for c-mode
     (define-key map [menu-bar C] nil)
 
@@ -1150,14 +1151,14 @@ After setting the stylevars run hook `php-mode-STYLENAME-hook'."
     table))
 
 ;;;###autoload
-(define-derived-mode php-mode c-mode "PHP"
+(define-derived-mode php-mode php-base-mode "PHP"
   "Major mode for editing PHP code.
 
 \\{php-mode-map}"
   :syntax-table php-mode-syntax-table
-  ;; :after-hook (c-update-modeline)
-  ;; (setq abbrev-mode t)
-
+  :after-hook (progn (c-make-noise-macro-regexps)
+                     (c-make-macro-with-semi-re)
+                     (c-update-modeline))
   (unless (string= php-mode-cc-version c-version)
     (php-mode-debug-reinstall nil))
 
@@ -1168,8 +1169,16 @@ After setting the stylevars run hook `php-mode-STYLENAME-hook'."
                      :warning))
 
   (c-initialize-cc-mode t)
+  (setq abbrev-mode t)
+
+  ;; Must be called once as c-mode to enable font-lock for Heredoc.
+  ;; TODO: This call may be removed in the future.
+  (c-common-init 'c-mode)
+
   (c-init-language-vars php-mode)
   (c-common-init 'php-mode)
+  (cc-imenu-init cc-imenu-c-generic-expression)
+
   (setq-local c-auto-align-backslashes nil)
 
   (setq-local comment-start "// ")
@@ -1252,7 +1261,7 @@ After setting the stylevars run hook `php-mode-STYLENAME-hook'."
   (advice-add 'acm-backend-tabnine-candidate-expand
               :filter-args #'php-acm-backend-tabnine-candidate-expand-filter-args)
 
-  (when (>= emacs-major-version 25)
+  (when (eval-when-compile (>= emacs-major-version 25))
     (with-silent-modifications
       (save-excursion
         (let* ((start (point-min))

From 7d740e7e5197266b78306d0c4e0da4aac2d2ad75 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Wed, 29 Nov 2023 03:09:57 +0900
Subject: [PATCH 04/24] Fix code style

---
 lisp/php.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/php.el b/lisp/php.el
index 8fa7a6d5..32142cb0 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -674,7 +674,9 @@ Currently there are `php-mode' and `php-ts-mode'."
   "Return function signature and class name string for header line in topsy.
 
 You can add the function to topsy with the code below:
-    \(add-to-list 'topsy-mode-functions '\(php-mode . php-topsy-beginning-of-defun-with-class\)\)"
+
+    (add-to-list \\='topsy-mode-functions
+                 \\='(php-mode . php-topsy-beginning-of-defun-with-class))"
   (save-excursion
     (goto-char (window-start))
     (mapconcat

From e22166bbc9ae89dc97e4f0337a68e5babb02821e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 17:44:31 +0000
Subject: [PATCH 05/24] Bump actions/setup-python from 4 to 5

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bfe04578..64071bf4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
             emacs-version: snapshot
             experimental: true
     steps:
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.11'
         architecture: 'x64'

From de19a9063c6b4b5f940ed71ea1dcb62f4f21aeed Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Sun, 17 Dec 2023 18:09:03 +0900
Subject: [PATCH 06/24] Remove php-mode-disable-c-mode-hook custom variable

---
 CHANGELOG.md     |  6 ++++++
 lisp/php-mode.el | 20 --------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 649c8132..87a6d404 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,13 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
 
  * Make `php-mode` inherit from `php-base-mode` instead of `c-mode` ([#772])
 
+### Removed
+
+ * Remove `php-mode-disable-c-mode-hook` custom variable and `php-mode-neutralize-cc-mode-effect` function ([#775])
+   * `php-mode` no longer inherits `c-mode`, so this variable won't work.
+
 [#772]: https://github.com/emacs-php/php-mode/pull/772
+[#775]: https://github.com/emacs-php/php-mode/pull/775
 
 ## [1.25.1] - 2023-11-24
 
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index e19faea8..94983369 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -292,13 +292,6 @@ In that case set to `NIL'."
   :tag "PHP Mode Enable Backup Style Variables"
   :type 'boolean)
 
-(define-obsolete-variable-alias 'php-mode-disable-parent-mode-hooks 'php-mode-disable-c-mode-hook "1.21.0")
-(defcustom php-mode-disable-c-mode-hook t
-  "When set to `T', do not run hooks of parent modes (`java-mode', `c-mode')."
-  :tag "PHP Mode Disable C Mode Hook"
-  :type 'boolean)
-(make-obsolete-variable 'php-mode-disable-c-mode-hook nil "1.24.2")
-
 (defcustom php-mode-enable-project-local-variable t
   "When set to `T', apply project local variable to buffer local variable."
   :tag "PHP Mode Enable Project Local Variable"
@@ -1132,13 +1125,6 @@ After setting the stylevars run hook `php-mode-STYLENAME-hook'."
   (php-project-apply-local-variables)
   (remove-hook 'hack-local-variables-hook #'php-mode-set-local-variable-delay))
 
-(defun php-mode-neutralize-cc-mode-effect ()
-  "Reset PHP-irrelevant variables set by Cc Mode initialization."
-  (setq-local c-mode-hook nil)
-  (setq-local java-mode-hook nil)
-  (remove-hook 'flymake-diagnostic-functions 'flymake-cc t)
-  t)
-
 (defvar php-mode-syntax-table
   (let ((table (make-syntax-table)))
     (c-populate-syntax-table table)
@@ -1162,12 +1148,6 @@ After setting the stylevars run hook `php-mode-STYLENAME-hook'."
   (unless (string= php-mode-cc-version c-version)
     (php-mode-debug-reinstall nil))
 
-  (if php-mode-disable-c-mode-hook
-      (php-mode-neutralize-cc-mode-effect)
-    (display-warning 'php-mode
-                     "`php-mode-disable-c-mode-hook' will be removed.  Do not depends on this variable."
-                     :warning))
-
   (c-initialize-cc-mode t)
   (setq abbrev-mode t)
 

From 2a52f9789e9ad413bd4788bf4fda2ae7312375af Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Sun, 17 Dec 2023 19:03:09 +0900
Subject: [PATCH 07/24] Ignore "dependabot" from AUTHORS.md

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 52665554..9b722e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,10 @@ AUTHORS.md: etc/git/AUTHORS.md.in .mailmap
 	@printf "Generating AUTHORS.md file..."
 	@test -d .git \
 		&& (cat $< > $@ \
-			&& git log --pretty=format:'- %aN' | \
-			cat etc/git/former-contributors - | LANG=C sort -u >> $@ \
+			&& git log --pretty=format:'- %aN' \
+				| cat etc/git/former-contributors - \
+				| grep -v dependabot \
+				| LANG=C sort -u >> $@ \
 			&& cat etc/git/AUTHORS2.md.in >> $@ \
 			&& printf "FINISHED\n" ; ) \
 		|| printf "FAILED (non-fatal)\n"

From c6efeaada6911ee95ce81ec509c07400268f1d20 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Sun, 17 Dec 2023 20:17:45 +0900
Subject: [PATCH 08/24] Modify overindentation for PEAR style

---
 CHANGELOG.md                     |  9 +++++++++
 lisp/php-mode.el                 |  2 +-
 tests/{ => indent}/issue-227.php |  2 +-
 tests/indent/issue-774.php       | 11 +++++++++++
 tests/php-mode-test.el           | 10 +++++-----
 5 files changed, 27 insertions(+), 7 deletions(-)
 rename tests/{ => indent}/issue-227.php (77%)
 create mode 100644 tests/indent/issue-774.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87a6d404..11708e02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,14 +12,23 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
 ### Changed
 
  * Make `php-mode` inherit from `php-base-mode` instead of `c-mode` ([#772])
+ * Modify indentation of [PEAR Coding Standards] ([#774], [#777])
+   * No longer overindent it by default, since we don't see any mention in the coding style that it should hang `.`. (refs [#227] and [#229])
+   * **If you have any feedback on PEAR style, please let us know in [the discussion #776][#776].**
 
 ### Removed
 
  * Remove `php-mode-disable-c-mode-hook` custom variable and `php-mode-neutralize-cc-mode-effect` function ([#775])
    * `php-mode` no longer inherits `c-mode`, so this variable won't work.
 
+[#227]: https://github.com/emacs-php/php-mode/pull/227
+[#229]: https://github.com/emacs-php/php-mode/pull/229
 [#772]: https://github.com/emacs-php/php-mode/pull/772
+[#774]: https://github.com/emacs-php/php-mode/issues/774
 [#775]: https://github.com/emacs-php/php-mode/pull/775
+[#776]: https://github.com/emacs-php/php-mode/discussions/776
+[#777]: https://github.com/emacs-php/php-mode/pull/777
+[PEAR Coding Standards]: https://pear.php.net/manual/en/standards.php
 
 ## [1.25.1] - 2023-11-24
 
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 94983369..5a6b887d 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -709,7 +709,7 @@ a backward search limit."
  "pear"
  '("php"
    (c-basic-offset . 4)
-   (c-offsets-alist . ((case-label . 0)))
+   (c-offsets-alist . ((case-label . 0) (statement-cont . +)))
    (tab-width . 4)
    (php-mode-lineup-cascaded-calls . nil)))
 
diff --git a/tests/issue-227.php b/tests/indent/issue-227.php
similarity index 77%
rename from tests/issue-227.php
rename to tests/indent/issue-227.php
index daf9200f..6f3c83f8 100644
--- a/tests/issue-227.php
+++ b/tests/indent/issue-227.php
@@ -8,5 +8,5 @@
 
 function my_func() {
     return "a really long string with = inside " .
-"some more text";   // ###php-mode-test### ((indent 49))
+"some more text";   // ###php-mode-test### ((indent 8))
 }
diff --git a/tests/indent/issue-774.php b/tests/indent/issue-774.php
new file mode 100644
index 00000000..118cfc06
--- /dev/null
+++ b/tests/indent/issue-774.php
@@ -0,0 +1,11 @@
+<?php
+
+$someObject->someFunction("some", "parameter") // ###php-mode-test### ((indent 0))
+    ->someOtherFunc(23, 42) // ###php-mode-test### ((indent 4))
+    ->andAThirdFunction(); // ###php-mode-test### ((indent 4))
+
+$result = DateTime::createFromFormat('Y-m-d', '2112-09-03') // ###php-mode-test### ((indent 0))
+    ->someFunction(); // ###php-mode-test### ((indent 4))
+
+$pages = $dbOld->createQueryBuilder() // ###php-mode-test### ((indent 0))
+    ->select('*'); // ###php-mode-test### ((indent 4))
diff --git a/tests/php-mode-test.el b/tests/php-mode-test.el
index 3590ba49..dde44c7f 100644
--- a/tests/php-mode-test.el
+++ b/tests/php-mode-test.el
@@ -522,11 +522,6 @@ style from Drupal."
     (search-forward "return")
     (should (eq (current-indentation) (* 2 c-basic-offset)))))
 
-(ert-deftest php-mode-test-issue-227 ()
-  "multi-line strings indents "
-  (custom-set-variables '(php-lineup-cascaded-calls t))
-  (with-php-mode-test ("issue-227.php" :indent t :style pear :magic t)))
-
 (ert-deftest php-mode-test-issue-237 ()
   "Indent chaining method for PSR2."
   (with-php-mode-test ("issue-237.php" :indent t :style psr2 :magic t)))
@@ -696,6 +691,11 @@ Meant for `php-mode-test-issue-503'."
   (with-php-mode-test ("lang/errorcontrol.php" :faces t))
   (with-php-mode-test ("lang/magical-constants/echo.php" :faces t)))
 
+(ert-deftest php-mode-test-pear ()
+  "Tests for PEAR style."
+  (with-php-mode-test ("indent/issue-227.php" :indent t :magic t :style pear))
+  (with-php-mode-test ("indent/issue-774.php" :indent t :magic t :style pear)))
+
 ;; For developers: How to make .faces list file.
 ;;
 ;; 1. Press `M-x eval-buffer' in this file bufffer.

From 6d197a9209104914c5a9c8ae35d977beed959ae6 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Thu, 18 Jan 2024 23:53:09 +0900
Subject: [PATCH 09/24] Simplify :safe function for php-ide-mode-functions

---
 lisp/php-ide.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/php-ide.el b/lisp/php-ide.el
index 9f63cdee..f73d5bc3 100644
--- a/lisp/php-ide.el
+++ b/lisp/php-ide.el
@@ -178,6 +178,7 @@
   :type 'string
   :safe #'stringp)
 
+;;;###autoload
 (defcustom php-ide-mode-functions nil
   "Hook functions called when before activating or deactivating PHP-IDE.
 Notice that two arguments (FEATURE ACTIVATE) are given.
@@ -188,9 +189,7 @@ ACTIVATE: T is given when activeting, NIL when deactivating PHP-IDE."
   :group 'php-ide
   :type '(repeat function)
   :safe (lambda (functions)
-          (and (listp functions)
-               (cl-loop for function in functions
-                        always (functionp function)))))
+          (and (listp functions) (cl-every #'functionp functions))))
 
 ;;;###autoload
 (define-minor-mode php-ide-mode

From f0a14387427244251883889ba616c7f042323f6d Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Thu, 18 Jan 2024 23:58:18 +0900
Subject: [PATCH 10/24] Add @phpstan-require-extends and
 @phpstan-require-implements tag

---
 lisp/php-mode.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 5a6b887d..d66cf0af 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1320,6 +1320,7 @@ for \\[find-tag] (which see)."
         "return" "throws" "var" "self-out" "this-out" "param-out"
         "type" "extends" "require-extends" "implemtents" "require-implements"
         "template" "template-covariant" "template-extends" "template-implements"
+        "require-extends" "require-implements"
         "assert" "assert-if-true" "assert-if-false" "if-this-is")
   "A list of tags specifying type names.")
 

From c06bd688ca1a6ff0383a7b5d97c5891354a1f3de Mon Sep 17 00:00:00 2001
From: Jen-Chieh Shen <jcs090218@gmail.com>
Date: Sat, 20 Jan 2024 01:34:57 -0800
Subject: [PATCH 11/24] chore: Test 29.2

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 64071bf4..c2db6011 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
           - "26.3"
           - "27.2"
           - "28.2"
-          - "29.1"
+          - "29.2"
         experimental: [false]
         include:
           - os: ubuntu-latest

From 4fbf4ebdae100538eb8493147c2385c55e32fcb0 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 29 Jan 2024 00:41:14 +0900
Subject: [PATCH 12/24] Update Emacs 29.2 badge

---
 README.ja.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.ja.md b/README.ja.md
index f6c61ba1..27e6a871 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -1,7 +1,7 @@
 <div align="center">
   <h1>Emacs PHP Mode</h1>
 
-[![Emacs: 29.1](https://img.shields.io/badge/Emacs-29.1-blue.svg)](https://www.gnu.org/software/emacs/)
+[![Emacs: 29.2](https://img.shields.io/badge/Emacs-29.2-blue.svg)](https://www.gnu.org/software/emacs/)
 [![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)
diff --git a/README.md b/README.md
index f02e9428..91a00e0b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <div align="center">
   <h1>Emacs PHP Mode</h1>
 
-[![Emacs: 29.1](https://img.shields.io/badge/Emacs-29.1-blue.svg)](https://www.gnu.org/software/emacs/)
+[![Emacs: 29.2](https://img.shields.io/badge/Emacs-29.2-blue.svg)](https://www.gnu.org/software/emacs/)
 [![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)

From a0bcafbe30494b2c5a70c2fe05f2bb0859e83645 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 29 Jan 2024 00:45:13 +0900
Subject: [PATCH 13/24] Update PHP 8.3 badge

---
 README.ja.md | 2 +-
 README.md    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.ja.md b/README.ja.md
index 27e6a871..5c0dd082 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -2,7 +2,7 @@
   <h1>Emacs PHP Mode</h1>
 
 [![Emacs: 29.2](https://img.shields.io/badge/Emacs-29.2-blue.svg)](https://www.gnu.org/software/emacs/)
-[![lang: PHP 8.2](https://img.shields.io/badge/lang-PHP%208.2-brightgreen.svg)](https://php.net/manual/migration82.php)
+[![lang: PHP 8.3](https://img.shields.io/badge/lang-PHP%208.3-brightgreen.svg)](https://php.net/manual/migration83.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)][gpl-v3]<br>
diff --git a/README.md b/README.md
index 91a00e0b..b2726c5d 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
   <h1>Emacs PHP Mode</h1>
 
 [![Emacs: 29.2](https://img.shields.io/badge/Emacs-29.2-blue.svg)](https://www.gnu.org/software/emacs/)
-[![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)
+[![lang: PHP 8.3](https://img.shields.io/badge/lang-PHP%208.3-brightgreen.svg)](https://www.php.net/manual/migration83.php)
+[![lang: PHP 7](https://img.shields.io/badge/lang-PHP%207-green.svg)](https://www.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)][gpl-v3]<br>
 [![NonGNU ELPA][nongnu-elpa-badge]][nongnu-elpa]

From 0f521ac4cb644ad0e2c4b9a3efb409a9bb287b02 Mon Sep 17 00:00:00 2001
From: Jen-Chieh Shen <jcs090218@gmail.com>
Date: Wed, 27 Mar 2024 00:13:56 -0700
Subject: [PATCH 14/24] ci: Bump Emacs 29.x to 3

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c2db6011..0825bdea 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
           - "26.3"
           - "27.2"
           - "28.2"
-          - "29.2"
+          - "29.3"
         experimental: [false]
         include:
           - os: ubuntu-latest

From 4bc08f68f2362e0fc36ff3c767c225b37afe58ec Mon Sep 17 00:00:00 2001
From: Jen-Chieh Shen <jcs090218@gmail.com>
Date: Tue, 7 May 2024 23:36:13 -0700
Subject: [PATCH 15/24] ci: Exclude macos tests below 27.x

See https://github.com/purcell/setup-emacs/issues/48.
---
 .github/workflows/test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0825bdea..6e755ae2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,6 +35,11 @@ jobs:
           - os: windows-latest
             emacs-version: snapshot
             experimental: true
+        exclude:
+          - os: macos-latest
+            emacs-version: "26.3"
+          - os: macos-latest
+            emacs-version: "27.2"
     steps:
     - uses: actions/setup-python@v5
       with:

From 0e4d7db6c8b09046d50a7dea33676c490940afc1 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Tue, 28 May 2024 03:32:01 +0900
Subject: [PATCH 16/24] Remove $ from facename for interop with treesit

---
 CHANGELOG.md                                 | 5 +++++
 lisp/php-face.el                             | 7 +++++--
 lisp/php-mode.el                             | 2 +-
 tests/7.4/typed-property.php.faces           | 8 ++++----
 tests/issue-136.php.faces                    | 4 ++--
 tests/issue-201.php.faces                    | 4 ++--
 tests/lang/doc-comment/comments.php.24.faces | 4 ++--
 tests/lang/doc-comment/comments.php.27.faces | 4 ++--
 tests/lang/doc-comment/comments.php.faces    | 4 ++--
 tests/php-mode-test.el                       | 4 ++--
 10 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11708e02..3ec3ec28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
  * Modify indentation of [PEAR Coding Standards] ([#774], [#777])
    * No longer overindent it by default, since we don't see any mention in the coding style that it should hang `.`. (refs [#227] and [#229])
    * **If you have any feedback on PEAR style, please let us know in [the discussion #776][#776].**
+ * Remove `$` from face names for interoperability with treesit ([#780], [emacs-php/php-ts-mode#68])
+   * `php-$this` → `php-this`
+   * `php-$this-sigil` → `php-this-sigil`
 
 ### Removed
 
@@ -28,6 +31,8 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
 [#775]: https://github.com/emacs-php/php-mode/pull/775
 [#776]: https://github.com/emacs-php/php-mode/discussions/776
 [#777]: https://github.com/emacs-php/php-mode/pull/777
+[#780]: https://github.com/emacs-php/php-mode/issues/780
+[emacs-php/php-ts-mode#68]: https://github.com/emacs-php/php-ts-mode/pull/68
 [PEAR Coding Standards]: https://pear.php.net/manual/en/standards.php
 
 ## [1.25.1] - 2023-11-24
diff --git a/lisp/php-face.el b/lisp/php-face.el
index 70db33e0..d5ac817b 100644
--- a/lisp/php-face.el
+++ b/lisp/php-face.el
@@ -156,16 +156,19 @@ The operator is also knows as \"Paamayim Nekudotayim\"."
   :group 'php-faces
   :tag "PHP Magical Constant")
 
-(defface php-$this '((t (:inherit php-constant)))
+(defface php-this '((t (:inherit php-constant)))
   "PHP Mode face used to highlight $this variables."
   :group 'php-faces
   :tag "PHP $this")
 
-(defface php-$this-sigil '((t (:inherit php-constant)))
+(defface php-this-sigil '((t (:inherit php-constant)))
   "PHP Mode face used to highlight sigils($) of $this variable."
   :group 'php-faces
   :tag "PHP $this Sigil")
 
+(define-obsolete-face-alias 'php-$this 'php-this "1.26.0")
+(define-obsolete-face-alias 'php-$this-sigil 'php-this-sigil "1.26.0")
+
 (defface php-errorcontrol-op '((t (:inherit font-lock-type-face)))
   "PHP Mode face used to highlight errorcontrol operators (@).."
   :group 'php-faces
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index d66cf0af..3ec28d66 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1378,7 +1378,7 @@ for \\[find-tag] (which see)."
      ("\\(!\\)[^=]" 1 'php-logical-op)
 
      ;; Highlight special variables
-     ("\\(\\$\\)\\(this\\)\\>" (1 'php-$this-sigil) (2 'php-$this))
+     ("\\(\\$\\)\\(this\\)\\>" (1 'php-this-sigil) (2 'php-this))
      ("\\(\\$+\\)\\(\\sw+\\)" (1 'php-variable-sigil) (2 'php-variable-name))
      ("\\(->\\)\\([a-zA-Z0-9_]+\\)" (1 'php-object-op) (2 'php-property-name))
 
diff --git a/tests/7.4/typed-property.php.faces b/tests/7.4/typed-property.php.faces
index fac03f33..93779d5c 100644
--- a/tests/7.4/typed-property.php.faces
+++ b/tests/7.4/typed-property.php.faces
@@ -32,8 +32,8 @@
  (" ")
  ("null" . php-constant)
  (")\n    {\n        ")
- ("$" . php-$this-sigil)
- ("this" . php-$this)
+ ("$" . php-this-sigil)
+ ("this" . php-this)
  ("->" . php-object-op)
  ("string" . php-property-name)
  (" ")
@@ -50,8 +50,8 @@
  ("()\n    {\n        ")
  ("var_dump" . php-function-call)
  ("(")
- ("$" . php-$this-sigil)
- ("this" . php-$this)
+ ("$" . php-this-sigil)
+ ("this" . php-this)
  ("->" . php-object-op)
  ("string" . php-property-name)
  (");\n    }\n}\n\n(")
diff --git a/tests/issue-136.php.faces b/tests/issue-136.php.faces
index 538cdd97..0e5d6b71 100644
--- a/tests/issue-136.php.faces
+++ b/tests/issue-136.php.faces
@@ -103,8 +103,8 @@
  ("$" . php-variable-sigil)
  ("name" . php-variable-name)
  (")\n    {\n        ")
- ("$" . php-$this-sigil)
- ("this" . php-$this)
+ ("$" . php-this-sigil)
+ ("this" . php-this)
  ("->" . php-object-op)
  ("name" . php-property-name)
  (" = ")
diff --git a/tests/issue-201.php.faces b/tests/issue-201.php.faces
index 7cd5f111..5801ea2a 100644
--- a/tests/issue-201.php.faces
+++ b/tests/issue-201.php.faces
@@ -8,8 +8,8 @@
  ("\n\n")
  ("// " . font-lock-comment-delimiter-face)
  ("Start:\n" . font-lock-comment-face)
- ("$" . php-$this-sigil)
- ("this" . php-$this)
+ ("$" . php-this-sigil)
+ ("this" . php-this)
  (";\n")
  ("$" . php-variable-sigil)
  ("that" . php-variable-name)
diff --git a/tests/lang/doc-comment/comments.php.24.faces b/tests/lang/doc-comment/comments.php.24.faces
index 593bb49e..ca033603 100644
--- a/tests/lang/doc-comment/comments.php.24.faces
+++ b/tests/lang/doc-comment/comments.php.24.faces
@@ -105,8 +105,8 @@
  ("$" . php-variable-sigil)
  ("name" . php-variable-name)
  (")\n    {\n        ")
- ("$" . php-$this-sigil)
- ("this" . php-$this)
+ ("$" . php-this-sigil)
+ ("this" . php-this)
  ("->" . php-object-op)
  ("name" . php-property-name)
  (" ")
diff --git a/tests/lang/doc-comment/comments.php.27.faces b/tests/lang/doc-comment/comments.php.27.faces
index 8b3b78e5..9b2fe992 100644
--- a/tests/lang/doc-comment/comments.php.27.faces
+++ b/tests/lang/doc-comment/comments.php.27.faces
@@ -106,8 +106,8 @@
  ("$" . php-variable-sigil)
  ("name" . php-variable-name)
  (")\n    {\n        ")
- ("$" . php-$this-sigil)
- ("this" . php-$this)
+ ("$" . php-this-sigil)
+ ("this" . php-this)
  ("->" . php-object-op)
  ("name" . php-property-name)
  (" ")
diff --git a/tests/lang/doc-comment/comments.php.faces b/tests/lang/doc-comment/comments.php.faces
index 593bb49e..ca033603 100644
--- a/tests/lang/doc-comment/comments.php.faces
+++ b/tests/lang/doc-comment/comments.php.faces
@@ -105,8 +105,8 @@
  ("$" . php-variable-sigil)
  ("name" . php-variable-name)
  (")\n    {\n        ")
- ("$" . php-$this-sigil)
- ("this" . php-$this)
+ ("$" . php-this-sigil)
+ ("this" . php-this)
  ("->" . php-object-op)
  ("name" . php-property-name)
  (" ")
diff --git a/tests/php-mode-test.el b/tests/php-mode-test.el
index dde44c7f..9890e0c8 100644
--- a/tests/php-mode-test.el
+++ b/tests/php-mode-test.el
@@ -533,8 +533,8 @@ style from Drupal."
     (should (eq 'php-variable-name (get-text-property (1- (point)) 'face)))
 
     (search-forward "$this")
-    (should (eq 'php-$this-sigil (get-text-property (match-beginning 0) 'face)))
-    (should (eq 'php-$this (get-text-property (1+ (match-beginning 0)) 'face)))
+    (should (eq 'php-this-sigil (get-text-property (match-beginning 0) 'face)))
+    (should (eq 'php-this (get-text-property (1+ (match-beginning 0)) 'face)))
 
     (search-forward "$x")
     (should (eq 'php-variable-sigil (get-text-property (match-beginning 0) 'face)))

From ee88d597bed1be3dab481513411ba91e46d24da3 Mon Sep 17 00:00:00 2001
From: Alex Figl-Brick <alex@alexbrick.me>
Date: Thu, 20 Jun 2024 15:23:33 +0900
Subject: [PATCH 17/24] Add php-function-call-standard inherit
 font-lock-function-call-face

---
 AUTHORS.md       | 1 +
 CHANGELOG.md     | 3 +++
 lisp/php-face.el | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index bdd02614..2c25aaee 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -24,6 +24,7 @@ Names Sorted Alphabetically:
 
 - Aaron S. Hawley
 - Alan Pearce
+- Alex Figl-Brick
 - Andreas Röhler
 - Andrei Chițu
 - Antoine Brand
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ec3ec28..84abbfb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
  * Remove `$` from face names for interoperability with treesit ([#780], [emacs-php/php-ts-mode#68])
    * `php-$this` → `php-this`
    * `php-$this-sigil` → `php-this-sigil`
+ * Add `php-function-call-standard` face inherit `font-lock-function-call-face` on Emacs 29.1 and above ([#782], thanks [@bricka]!)
 
 ### Removed
 
@@ -32,6 +33,8 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
 [#776]: https://github.com/emacs-php/php-mode/discussions/776
 [#777]: https://github.com/emacs-php/php-mode/pull/777
 [#780]: https://github.com/emacs-php/php-mode/issues/780
+[#782]: https://github.com/emacs-php/php-mode/issues/782
+[@bricka]: https://github.com/bricka
 [emacs-php/php-ts-mode#68]: https://github.com/emacs-php/php-ts-mode/pull/68
 [PEAR Coding Standards]: https://pear.php.net/manual/en/standards.php
 
diff --git a/lisp/php-face.el b/lisp/php-face.el
index d5ac817b..bb07e531 100644
--- a/lisp/php-face.el
+++ b/lisp/php-face.el
@@ -55,6 +55,12 @@
   :group 'php-faces
   :tag "PHP Function Name")
 
+(defface php-function-call-standard `((t ,(when (eval-when-compile (get 'font-lock-function-call-face 'face-defface-spec))
+                                            '(:inherit font-lock-function-call-face))))
+  "PHP Mode face used to highlight function names in calles."
+  :group 'php-faces
+  :tag "PHP Function Call Standard")
+
 (defface php-function-call '((t ()))
   "PHP Mode face used to highlight function names in calles."
   :group 'php-faces

From 0ed7faa0b504d9fea62e66d52de9d8c85d29a43d Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Thu, 20 Jun 2024 16:29:19 +0900
Subject: [PATCH 18/24] Add -traditional and -standard faces to call faces

---
 CHANGELOG.md     |  5 +++++
 lisp/php-face.el | 28 ++++++++++++++++++++++------
 lisp/php-mode.el |  6 +++---
 lisp/php.el      | 18 ++++++++++++++++++
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84abbfb5..8a62ff7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,11 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
    * `php-$this` → `php-this`
    * `php-$this-sigil` → `php-this-sigil`
  * Add `php-function-call-standard` face inherit `font-lock-function-call-face` on Emacs 29.1 and above ([#782], thanks [@bricka]!)
+ * Add `-tranditional` suffix to the `php-*-call` faces.
+   * `php-function-call` → `php-function-call-traditional`
+   * `php-method-call` → `php-method-call-traditional`
+   * `php-static-method-call` → `php-static-method-call-traditional`
+ * Add variables for the `php-function-call`, `php-method-call`, and `php-static-method-call` faces, defaulting to the `-traditional` face.
 
 ### Removed
 
diff --git a/lisp/php-face.el b/lisp/php-face.el
index bb07e531..4f16a816 100644
--- a/lisp/php-face.el
+++ b/lisp/php-face.el
@@ -61,20 +61,36 @@
   :group 'php-faces
   :tag "PHP Function Call Standard")
 
-(defface php-function-call '((t ()))
+(defface php-function-call-traditional '((t ()))
   "PHP Mode face used to highlight function names in calles."
   :group 'php-faces
-  :tag "PHP Function Call")
+  :tag "PHP Function Call Traditional")
 
-(defface php-method-call '((t (:inherit php-function-call)))
+(define-obsolete-face-alias 'php-function-call 'php-function-call-traditional "1.26.0")
+
+(defface php-method-call-standard '((t (:inherit php-function-call-standard)))
   "PHP Mode face used to highlight method names in calles."
   :group 'php-faces
-  :tag "PHP Method Call")
+  :tag "PHP Method Call Standard")
+
+(defface php-method-call-traditional '((t (:inherit php-function-call-traditional)))
+  "PHP Mode face used to highlight method names in calles."
+  :group 'php-faces
+  :tag "PHP Method Call Traditional")
+
+(define-obsolete-face-alias 'php-method-call 'php-method-call-traditional "1.26.0")
 
-(defface php-static-method-call '((t (:inherit php-method-call)))
+(defface php-static-method-call-standard '((t (:inherit php-method-call-standard)))
   "PHP Mode face used to highlight static method names in calles."
   :group 'php-faces
-  :tag "PHP Static Method Call")
+  :tag "PHP Static Method Call Standard")
+
+(defface php-static-method-call-traditional '((t (:inherit php-method-call-traditional)))
+  "PHP Mode face used to highlight static method names in calles."
+  :group 'php-faces
+  :tag "PHP Static Method Call Traditional")
+
+(define-obsolete-face-alias 'php-static-method-call 'php-static-method-call-traditional "1.26.0")
 
 (defface php-variable-name '((t (:inherit font-lock-variable-name-face)))
   "PHP Mode face used to highlight variable names."
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 3ec28d66..cfb1f17f 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1371,7 +1371,7 @@ for \\[find-tag] (which see)."
 
      ;; Highlight variables, e.g. 'var' in '$var' and '$obj->var', but
      ;; not in $obj->var()
-     ("\\(->\\)\\(\\sw+\\)\\s-*(" (1 'php-object-op) (2 'php-method-call))
+     ("\\(->\\)\\(\\sw+\\)\\s-*(" (1 'php-object-op) (2 php-method-call))
      ("\\<\\(const\\)\\s-+\\(\\_<.+?\\_>\\)" (1 'php-keyword) (2 'php-constant-assign))
 
      ;; Logical operator (!)
@@ -1413,7 +1413,7 @@ for \\[find-tag] (which see)."
 
      ;; Highlight static method calls as such. This is necessary for method
      ;; names which are identical to keywords to be highlighted correctly.
-     ("\\sw+::\\(\\sw+\\)(" 1 'php-static-method-call)
+     ("\\sw+::\\(\\sw+\\)(" 1 php-static-method-call)
      ;; Multiple catch (FooException | BarException $e)
      (,(rx symbol-start "catch" symbol-end
            (* (syntax whitespace)) "(" (* (syntax whitespace))
@@ -1457,7 +1457,7 @@ for \\[find-tag] (which see)."
       (1 'php-import-declaration)
       (,(rx (group (+ (or (syntax word) (syntax symbol) "\\" "{" "}")))) nil nil (1 'php-constant-assign t)))
      ;; Highlight function calls
-     ("\\(\\_<\\(?:\\sw\\|\\s_\\)+?\\_>\\)\\s-*(" 1 'php-function-call)
+     ("\\(\\_<\\(?:\\sw\\|\\s_\\)+?\\_>\\)\\s-*(" 1 php-function-call)
      ;; Highlight all upper-cased symbols as constant
      ("\\<\\([A-Z_][A-Z0-9_]+\\)\\>" 1 'php-constant)
 
diff --git a/lisp/php.el b/lisp/php.el
index 32142cb0..e78c7c97 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -209,6 +209,24 @@ a completion list."
   :group 'php
   :tag "PHP Topsy Separator"
   :type 'string)
+
+(defcustom php-function-call 'php-function-call-traditional
+  "Face name to use for method call."
+  :group 'php
+  :tag "PHP Function Call"
+  :type 'face)
+
+(defcustom php-method-call 'php-method-call-traditional
+  "Face name to use for method call."
+  :group 'php
+  :tag "PHP Method Call"
+  :type 'face)
+
+(defcustom php-static-method-call 'php-static-method-call-traditional
+  "Face name to use for method call."
+  :group 'php
+  :tag "PHP Static Method Call"
+  :type 'face)
 
 ;;; PHP Keywords
 (defconst php-magical-constants

From ccd28de9b881fea3d76e51785fa2e0da9e05347c Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Thu, 20 Jun 2024 16:29:43 +0900
Subject: [PATCH 19/24] Fix tests

---
 tests/7.4/typed-property.php.faces           |  4 ++--
 tests/8.0/attribute/class.php.faces          | 12 +++++-----
 tests/8.0/attribute/function.php.faces       |  8 +++----
 tests/constants.php.faces                    |  2 +-
 tests/identifiers.php.faces                  |  6 ++---
 tests/issue-197.php.faces                    |  4 ++--
 tests/issue-201.php.faces                    |  6 ++---
 tests/issue-439.php.faces                    |  4 ++--
 tests/lang/class/anonymous-class.php.faces   |  2 +-
 tests/lang/doc-comment/comments.php.24.faces |  2 +-
 tests/lang/doc-comment/comments.php.27.faces |  2 +-
 tests/lang/doc-comment/comments.php.faces    |  2 +-
 tests/lang/function/calls.php.faces          | 24 ++++++++++----------
 tests/lang/function/closure.php.faces        |  6 ++---
 tests/static-method-calls.php.faces          | 18 +++++++--------
 tests/variables.php.faces                    |  2 +-
 16 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/tests/7.4/typed-property.php.faces b/tests/7.4/typed-property.php.faces
index 93779d5c..660b7b0a 100644
--- a/tests/7.4/typed-property.php.faces
+++ b/tests/7.4/typed-property.php.faces
@@ -48,7 +48,7 @@
  (" ")
  ("print" . php-function-name)
  ("()\n    {\n        ")
- ("var_dump" . php-function-call)
+ ("var_dump" . php-function-call-traditional)
  ("(")
  ("$" . php-this-sigil)
  ("this" . php-this)
@@ -60,5 +60,5 @@
  ("Typed" . font-lock-type-face)
  (")")
  ("->" . php-object-op)
- ("print" . php-method-call)
+ ("print" . php-method-call-traditional)
  ("();\n"))
diff --git a/tests/8.0/attribute/class.php.faces b/tests/8.0/attribute/class.php.faces
index a4381657..1d249b6a 100644
--- a/tests/8.0/attribute/class.php.faces
+++ b/tests/8.0/attribute/class.php.faces
@@ -24,10 +24,10 @@
 
     #[WithoutArgument]
     #[")
- ("SingleArgument" . php-function-call)
+ ("SingleArgument" . php-function-call-traditional)
  ("(0)]
     #[")
- ("FewArguments" . php-function-call)
+ ("FewArguments" . php-function-call-traditional)
  ("(")
  ("'Hello'" . php-string)
  (", ")
@@ -40,9 +40,9 @@
  ("() {}
 
     #[WithoutArgument] #[")
- ("SingleArgument" . php-function-call)
+ ("SingleArgument" . php-function-call-traditional)
  ("(0)] #[")
- ("FewArguments" . php-function-call)
+ ("FewArguments" . php-function-call-traditional)
  ("(")
  ("'Hello'" . php-string)
  (", ")
@@ -55,11 +55,11 @@
  ("() {}
 
     #[")
- ("Attr2" . php-function-call)
+ ("Attr2" . php-function-call-traditional)
  ("(")
  ("\"foo\"" . php-string)
  ("), ")
- ("Attr2" . php-function-call)
+ ("Attr2" . php-function-call-traditional)
  ("(")
  ("\"bar\"" . php-string)
  (")]
diff --git a/tests/8.0/attribute/function.php.faces b/tests/8.0/attribute/function.php.faces
index da2aea6c..00cedf07 100644
--- a/tests/8.0/attribute/function.php.faces
+++ b/tests/8.0/attribute/function.php.faces
@@ -11,10 +11,10 @@
 
 #[WithoutArgument]
 #[")
- ("SingleArgument" . php-function-call)
+ ("SingleArgument" . php-function-call-traditional)
  ("(0)]
 #[")
- ("FewArguments" . php-function-call)
+ ("FewArguments" . php-function-call-traditional)
  ("(")
  ("'Hello'" . php-string)
  (", ")
@@ -27,9 +27,9 @@
  ("() {}
 
 #[WithoutArgument]#[")
- ("SingleArgument" . php-function-call)
+ ("SingleArgument" . php-function-call-traditional)
  ("(0)]#[")
- ("FewArguments" . php-function-call)
+ ("FewArguments" . php-function-call-traditional)
  ("(")
  ("'Hello'" . php-string)
  (", ")
diff --git a/tests/constants.php.faces b/tests/constants.php.faces
index 28f9523d..6718eb44 100644
--- a/tests/constants.php.faces
+++ b/tests/constants.php.faces
@@ -46,7 +46,7 @@
  (";\n")
  ("SomeClass" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("classIdentifier" . php-static-method-call)
+ ("classIdentifier" . php-static-method-call-traditional)
  ("();\n\n")
  ("__halt_compiler" . php-keyword)
  ("();\n\n")
diff --git a/tests/identifiers.php.faces b/tests/identifiers.php.faces
index fbb56dfa..df098c90 100644
--- a/tests/identifiers.php.faces
+++ b/tests/identifiers.php.faces
@@ -43,15 +43,15 @@
  ("the constant face. Just like c++-mode \"NS::Class::method()\"\n" . font-lock-comment-face)
  ("ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n")
  ("\\SpaceName\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n")
  ("\\My_Class" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n\n")
  ("__halt_compiler" . php-keyword)
  ("();\n\n")
diff --git a/tests/issue-197.php.faces b/tests/issue-197.php.faces
index 94f2abef..85469d9d 100644
--- a/tests/issue-197.php.faces
+++ b/tests/issue-197.php.faces
@@ -21,10 +21,10 @@
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
  ("->" . php-object-op)
- ("int" . php-method-call)
+ ("int" . php-method-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("test" . php-variable-name)
  ("->" . php-object-op)
- ("string" . php-method-call)
+ ("string" . php-method-call-traditional)
  ("();\n"))
diff --git a/tests/issue-201.php.faces b/tests/issue-201.php.faces
index 5801ea2a..5c3ccda8 100644
--- a/tests/issue-201.php.faces
+++ b/tests/issue-201.php.faces
@@ -16,13 +16,13 @@
  (";\n")
  ("self" . php-keyword)
  ("::" . php-paamayim-nekudotayim)
- ("test" . php-static-method-call)
+ ("test" . php-static-method-call-traditional)
  ("();\n")
  ("static" . php-keyword)
  ("::" . php-paamayim-nekudotayim)
- ("test" . php-static-method-call)
+ ("test" . php-static-method-call-traditional)
  ("();\n")
  ("parent" . php-keyword)
  ("::" . php-paamayim-nekudotayim)
- ("test" . php-static-method-call)
+ ("test" . php-static-method-call-traditional)
  ("();\n"))
diff --git a/tests/issue-439.php.faces b/tests/issue-439.php.faces
index 595bcbab..bc3094e6 100644
--- a/tests/issue-439.php.faces
+++ b/tests/issue-439.php.faces
@@ -52,7 +52,7 @@
  (" ")
  ("<<<\"いろは\"\nLet'go Justin\nいろは" . php-string)
  (";\n\n")
- ("var_dump" . php-function-call)
+ ("var_dump" . php-function-call-traditional)
  ("(")
  ("<<<\"ABC\"\nLet'go Justin\nABC" . php-string)
  (");\n\n")
@@ -60,7 +60,7 @@
  (" (1 ")
  ("===" . php-comparison-op)
  (" 1) {\n    ")
- ("var_dump" . php-function-call)
+ ("var_dump" . php-function-call-traditional)
  ("(")
  ("<<<\"ABC\"\n    Let'go Justin\n    ABC" . php-string)
  (");\n}\n"))
diff --git a/tests/lang/class/anonymous-class.php.faces b/tests/lang/class/anonymous-class.php.faces
index 415bcaa2..bd0df9ce 100644
--- a/tests/lang/class/anonymous-class.php.faces
+++ b/tests/lang/class/anonymous-class.php.faces
@@ -17,7 +17,7 @@
  ("// " . font-lock-comment-delimiter-face)
  ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
  ("};\n\n")
- ("is_object" . php-function-call)
+ ("is_object" . php-function-call-traditional)
  ("(1, ")
  ("new" . php-keyword)
  (" ")
diff --git a/tests/lang/doc-comment/comments.php.24.faces b/tests/lang/doc-comment/comments.php.24.faces
index ca033603..06f70485 100644
--- a/tests/lang/doc-comment/comments.php.24.faces
+++ b/tests/lang/doc-comment/comments.php.24.faces
@@ -134,7 +134,7 @@
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("hoge" . php-function-call)
+ ("hoge" . php-function-call-traditional)
  ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
  ("one-line comment\n" . font-lock-comment-face)
diff --git a/tests/lang/doc-comment/comments.php.27.faces b/tests/lang/doc-comment/comments.php.27.faces
index 9b2fe992..70c23fb3 100644
--- a/tests/lang/doc-comment/comments.php.27.faces
+++ b/tests/lang/doc-comment/comments.php.27.faces
@@ -135,7 +135,7 @@
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("hoge" . php-function-call)
+ ("hoge" . php-function-call-traditional)
  ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
  ("one-line comment\n" . font-lock-comment-face)
diff --git a/tests/lang/doc-comment/comments.php.faces b/tests/lang/doc-comment/comments.php.faces
index ca033603..06f70485 100644
--- a/tests/lang/doc-comment/comments.php.faces
+++ b/tests/lang/doc-comment/comments.php.faces
@@ -134,7 +134,7 @@
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("hoge" . php-function-call)
+ ("hoge" . php-function-call-traditional)
  ("();\n\n        ")
  ("// " . font-lock-comment-delimiter-face)
  ("one-line comment\n" . font-lock-comment-face)
diff --git a/tests/lang/function/calls.php.faces b/tests/lang/function/calls.php.faces
index 19d681c5..7713374a 100644
--- a/tests/lang/function/calls.php.faces
+++ b/tests/lang/function/calls.php.faces
@@ -9,73 +9,73 @@
  ("foo" . php-variable-name)
  (")) {\n    1")
  ("+" . php-arithmetic-op)
- ("bar" . php-function-call)
+ ("bar" . php-function-call-traditional)
  ("()+")
- ("foo" . php-function-call)
+ ("foo" . php-function-call-traditional)
  ("();\n}\n\n")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
  ("->" . php-object-op)
- ("string" . php-method-call)
+ ("string" . php-method-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("foo" . php-variable-name)
  ("->" . php-object-op)
- ("isset" . php-method-call)
+ ("isset" . php-method-call-traditional)
  ("();\n\n\n")
  ("$" . php-variable-sigil)
  ("a" . php-variable-name)
  ("->" . php-object-op)
- ("b" . php-method-call)
+ ("b" . php-method-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("a" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("a" . php-function-call)
+ ("a" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("aaa" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("aaa" . php-function-call)
+ ("aaa" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("_aa" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("_aa" . php-function-call)
+ ("_aa" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("a_a" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("a_a" . php-function-call)
+ ("a_a" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("aa_" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("aa_" . php-function-call)
+ ("aa_" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("a1c" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("a1c" . php-function-call)
+ ("a1c" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("あ" . php-variable-name)
  (" ")
  ("=" . php-assignment-op)
  (" ")
- ("あ" . php-function-call)
+ ("あ" . php-function-call-traditional)
  ("();\n")
  ("$" . php-variable-sigil)
  ("_a" . php-variable-name)
diff --git a/tests/lang/function/closure.php.faces b/tests/lang/function/closure.php.faces
index 1d671f72..9bf83b50 100644
--- a/tests/lang/function/closure.php.faces
+++ b/tests/lang/function/closure.php.faces
@@ -1,7 +1,7 @@
 ;; -*- mode: emacs-lisp -*-
 (("<?php" . php-php-tag)
  ("\n\n")
- ("is_object" . php-function-call)
+ ("is_object" . php-function-call-traditional)
  ("(")
  ("static" . php-keyword)
  (" ")
@@ -10,7 +10,7 @@
  ("// " . font-lock-comment-delimiter-face)
  ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
  ("});\n\n")
- ("is_object" . php-function-call)
+ ("is_object" . php-function-call-traditional)
  ("(")
  ("static" . php-keyword)
  (" ")
@@ -20,4 +20,4 @@
  (" {\n    ")
  ("// " . font-lock-comment-delimiter-face)
  ("###php-mode-test### ((indent 4))\n" . font-lock-comment-face)
- ("});\n"))
\ No newline at end of file
+ ("});\n"))
diff --git a/tests/static-method-calls.php.faces b/tests/static-method-calls.php.faces
index 34e77b91..8cdd0815 100644
--- a/tests/static-method-calls.php.faces
+++ b/tests/static-method-calls.php.faces
@@ -3,37 +3,37 @@
  ("\n\n")
  ("ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n")
  ("\\Project\\Module\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n")
  ("\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("method" . php-static-method-call)
+ ("method" . php-static-method-call-traditional)
  ("();\n\n")
  ("ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("new" . php-static-method-call)
+ ("new" . php-static-method-call-traditional)
  ("();\n")
  ("\\Project\\Module\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("new" . php-static-method-call)
+ ("new" . php-static-method-call-traditional)
  ("();\n")
  ("\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("new" . php-static-method-call)
+ ("new" . php-static-method-call-traditional)
  ("();\n\n")
  ("ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("clone" . php-static-method-call)
+ ("clone" . php-static-method-call-traditional)
  ("();\n")
  ("\\Project\\Module\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("clone" . php-static-method-call)
+ ("clone" . php-static-method-call-traditional)
  ("();\n")
  ("\\ClassName" . php-constant)
  ("::" . php-paamayim-nekudotayim)
- ("clone" . php-static-method-call)
+ ("clone" . php-static-method-call-traditional)
  ("();\n"))
diff --git a/tests/variables.php.faces b/tests/variables.php.faces
index 7a7573c5..c777aa4e 100644
--- a/tests/variables.php.faces
+++ b/tests/variables.php.faces
@@ -56,5 +56,5 @@
  ("$" . php-variable-sigil)
  ("object" . php-variable-name)
  ("->" . php-object-op)
- ("funCall" . php-method-call)
+ ("funCall" . php-method-call-traditional)
  ("();\n"))

From 59814bd80c59894022bc5950fb3bdf02420e8a89 Mon Sep 17 00:00:00 2001
From: Jen-Chieh Shen <jcs090218@gmail.com>
Date: Mon, 22 Jul 2024 16:43:15 -0700
Subject: [PATCH 20/24]  ci: Bump Emacs 29.x to 4

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6e755ae2..41fa23bb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
           - "26.3"
           - "27.2"
           - "28.2"
-          - "29.3"
+          - "29.4"
         experimental: [false]
         include:
           - os: ubuntu-latest

From a0a14e79db522251196bbe76ff804cf90d3be2a7 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Thu, 12 Sep 2024 03:22:36 +0900
Subject: [PATCH 21/24] Just call syntax-ppss-flush-cache instead of an
 explicit property.

This issue was first introduced in #316 as a workaround for a problem
with Emacs 25 not coloring properly. This approach was disadvantageous
for large files, and although performance was improved in #531, we
often suffered from flickering.
---
 CHANGELOG.md     | 4 ++++
 lisp/php-mode.el | 9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a62ff7a..c854979b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
    * `php-method-call` → `php-method-call-traditional`
    * `php-static-method-call` → `php-static-method-call-traditional`
  * Add variables for the `php-function-call`, `php-method-call`, and `php-static-method-call` faces, defaulting to the `-traditional` face.
+ * Changes how php-syntax-propertize-rules are applied for the first time. ([#785] and [#786])
+   * This change is expected to make heredoc and attribute coloring more stable and reduce flicker.
 
 ### Removed
 
@@ -39,6 +41,8 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
 [#777]: https://github.com/emacs-php/php-mode/pull/777
 [#780]: https://github.com/emacs-php/php-mode/issues/780
 [#782]: https://github.com/emacs-php/php-mode/issues/782
+[#785]: https://github.com/emacs-php/php-mode/issues/785
+[#786]: https://github.com/emacs-php/php-mode/pull/786
 [@bricka]: https://github.com/bricka
 [emacs-php/php-ts-mode#68]: https://github.com/emacs-php/php-ts-mode/pull/68
 [PEAR Coding Standards]: https://pear.php.net/manual/en/standards.php
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index cfb1f17f..67fc8138 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1,6 +1,6 @@
 ;;; php-mode.el --- Major mode for editing PHP code  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2023  Friends of Emacs-PHP development
+;; Copyright (C) 2024  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
@@ -1242,12 +1242,7 @@ After setting the stylevars run hook `php-mode-STYLENAME-hook'."
               :filter-args #'php-acm-backend-tabnine-candidate-expand-filter-args)
 
   (when (eval-when-compile (>= emacs-major-version 25))
-    (with-silent-modifications
-      (save-excursion
-        (let* ((start (point-min))
-               (end (min (point-max)
-                         (+ start syntax-propertize-chunk-size))))
-          (php-syntax-propertize-function start end))))))
+    (syntax-ppss-flush-cache (point-min))))
 
 (declare-function semantic-create-imenu-index "semantic/imenu" (&optional stream))
 

From 30da67bb25025c9f50c71ff7c5fe8e3e4cadea36 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Fri, 13 Sep 2024 06:40:16 +0900
Subject: [PATCH 22/24] Update module_id_prefixes

---
 script/data/module_id_prefixes.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/script/data/module_id_prefixes.php b/script/data/module_id_prefixes.php
index bd379958..93a01f5e 100644
--- a/script/data/module_id_prefixes.php
+++ b/script/data/module_id_prefixes.php
@@ -496,6 +496,7 @@
     'curl' => [
         'curlfile.',
         'function.curl-',
+        'function.curl_upkeep',
     ],
     'dba' => [
         'function.dba-',
@@ -705,6 +706,9 @@
         'function.recode',
         'function.recode-',
     ],
+    'rnp' => [
+        'function.rnp-',
+    ],
     'runkit7' => [
         'function.runkit7-',
     ],
@@ -721,6 +725,9 @@
     'shmop' => [
         'function.shmop-',
     ],
+    'simdjson' => [
+        'function.simdjson-'
+    ],
     'simplexml' => [
         'function.dom-import-simplexml',
         'function.simplexml-',

From 7b946c3461303e3d23e6b4f9fdc13766af7617da Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Fri, 13 Sep 2024 06:46:41 +0900
Subject: [PATCH 23/24] Bump up version 1.26.0

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c854979b..0da62eba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,14 @@
 
 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.26.0] - 2024-09-13
 
 ### Added
 
  * Add `php-base-mode` which is the base of php related modes ([#772])
-   * `php-base-mode` is designed as a common parent mode for `php-mode` and [`php-ts-mode`](https://github.com/emacs-php/php-ts-mode).
+   * `php-base-mode` is designed as a common parent mode for `php-mode` ~~and [`php-ts-mode`](https://github.com/emacs-php/php-ts-mode)~~.
 
 ### Changed
 

From 9a2fe1c6c34f4f22f11efff0caf1d4e7c8ea233a Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Fri, 13 Sep 2024 07:17:45 +0900
Subject: [PATCH 24/24] Bump up version 1.26.1

---
 CHANGELOG.md             | 7 ++++++-
 Eask                     | 2 +-
 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 +-
 13 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0da62eba..2408957b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
 
 <!-- ## Unreleased -->
 
-## [1.26.0] - 2024-09-13
+## [1.26.1] - 2024-09-13
 
 ### Added
 
@@ -49,6 +49,11 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
 [emacs-php/php-ts-mode#68]: https://github.com/emacs-php/php-ts-mode/pull/68
 [PEAR Coding Standards]: https://pear.php.net/manual/en/standards.php
 
+## [1.26.0] - 2024-09-13
+
+> [!NOTE]
+> This version was cancelled due to a release error.
+
 ## [1.25.1] - 2023-11-24
 
 ### Added
diff --git a/Eask b/Eask
index 23cc3463..2a90ee52 100644
--- a/Eask
+++ b/Eask
@@ -1,5 +1,5 @@
 (package "php-mode"
-         "1.25.1"
+         "1.26.1"
          "Major mode for editing PHP code")
 
 (website-url "https://github.com/emacs-php/php-mode")
diff --git a/lisp/php-align.el b/lisp/php-align.el
index de4fe3cf..e9acc469 100644
--- a/lisp/php-align.el
+++ b/lisp/php-align.el
@@ -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.1
+;; Version: 1.26.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 28ac52fe..f2b1aa42 100644
--- a/lisp/php-complete.el
+++ b/lisp/php-complete.el
@@ -6,7 +6,7 @@
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 
 ;; Created: 18 Sep 2022
-;; Version: 1.25.1
+;; Version: 1.26.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 37bd682d..8be83138 100644
--- a/lisp/php-defs.el
+++ b/lisp/php-defs.el
@@ -4,7 +4,7 @@
 
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; Created: 5 Mar 2022
-;; Version: 1.25.1
+;; Version: 1.26.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 4f16a816..147fb813 100644
--- a/lisp/php-face.el
+++ b/lisp/php-face.el
@@ -4,7 +4,7 @@
 
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; Created: 5 May 2019
-;; Version: 1.25.1
+;; Version: 1.26.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 37e4aea4..8efad224 100644
--- a/lisp/php-flymake.el
+++ b/lisp/php-flymake.el
@@ -4,7 +4,7 @@
 
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; Created: 5 Mar 2022
-;; Version: 1.25.1
+;; Version: 1.26.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 831f49be..f0a98c82 100644
--- a/lisp/php-ide-phpactor.el
+++ b/lisp/php-ide-phpactor.el
@@ -5,7 +5,7 @@
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; Keywords: tools, files
 ;; URL: https://github.com/emacs-php/php-mode
-;; Version: 1.25.1
+;; Version: 1.26.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 f73d5bc3..a48cf1e0 100644
--- a/lisp/php-ide.el
+++ b/lisp/php-ide.el
@@ -5,7 +5,7 @@
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; Keywords: tools, files
 ;; URL: https://github.com/emacs-php/php-mode
-;; Version: 1.25.1
+;; Version: 1.26.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 a3e2d1da..efe6e48e 100644
--- a/lisp/php-mode-debug.el
+++ b/lisp/php-mode-debug.el
@@ -5,7 +5,7 @@
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; URL: https://github.com/emacs-php/php-mode
 ;; Keywords: maint
-;; Version: 1.25.1
+;; Version: 1.26.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 67fc8138..d9b73264 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -9,13 +9,13 @@
 ;; Maintainer: USAMI Kenta <tadsan@zonu.me>
 ;; URL: https://github.com/emacs-php/php-mode
 ;; Keywords: languages php
-;; Version: 1.25.1
+;; Version: 1.26.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.1" "PHP Mode version number.")
+   (defconst php-mode-version-number "1.26.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 6d20e455..81899803 100644
--- a/lisp/php-project.el
+++ b/lisp/php-project.el
@@ -5,7 +5,7 @@
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; Keywords: tools, files
 ;; URL: https://github.com/emacs-php/php-mode
-;; Version: 1.25.1
+;; Version: 1.26.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 e78c7c97..aa09b5df 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -5,7 +5,7 @@
 
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; Created: 5 Dec 2018
-;; Version: 1.25.1
+;; Version: 1.26.1
 ;; Keywords: languages, php
 ;; Homepage: https://github.com/emacs-php/php-mode
 ;; License: GPL-3.0-or-later