feat(php): Add PHP 8.5 support

Author: ptondereau

.github/action/musl/Dockerfile

@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.4
+ARG PHP_VERSION=8.5
 ARG TS=-zts
 
 FROM php:${PHP_VERSION}${TS}-alpine

.github/workflows/build.yml

@@ -87,7 +87,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        php: ["8.1", "8.2", "8.3", "8.4"]
+        php: ["8.1", "8.2", "8.3", "8.4", "8.5"]
         rust: [stable, nightly]
         clang: ["15", "17"]
         phpts: [ts, nts]
@@ -173,20 +173,17 @@ jobs:
     runs-on: ubuntu-latest
     env:
       clang: "17"
-      php_version: "8.4"
+      php_version: "8.5"
     steps:
       - name: Checkout code
         uses: actions/checkout@v5
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ env.php_version }}
-        env:
-          debug: true
-
-      - name: Install libphp-embed
-        run: sudo apt update -y && sudo apt install -y libphp8.4-embed
+      - name: Install libphp-embed from sury.org
+        run: |
+          sudo curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+          sudo dpkg -i /tmp/debsuryorg-archive-keyring.deb
+          sudo sh -c 'echo "deb [signed-by=/usr/share/keyrings/debsuryorg-archive-keyring.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+          sudo apt update -y && sudo apt install -y libphp8.5-embed
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
@@ -231,7 +228,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ["8.1", "8.2", "8.3", "8.4"]
+        php: ["8.1", "8.2", "8.3", "8.4", "8.5"]
         phpts: [["-zts", "TS"], ["", "NTS"]]
     env:
       CARGO_TERM_COLOR: always

Dockerfile

@@ -1,5 +1,5 @@
 FROM rust:latest AS base
-ARG PHP_VERSION=8.4
+ARG PHP_VERSION=8.5
 WORKDIR /tmp
 RUN <<EOF
 set -e

allowed_bindings.rs

@@ -271,6 +271,7 @@ bind! {
     zend_hash_get_current_key_zval_ex,
     zend_hash_get_current_data_ex,
     zend_hash_move_backwards_ex,
+    zend_hash_key_type,
     zend_array_count,
     gc_possible_root,
     ZEND_ACC_NOT_SERIALIZABLE,

build.rs

@@ -268,6 +268,7 @@ enum ApiVersion {
     Php82 = 2022_08_29,
     Php83 = 2023_08_31,
     Php84 = 2024_09_24,
+    Php85 = 2025_09_25,
 }
 
 impl ApiVersion {
@@ -285,7 +286,7 @@ impl ApiVersion {
 
     /// Returns the maximum API version supported by ext-php-rs.
     pub const fn max() -> Self {
-        ApiVersion::Php84
+        ApiVersion::Php85
     }
 
     pub fn versions() -> Vec<Self> {
@@ -295,6 +296,7 @@ impl ApiVersion {
             ApiVersion::Php82,
             ApiVersion::Php83,
             ApiVersion::Php84,
+            ApiVersion::Php85,
         ]
     }
 
@@ -313,6 +315,7 @@ impl ApiVersion {
             ApiVersion::Php82 => "php82",
             ApiVersion::Php83 => "php83",
             ApiVersion::Php84 => "php84",
+            ApiVersion::Php85 => "php85",
         }
     }
 
@@ -323,6 +326,7 @@ impl ApiVersion {
             ApiVersion::Php82 => "EXT_PHP_RS_PHP_82",
             ApiVersion::Php83 => "EXT_PHP_RS_PHP_83",
             ApiVersion::Php84 => "EXT_PHP_RS_PHP_84",
+            ApiVersion::Php85 => "EXT_PHP_RS_PHP_85",
         }
     }
 }
@@ -344,7 +348,10 @@ impl TryFrom<u32> for ApiVersion {
             x if ((ApiVersion::Php83 as u32)..(ApiVersion::Php84 as u32)).contains(&x) => {
                 Ok(ApiVersion::Php83)
             }
-            x if (ApiVersion::Php84 as u32) == x => Ok(ApiVersion::Php84),
+            x if ((ApiVersion::Php84 as u32)..(ApiVersion::Php85 as u32)).contains(&x) => {
+                Ok(ApiVersion::Php84)
+            }
+            x if (ApiVersion::Php85 as u32) == x => Ok(ApiVersion::Php85),
             version => Err(anyhow!(
                 "The current version of PHP is not supported. Current PHP API version: {}, requires a version between {} and {}",
                 version,
@@ -371,7 +378,7 @@ fn check_php_version(info: &PHPInfo) -> Result<()> {
     // The PHP version cfg flags should also stack - if you compile on PHP 8.2 you
     // should get both the `php81` and `php82` flags.
     println!(
-        "cargo::rustc-check-cfg=cfg(php80, php81, php82, php83, php84, php_zts, php_debug, docs)"
+        "cargo::rustc-check-cfg=cfg(php80, php81, php82, php83, php84, php85, php_zts, php_debug, docs)"
     );
 
     if version == ApiVersion::Php80 {
@@ -416,6 +423,7 @@ fn main() -> Result<()> {
         println!("cargo:rustc-cfg=php82");
         println!("cargo:rustc-cfg=php83");
         println!("cargo:rustc-cfg=php84");
+        println!("cargo:rustc-cfg=php85");
         std::fs::copy("docsrs_bindings.rs", out_path)
             .expect("failed to copy docs.rs stub bindings to out directory");
         return Ok(());