From d03b7ce29c0b5eff25a6eb594161447244a5fc31 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 24 Jul 2023 02:22:47 +0900
Subject: [PATCH 1/4] Add CI test for release-snapshot

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b333e2cb..72f1fd89 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,6 +19,7 @@ jobs:
           - "27.2"
           - "28.1"
           - "28.2"
+          - release-snapshot
           - snapshot
         include:
           - emacs_version: snapshot

From 23d8249e7298d0b34c7ffbeedb14d59b8b456b66 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 24 Jul 2023 02:23:14 +0900
Subject: [PATCH 2/4] Fix type-hints.php test for Emacs 29.1-rc1

---
 tests/php-mode-test.el        |   3 +-
 tests/type-hints.php.29.faces | 590 ++++++++++++++++++++++++++++++++++
 2 files changed, 592 insertions(+), 1 deletion(-)
 create mode 100644 tests/type-hints.php.29.faces

diff --git a/tests/php-mode-test.el b/tests/php-mode-test.el
index 0dae822e..b827fcfc 100644
--- a/tests/php-mode-test.el
+++ b/tests/php-mode-test.el
@@ -596,7 +596,8 @@ style from Drupal."
 
 (ert-deftest php-mode-test-type-hints ()
   "Test highlighting of type hints and return types."
-  (with-php-mode-test ("type-hints.php" :faces t)))
+  (with-php-mode-test ("type-hints.php" :faces (cond ((version<= "29" emacs-version) ".29.faces")
+                                                     (t)))))
 
 (ert-deftest php-mode-test-static-method-calls ()
   "Test highlighting of static method calls which are named the same
diff --git a/tests/type-hints.php.29.faces b/tests/type-hints.php.29.faces
new file mode 100644
index 00000000..14cf581e
--- /dev/null
+++ b/tests/type-hints.php.29.faces
@@ -0,0 +1,590 @@
+;; -*- mode: emacs-lisp -*-
+(("<?php" . php-php-tag)
+ ("
+
+")
+ ("class" . php-class-declaration)
+ (" ")
+ ("SomeClass" . font-lock-type-face)
+ ("
+{
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("none" . php-function-name)
+ ("(")
+ ("$" . php-variable-sigil)
+ ("title" . php-variable-name)
+ ("): ")
+ ("void" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("title" . php-function-name)
+ ("(")
+ ("string" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("title" . php-variable-name)
+ ("): ")
+ ("string" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("nullableTitle" . php-function-name)
+ ("(")
+ ("?string" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("title" . php-variable-name)
+ ("): ")
+ ("?string" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("number" . php-function-name)
+ ("(")
+ ("int" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("number" . php-variable-name)
+ ("): ")
+ ("int" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("nullableNumber" . php-function-name)
+ ("(")
+ ("?int" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("number" . php-variable-name)
+ ("): ")
+ ("?int" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("otherNumber" . php-function-name)
+ ("(")
+ ("float" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("number" . php-variable-name)
+ ("): ")
+ ("float" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("nullableOtherNumber" . php-function-name)
+ ("(")
+ ("?float" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("number" . php-variable-name)
+ ("): ")
+ ("?float" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("flag" . php-function-name)
+ ("(")
+ ("bool" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("flag" . php-variable-name)
+ ("): ")
+ ("bool" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("nullableFlag" . php-function-name)
+ ("(")
+ ("?bool" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("flag" . php-variable-name)
+ ("): ")
+ ("?bool" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("options" . php-function-name)
+ ("(")
+ ("array" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("options" . php-variable-name)
+ ("): ")
+ ("array" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("nullableOptions" . php-function-name)
+ ("(")
+ ("?array" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("options" . php-variable-name)
+ ("): ")
+ ("?array" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("object" . php-function-name)
+ ("(stdClass ")
+ ("$" . php-variable-sigil)
+ ("object" . php-variable-name)
+ ("): ")
+ ("stdClass" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("nullableObject" . php-function-name)
+ ("(")
+ ("?stdClass" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("object" . php-variable-name)
+ ("): ")
+ ("?stdClass" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("nsObject" . php-function-name)
+ ("(")
+ ("\\path\\to\\my\\Object" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("object" . php-variable-name)
+ ("): ")
+ ("\\path\\to\\my\\Object" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("nullableNsObject" . php-function-name)
+ ("(")
+ ("?\\path\\to\\my\\Object" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("object" . php-variable-name)
+ ("): ")
+ ("?\\path\\to\\my\\Object" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("callable" . php-function-name)
+ ("(")
+ ("callable" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("callable" . php-variable-name)
+ ("): ")
+ ("callable" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("nullableCallable" . php-function-name)
+ ("(")
+ ("?callable" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("callable" . php-variable-name)
+ ("): ")
+ ("?callable" . font-lock-type-face)
+ ("
+    {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("someFunction" . php-function-name)
+ ("(
+        ")
+ ("$" . php-variable-sigil)
+ ("any" . php-variable-name)
+ (",
+        ")
+ ("string" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("name" . php-variable-name)
+ (",
+        ")
+ ("int" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("value" . php-variable-name)
+ (",
+        ")
+ ("bool" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("flag" . php-variable-name)
+ (",
+        ")
+ ("array" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("options" . php-variable-name)
+ (",
+        ")
+ ("stdClass" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("object" . php-variable-name)
+ (",
+        ")
+ ("\\path\\to\\my\\Object" . font-lock-type-face)
+ (" ")
+ ("$" . php-variable-sigil)
+ ("nsObject" . php-variable-name)
+ ("
+    ): ")
+ ("void" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNone" . php-function-name)
+ ("(
+    ): ")
+ ("void" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getTitle" . php-function-name)
+ ("(
+    ): ")
+ ("string" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNullableTitle" . php-function-name)
+ ("(
+    ): ")
+ ("?string" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNumber" . php-function-name)
+ ("(
+    ): ")
+ ("int" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNullableNumber" . php-function-name)
+ ("(
+    ): ")
+ ("?int" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getOtherNumber" . php-function-name)
+ ("(
+    ): ")
+ ("float" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNullableOtherNumber" . php-function-name)
+ ("(
+    ): ")
+ ("?float" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getFlag" . php-function-name)
+ ("(
+    ): ")
+ ("bool" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNullableFlag" . php-function-name)
+ ("(
+    ): ")
+ ("?bool" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getOptions" . php-function-name)
+ ("(
+    ): ")
+ ("array" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNullableOptions" . php-function-name)
+ ("(
+    ): ")
+ ("?array" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getObject" . php-function-name)
+ ("(
+    ): ")
+ ("stdClass" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNullableObject" . php-function-name)
+ ("(
+    ): ")
+ ("?stdClass" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("abstract" . php-keyword)
+ (" ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getOtherObject" . php-function-name)
+ ("(
+    ): ")
+ ("stdClass" . font-lock-type-face)
+ (";
+
+    ")
+ ("abstract" . php-keyword)
+ (" ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getOtherNullableObject" . php-function-name)
+ ("(
+    ): ")
+ ("?stdClass" . font-lock-type-face)
+ (";
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNsObject" . php-function-name)
+ ("(
+    ): ")
+ ("\\path\\to\\my\\Object" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNullableNsObject" . php-function-name)
+ ("(
+    ): ")
+ ("?\\path\\to\\my\\Object" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getCallable" . php-function-name)
+ ("(
+    ): ")
+ ("callable" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("getNullableCallable" . php-function-name)
+ ("(
+    ): ")
+ ("?callable" . font-lock-type-face)
+ (" {
+    }
+
+    ")
+ ("public" . php-keyword)
+ (" ")
+ ("function" . php-keyword)
+ (" ")
+ ("neverReturn" . php-function-name)
+ ("(
+    ): ")
+ ("never" . font-lock-type-face)
+ (" {
+    }
+}
+"))

From da0148aa509d65526c129850f6093ed51ba44941 Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 24 Jul 2023 02:23:41 +0900
Subject: [PATCH 3/4] Update available Emacs badge to 29.1

---
 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 65e31d7f..b56a66a7 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -1,7 +1,7 @@
 <div align="center">
   <h1>Emacs PHP Mode</h1>
 
-[![Emacs: 28.2](https://img.shields.io/badge/Emacs-28.2-blue.svg)](https://www.gnu.org/software/emacs/)
+[![Emacs: 29.1](https://img.shields.io/badge/Emacs-29.1-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 9527810c..829199d4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <div align="center">
   <h1>Emacs PHP Mode</h1>
 
-[![Emacs: 28.2](https://img.shields.io/badge/Emacs-28.2-blue.svg)](https://www.gnu.org/software/emacs/)
+[![Emacs: 29.1](https://img.shields.io/badge/Emacs-29.1-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 7774c8d7437997ed8c03b9a323fd66956cce372a Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@zonu.me>
Date: Mon, 24 Jul 2023 02:32:46 +0900
Subject: [PATCH 4/4] Update CHANGELOG

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3652ffd0..02e51eaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,13 @@
 
 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
+
+ * **Support Emacs 29.1** ([#750])
+
+[#750]: https://github.com/emacs-php/php-mode/pull/750
 
 ## [1.24.3] - 2023-03-19