swoole · matyhtf · Nov 24, 2025 · Jul 18, 2025 · Jul 25, 2025 · Jul 25, 2025
diff --git a/.github/workflows/ext.yml b/.github/workflows/ext.yml
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
       max-parallel: 8
       fail-fast: false
     steps:

diff --git a/.github/workflows/framework.yml b/.github/workflows/framework.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
         framework: [ 'Laravel Octane', 'Hyperf', 'Simps' ]
     name: ${{ matrix.framework }} - PHP ${{ matrix.php-version }}
     steps:

diff --git a/.github/workflows/iouring.yml b/.github/workflows/iouring.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
         os: [ ubuntu-24.04, ubuntu-24.04-arm ]
     name: ${{ matrix.php }}-${{ matrix.os }}-iouring
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/thread.yml b/.github/workflows/thread.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1-zts', '8.2-zts', '8.3-zts', '8.4-zts']
+        php: ['8.1-zts', '8.2-zts', '8.3-zts', '8.4-zts', '8.5-zts']
         os: [ ubuntu-24.04, ubuntu-24.04-arm ]
     name: ${{ matrix.php }}-thread-${{ matrix.os }}
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3', '8.4']
+        php: ['8.1', '8.2', '8.3', '8.4', '8.5']
         os: [ ubuntu-24.04, ubuntu-24.04-arm ]
     name: ${{ matrix.php }}-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
@@ -50,7 +50,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-#        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
+#        php-version: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
         php-version: [ '8.1' ]
     name: ${{ matrix.php-version }} - macOS
     steps:

diff --git a/config.m4 b/config.m4
@@ -1552,6 +1552,7 @@ EOF
     PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php/ssh2)
     PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php84/curl)
     PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php84/pdo_firebird)
+    PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php85/pdo_firebird)
     PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/llhttp)
 
     if test "$PHP_NGHTTP2_DIR" = "no"; then
@@ -1561,20 +1562,24 @@ EOF
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_pgsql)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_pgsql)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php84/pdo_pgsql)
+        PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php85/pdo_pgsql)
     fi
     if test "$PHP_SWOOLE_ODBC" != "no"; then
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_odbc)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_odbc)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php84/pdo_odbc)
+        PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php85/pdo_odbc)
     fi
     if test "$PHP_SWOOLE_ORACLE" != "no"; then
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_oci)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_oci)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php84/pdo_oci)
+        PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php85/pdo_oci)
     fi
     if test "$PHP_SWOOLE_SQLITE" != "no"; then
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_sqlite)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_sqlite)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php84/pdo_sqlite)
+        PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php85/pdo_sqlite)
     fi
 fi
diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc
@@ -37,6 +37,7 @@ BEGIN_EXTERN_C()
 #endif
 END_EXTERN_C()
 
+#include "swoole_coroutine.h"
 #include "swoole_mime_type.h"
 #include "swoole_server.h"
 #include "swoole_util.h"
@@ -74,6 +75,7 @@ END_EXTERN_C()
 #endif
 
 using swoole::Server;
+using swoole::Coroutine;
 using swoole::network::Socket;
 #ifdef SW_USE_IOURING
 using swoole::Iouring;

diff --git a/ext-src/php_swoole_firebird.h b/ext-src/php_swoole_firebird.h
@@ -26,7 +26,11 @@ BEGIN_EXTERN_C()
 
 #include "ext/pdo/php_pdo_driver.h"
 
+#if PHP_VERSION_ID < 80500
 #include "thirdparty/php84/pdo_firebird/php_pdo_firebird_int.h"
+#else
+#include "thirdparty/php85/pdo_firebird/php_pdo_firebird_int.h"
+#endif
 
 extern const pdo_driver_t swoole_pdo_firebird_driver;
 void swoole_firebird_set_blocking(bool blocking);

diff --git a/ext-src/php_swoole_odbc.h b/ext-src/php_swoole_odbc.h
@@ -30,8 +30,10 @@ BEGIN_EXTERN_C()
 #include "thirdparty/php81/pdo_odbc/php_pdo_odbc_int.h"
 #elif PHP_VERSION_ID >= 80300 && PHP_VERSION_ID < 80400
 #include "thirdparty/php83/pdo_odbc/php_pdo_odbc_int.h"
-#else
+#elif PHP_VERSION_ID >= 80400 && PHP_VERSION_ID < 80500
 #include "thirdparty/php84/pdo_odbc/php_pdo_odbc_int.h"
+#else
+#include "thirdparty/php85/pdo_odbc/php_pdo_odbc_int.h"
 #endif
 
 extern const pdo_driver_t swoole_pdo_odbc_driver;

diff --git a/ext-src/php_swoole_oracle.h b/ext-src/php_swoole_oracle.h
@@ -34,8 +34,10 @@ BEGIN_EXTERN_C()
 #include "thirdparty/php81/pdo_oci/php_pdo_oci_int.h"
 #elif PHP_VERSION_ID >= 80300 && PHP_VERSION_ID < 80400
 #include "thirdparty/php83/pdo_oci/php_pdo_oci_int.h"
-#else
+#elif PHP_VERSION_ID >= 80400 && PHP_VERSION_ID < 80500
 #include "thirdparty/php84/pdo_oci/php_pdo_oci_int.h"
+#else
+#include "thirdparty/php85/pdo_oci/php_pdo_oci_int.h"
 #endif
 
 extern const pdo_driver_t swoole_pdo_oci_driver;

diff --git a/ext-src/php_swoole_pgsql.h b/ext-src/php_swoole_pgsql.h
@@ -31,8 +31,10 @@ BEGIN_EXTERN_C()
 #include "thirdparty/php81/pdo_pgsql/php_pdo_pgsql_int.h"
 #elif PHP_VERSION_ID >= 80300 && PHP_VERSION_ID < 80400
 #include "thirdparty/php83/pdo_pgsql/php_pdo_pgsql_int.h"
-#else
+#elif PHP_VERSION_ID >= 80400 && PHP_VERSION_ID < 80500
 #include "thirdparty/php84/pdo_pgsql/php_pdo_pgsql_int.h"
+#else
+#include "thirdparty/php85/pdo_pgsql/php_pdo_pgsql_int.h"
 #endif
 
 

diff --git a/ext-src/php_swoole_sqlite.h b/ext-src/php_swoole_sqlite.h
@@ -31,8 +31,10 @@ BEGIN_EXTERN_C()
 #include "thirdparty/php81/pdo_sqlite/php_pdo_sqlite_int.h"
 #elif PHP_VERSION_ID >= 80300 && PHP_VERSION_ID < 80400
 #include "thirdparty/php83/pdo_sqlite/php_pdo_sqlite_int.h"
-#else
+#elif PHP_VERSION_ID >= 80400 && PHP_VERSION_ID < 80500
 #include "thirdparty/php84/pdo_sqlite/php_pdo_sqlite_int.h"
+#else
+#include "thirdparty/php85/pdo_sqlite/php_pdo_sqlite_int.h"
 #endif
 
 extern const pdo_driver_t swoole_pdo_sqlite_driver;

diff --git a/ext-src/swoole_firebird.cc b/ext-src/swoole_firebird.cc
@@ -248,9 +248,15 @@ int swoole_isc_version(isc_db_handle *_0, ISC_VERSION_CALLBACK _1, void *_2) {
 
 void php_swoole_firebird_minit(int module_id) {
     if (zend_hash_str_find(&php_pdo_get_dbh_ce()->constants_table, ZEND_STRL("FB_ATTR_DATE_FORMAT")) == nullptr) {
+#if PHP_VERSION_ID >= 80500
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("FB_ATTR_DATE_FORMAT", (zend_long) PDO_FB_ATTR_DATE_FORMAT);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("FB_ATTR_TIME_FORMAT", (zend_long) PDO_FB_ATTR_TIME_FORMAT);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("FB_ATTR_TIMESTAMP_FORMAT", (zend_long) PDO_FB_ATTR_TIMESTAMP_FORMAT);
+#else
         REGISTER_PDO_CLASS_CONST_LONG("FB_ATTR_DATE_FORMAT", (zend_long) PDO_FB_ATTR_DATE_FORMAT);
         REGISTER_PDO_CLASS_CONST_LONG("FB_ATTR_TIME_FORMAT", (zend_long) PDO_FB_ATTR_TIME_FORMAT);
         REGISTER_PDO_CLASS_CONST_LONG("FB_ATTR_TIMESTAMP_FORMAT", (zend_long) PDO_FB_ATTR_TIMESTAMP_FORMAT);
+#endif
     }
 
     php_pdo_unregister_driver(&swoole_pdo_firebird_driver);

diff --git a/ext-src/swoole_odbc.cc b/ext-src/swoole_odbc.cc
@@ -238,11 +238,19 @@ int php_swoole_odbc_minit(int module_id) {
         }
 #endif
 
+#if PHP_VERSION_ID >= 80500
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("ODBC_ATTR_USE_CURSOR_LIBRARY", PDO_ODBC_ATTR_USE_CURSOR_LIBRARY);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("ODBC_ATTR_ASSUME_UTF8", PDO_ODBC_ATTR_ASSUME_UTF8);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("ODBC_SQL_USE_IF_NEEDED", SQL_CUR_USE_IF_NEEDED);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("ODBC_SQL_USE_DRIVER", SQL_CUR_USE_DRIVER);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("ODBC_SQL_USE_ODBC", SQL_CUR_USE_ODBC);
+#else
         REGISTER_PDO_CLASS_CONST_LONG("ODBC_ATTR_USE_CURSOR_LIBRARY", PDO_ODBC_ATTR_USE_CURSOR_LIBRARY);
         REGISTER_PDO_CLASS_CONST_LONG("ODBC_ATTR_ASSUME_UTF8", PDO_ODBC_ATTR_ASSUME_UTF8);
         REGISTER_PDO_CLASS_CONST_LONG("ODBC_SQL_USE_IF_NEEDED", SQL_CUR_USE_IF_NEEDED);
         REGISTER_PDO_CLASS_CONST_LONG("ODBC_SQL_USE_DRIVER", SQL_CUR_USE_DRIVER);
         REGISTER_PDO_CLASS_CONST_LONG("ODBC_SQL_USE_ODBC", SQL_CUR_USE_ODBC);
+#endif
     }
 
     php_pdo_unregister_driver(&swoole_pdo_odbc_driver);

diff --git a/ext-src/swoole_oracle.cc b/ext-src/swoole_oracle.cc
@@ -132,11 +132,19 @@ void php_swoole_oracle_rinit() {
 
 void php_swoole_oracle_minit(int module_id) {
     if (zend_hash_str_find(&php_pdo_get_dbh_ce()->constants_table, ZEND_STRL("OCI_ATTR_ACTION")) == nullptr) {
+#if PHP_VERSION_ID >= 80500
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("OCI_ATTR_ACTION", (zend_long) PDO_OCI_ATTR_ACTION);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("OCI_ATTR_CLIENT_INFO", (zend_long) PDO_OCI_ATTR_CLIENT_INFO);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("OCI_ATTR_CLIENT_IDENTIFIER", (zend_long) PDO_OCI_ATTR_CLIENT_IDENTIFIER);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("OCI_ATTR_MODULE", (zend_long) PDO_OCI_ATTR_MODULE);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("OCI_ATTR_CALL_TIMEOUT", (zend_long) PDO_OCI_ATTR_CALL_TIMEOUT);
+#else
         REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_ACTION", (zend_long) PDO_OCI_ATTR_ACTION);
         REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_CLIENT_INFO", (zend_long) PDO_OCI_ATTR_CLIENT_INFO);
         REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_CLIENT_IDENTIFIER", (zend_long) PDO_OCI_ATTR_CLIENT_IDENTIFIER);
         REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_MODULE", (zend_long) PDO_OCI_ATTR_MODULE);
         REGISTER_PDO_CLASS_CONST_LONG("OCI_ATTR_CALL_TIMEOUT", (zend_long) PDO_OCI_ATTR_CALL_TIMEOUT);
+#endif
     }
 
     php_pdo_unregister_driver(&swoole_pdo_oci_driver);

diff --git a/ext-src/swoole_pgsql.cc b/ext-src/swoole_pgsql.cc
@@ -219,12 +219,21 @@ void swoole_pgsql_set_blocking(bool blocking) {
 void php_swoole_pgsql_minit(int module_id) {
     if (zend_hash_str_find(&php_pdo_get_dbh_ce()->constants_table, ZEND_STRL("PGSQL_ATTR_DISABLE_PREPARES")) ==
         nullptr) {
+#if PHP_VERSION_ID >= 80500
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("PGSQL_ATTR_DISABLE_PREPARES", PDO_PGSQL_ATTR_DISABLE_PREPARES);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("PGSQL_TRANSACTION_IDLE", (zend_long) PGSQL_TRANSACTION_IDLE);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("PGSQL_TRANSACTION_ACTIVE", (zend_long) PGSQL_TRANSACTION_ACTIVE);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("PGSQL_TRANSACTION_INTRANS", (zend_long) PGSQL_TRANSACTION_INTRANS);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("PGSQL_TRANSACTION_INERROR", (zend_long) PGSQL_TRANSACTION_INERROR);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("PGSQL_TRANSACTION_UNKNOWN", (zend_long) PGSQL_TRANSACTION_UNKNOWN);
+#else
         REGISTER_PDO_CLASS_CONST_LONG("PGSQL_ATTR_DISABLE_PREPARES", PDO_PGSQL_ATTR_DISABLE_PREPARES);
         REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_IDLE", (zend_long) PGSQL_TRANSACTION_IDLE);
         REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_ACTIVE", (zend_long) PGSQL_TRANSACTION_ACTIVE);
         REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_INTRANS", (zend_long) PGSQL_TRANSACTION_INTRANS);
         REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_INERROR", (zend_long) PGSQL_TRANSACTION_INERROR);
         REGISTER_PDO_CLASS_CONST_LONG("PGSQL_TRANSACTION_UNKNOWN", (zend_long) PGSQL_TRANSACTION_UNKNOWN);
+#endif
     }
     php_pdo_unregister_driver(&swoole_pdo_pgsql_driver);
     php_pdo_register_driver(&swoole_pdo_pgsql_driver);

diff --git a/ext-src/swoole_runtime.cc b/ext-src/swoole_runtime.cc
@@ -205,12 +205,13 @@ static zend_internal_arg_info *copy_arginfo(const zend_internal_function *functi
             memcpy(new_list, old_list, ZEND_TYPE_LIST_SIZE(old_list->num_types));
             ZEND_TYPE_SET_PTR(new_arg_info[i].type, new_list);
 
-            zend_type *list_type;
+            const zend_type *list_type;
             ZEND_TYPE_LIST_FOREACH(new_list, list_type) {
                 zend_string *name = zend_string_dup(ZEND_TYPE_NAME(*list_type), true);
-                ZEND_TYPE_SET_PTR(*list_type, name);
-            }
-            ZEND_TYPE_LIST_FOREACH_END();
+
+                zend_type *mutable_type = const_cast<zend_type *>(list_type);
+                ZEND_TYPE_SET_PTR(*mutable_type, name);
+            } ZEND_TYPE_LIST_FOREACH_END();
         } else if (ZEND_TYPE_HAS_NAME(arg_info[i].type)) {
             zend_string *name = zend_string_dup(ZEND_TYPE_NAME(arg_info[i].type), true);
             ZEND_TYPE_SET_PTR(new_arg_info[i].type, name);

diff --git a/ext-src/swoole_sqlite.cc b/ext-src/swoole_sqlite.cc
@@ -96,16 +96,30 @@ int swoole_sqlite3_step(sqlite3_stmt *stmt) {
 void php_swoole_sqlite_minit(int module_id) {
     if (zend_hash_str_find(&php_pdo_get_dbh_ce()->constants_table, ZEND_STRL("SQLITE_ATTR_OPEN_FLAGS")) == nullptr) {
 #ifdef SQLITE_DETERMINISTIC
+#if PHP_VERSION_ID >= 80500
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("SQLITE_DETERMINISTIC", (zend_long) SQLITE_DETERMINISTIC);
+#else
         REGISTER_PDO_CLASS_CONST_LONG("SQLITE_DETERMINISTIC", (zend_long) SQLITE_DETERMINISTIC);
 #endif
+#endif
 
+#if PHP_VERSION_ID >= 80500
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("SQLITE_ATTR_OPEN_FLAGS", (zend_long) PDO_SQLITE_ATTR_OPEN_FLAGS);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("SQLITE_OPEN_READONLY", (zend_long) SQLITE_OPEN_READONLY);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("SQLITE_OPEN_READWRITE", (zend_long) SQLITE_OPEN_READWRITE);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("SQLITE_OPEN_CREATE", (zend_long) SQLITE_OPEN_CREATE);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("SQLITE_ATTR_READONLY_STATEMENT", (zend_long) PDO_SQLITE_ATTR_READONLY_STATEMENT);
+        REGISTER_PDO_CLASS_CONST_LONG_DEPRECATED_85("SQLITE_ATTR_EXTENDED_RESULT_CODES",
+                                      (zend_long) PDO_SQLITE_ATTR_EXTENDED_RESULT_CODES);
+#else
         REGISTER_PDO_CLASS_CONST_LONG("SQLITE_ATTR_OPEN_FLAGS", (zend_long) PDO_SQLITE_ATTR_OPEN_FLAGS);
         REGISTER_PDO_CLASS_CONST_LONG("SQLITE_OPEN_READONLY", (zend_long) SQLITE_OPEN_READONLY);
         REGISTER_PDO_CLASS_CONST_LONG("SQLITE_OPEN_READWRITE", (zend_long) SQLITE_OPEN_READWRITE);
         REGISTER_PDO_CLASS_CONST_LONG("SQLITE_OPEN_CREATE", (zend_long) SQLITE_OPEN_CREATE);
         REGISTER_PDO_CLASS_CONST_LONG("SQLITE_ATTR_READONLY_STATEMENT", (zend_long) PDO_SQLITE_ATTR_READONLY_STATEMENT);
         REGISTER_PDO_CLASS_CONST_LONG("SQLITE_ATTR_EXTENDED_RESULT_CODES",
                                       (zend_long) PDO_SQLITE_ATTR_EXTENDED_RESULT_CODES);
+#endif
     }
 
     php_pdo_unregister_driver(&swoole_pdo_sqlite_driver);

diff --git a/package.xml b/package.xml
@@ -2758,6 +2758,35 @@
             <file role="src" name="thirdparty/php84/pdo_sqlite/sqlite_driver_arginfo.h" />
             <file role="src" name="thirdparty/php84/pdo_sqlite/sqlite_sql_parser.c" />
             <file role="src" name="thirdparty/php84/pdo_sqlite/sqlite_statement.c" />
+            <file role="doc" name="thirdparty/php85/pdo_firebird/CREDITS" />
+            <file role="src" name="thirdparty/php85/pdo_firebird/firebird_driver.c" />
+            <file role="src" name="thirdparty/php85/pdo_firebird/firebird_statement.c" />
+            <file role="src" name="thirdparty/php85/pdo_firebird/pdo_firebird_utils.cpp" />
+            <file role="src" name="thirdparty/php85/pdo_firebird/pdo_firebird_utils.h" />
+            <file role="src" name="thirdparty/php85/pdo_firebird/php_pdo_firebird_int.h" />
+            <file role="doc" name="thirdparty/php85/pdo_oci/LICENSE" />
+            <file role="src" name="thirdparty/php85/pdo_oci/oci_driver.c" />
+            <file role="src" name="thirdparty/php85/pdo_oci/oci_statement.c" />
+            <file role="src" name="thirdparty/php85/pdo_oci/php_pdo_oci.h" />
+            <file role="src" name="thirdparty/php85/pdo_oci/php_pdo_oci_int.h" />
+            <file role="src" name="thirdparty/php85/pdo_odbc/odbc_driver.c" />
+            <file role="src" name="thirdparty/php85/pdo_odbc/odbc_stmt.c" />
+            <file role="src" name="thirdparty/php85/pdo_odbc/php_pdo_odbc.h" />
+            <file role="src" name="thirdparty/php85/pdo_odbc/php_pdo_odbc_int.h" />
+            <file role="src" name="thirdparty/php85/pdo_pgsql/pdo_pgsql_arginfo.h" />
+            <file role="src" name="thirdparty/php85/pdo_pgsql/pgsql_driver.c" />
+            <file role="src" name="thirdparty/php85/pdo_pgsql/pgsql_driver_arginfo.h" />
+            <file role="src" name="thirdparty/php85/pdo_pgsql/pgsql_sql_parser.c" />
+            <file role="src" name="thirdparty/php85/pdo_pgsql/pgsql_statement.c" />
+            <file role="src" name="thirdparty/php85/pdo_pgsql/php_pdo_pgsql.h" />
+            <file role="src" name="thirdparty/php85/pdo_pgsql/php_pdo_pgsql_int.h" />
+            <file role="src" name="thirdparty/php85/pdo_sqlite/php_pdo_sqlite_int.h" />
+            <file role="src" name="thirdparty/php85/pdo_sqlite/php_pdo_sqlite.h" />
+            <file role="src" name="thirdparty/php85/pdo_sqlite/php_pdo_sqlite_int.h" />
+            <file role="src" name="thirdparty/php85/pdo_sqlite/sqlite_driver.c" />
+            <file role="src" name="thirdparty/php85/pdo_sqlite/sqlite_driver_arginfo.h" />
+            <file role="src" name="thirdparty/php85/pdo_sqlite/sqlite_sql_parser.c" />
+            <file role="src" name="thirdparty/php85/pdo_sqlite/sqlite_statement.c" />
             <file role="src" name="tools/analysis.php" />
             <file role="src" name="tools/arginfo-check.php" />
             <file role="src" name="tools/bootstrap.php" />

diff --git a/thirdparty/php/main/SAPI.h b/thirdparty/php/main/SAPI.h
@@ -38,7 +38,11 @@ static void swoole_php_treat_data(int arg, char *str, zval *destArray) {
 
     switch (arg) {
     case PARSE_STRING:
+#if PHP_VERSION_ID >= 80500
+        separator = ZSTR_VAL(PG(arg_separator).input);
+#else
         separator = PG(arg_separator).input;
+#endif
         break;
     case PARSE_COOKIE:
         separator = (char *) ";\0";

diff --git a/thirdparty/php84/pdo_firebird/firebird_driver.c b/thirdparty/php84/pdo_firebird/firebird_driver.c
@@ -17,6 +17,8 @@
 #define SW_USE_FIREBIRD_HOOK
 #include "php_swoole_firebird.h"
 
+#if PHP_VERSION_ID >= 80400 && PHP_VERSION_ID < 80500
+
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
@@ -1434,3 +1436,5 @@ const pdo_driver_t swoole_pdo_firebird_driver = { /* {{{ */
 	pdo_firebird_handle_factory
 };
 /* }}} */
+
+#endif
diff --git a/thirdparty/php84/pdo_firebird/firebird_statement.c b/thirdparty/php84/pdo_firebird/firebird_statement.c
@@ -17,6 +17,8 @@
 #define SW_USE_FIREBIRD_HOOK
 #include "php_swoole_firebird.h"
 
+#if PHP_VERSION_ID >= 80400 && PHP_VERSION_ID < 80500
+
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
@@ -956,3 +958,5 @@ const struct pdo_stmt_methods firebird_stmt_methods = { /* {{{ */
 	pdo_firebird_stmt_cursor_closer
 };
 /* }}} */
+
+#endif
diff --git a/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp b/thirdparty/php84/pdo_firebird/pdo_firebird_utils.cpp
@@ -18,6 +18,7 @@
 #include <firebird/Interface.h>
 #include <cstring>
 
+#if PHP_VERSION_ID >= 80400 && PHP_VERSION_ID < 80500
 /* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */
 extern "C" unsigned fb_get_client_version(void)
 {
@@ -89,3 +90,4 @@ extern "C" ISC_STATUS fb_decode_timestamp_tz(ISC_STATUS* isc_status, const ISC_T
 }
 
 #endif
+#endif
diff --git a/thirdparty/php84/pdo_oci/oci_driver.c b/thirdparty/php84/pdo_oci/oci_driver.c
@@ -17,7 +17,7 @@
 #define SW_USE_ORACLE_HOOK
 #include "php_swoole_oracle.h"
 
-#if PHP_VERSION_ID >= 80400
+#if PHP_VERSION_ID >= 80400 && PHP_VERSION_ID < 80500
 
 #include "php.h"
 #include "php_ini.h"