Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add PHP8.4 support #270

Merged
merged 3 commits into from
Sep 29, 2024
Merged

Add PHP8.4 support #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc793d8
Add PHP8.4 support
NoiseByNorthwest Sep 29, 2024
4bc381e
CI: update macos version
NoiseByNorthwest Sep 29, 2024
fab08fe
Fix PHP8.4 build on macOS
NoiseByNorthwest Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]

name:
- linux
Expand All @@ -34,7 +34,7 @@ jobs:
# Debian (docker)
- { name: debian, ts: 'nts', compiler: 'gcc', os: ubuntu-20.04 }
# macOS
- { name: mac, ts: 'nts', compiler: 'clang', os: macos-12 }
- { name: mac, ts: 'nts', compiler: 'clang', os: macos-13 }

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Current requirements are:
* x86-64 or ARM64
* **GNU/Linux**, **macOS** or **FreeBSD**
* zlib dev package (e.g. zlib1g-dev on Debian based distros)
* PHP 5.4 to 8.3
* PHP 5.4 to 8.4

## Installation

Expand Down Expand Up @@ -503,7 +503,7 @@ See the [LICENSE][:link-license:] file for more information.
[:badge-ci:]: https://github.com/NoiseByNorthwest/php-spx/actions/workflows/main.yml/badge.svg
[:link-ci:]: https://github.com/NoiseByNorthwest/php-spx/actions/workflows/main.yml

[:badge-php-versions:]: https://img.shields.io/badge/php-5.4--8.3-blue.svg
[:badge-php-versions:]: https://img.shields.io/badge/php-5.4--8.4-blue.svg
[:badge-supported-platforms:]: https://img.shields.io/badge/platform-GNU/Linux%20|%20macOS%20|%20FreeBSD%20-yellow
[:badge-supported-arch:]: https://img.shields.io/badge/architecture-x86--64%20|%20ARM64%20-silver

Expand Down
6 changes: 6 additions & 0 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ if test "$PHP_SPX" = "yes"; then

CFLAGS="-Werror -Wall -O3 -pthread -std=gnu90"

if test "$(uname -s 2>/dev/null)" = "Darwin"
then
# see discussion here https://github.com/NoiseByNorthwest/php-spx/pull/270
CFLAGS="$CFLAGS -Wno-typedef-redefinition"
fi

if test "$PHP_SPX_DEV" = "yes"
then
CFLAGS="$CFLAGS -g"
Expand Down
4 changes: 2 additions & 2 deletions src/php_spx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
# error "Only x86-64 and ARM64 architectures are supported"
#endif

#if ZEND_MODULE_API_NO < 20100525 || ZEND_MODULE_API_NO > 20230831 // 8.3-RC5
# error "Only the following PHP versions are supported: 5.4 to 8.3"
#if ZEND_MODULE_API_NO < 20100525 || ZEND_MODULE_API_NO > 20240924
# error "Only the following PHP versions are supported: 5.4 to 8.4"
#endif

#define PHP_SPX_EXTNAME "SPX"
Expand Down
Loading