Skip to content

Commit

Permalink
Merge pull request #750 from emacs-php/support/emacs29
Browse files Browse the repository at this point in the history
Support Emacs 29.1
  • Loading branch information
zonuexe authored Jul 23, 2023
2 parents 73d2ded + 7774c8d commit 5e04c92
Show file tree
Hide file tree
Showing 6 changed files with 602 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
- "27.2"
- "28.1"
- "28.2"
- release-snapshot
- snapshot
include:
- emacs_version: snapshot
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.ja.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 2 additions & 1 deletion tests/php-mode-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 5e04c92

Please sign in to comment.