Compatible with PHP 8.4 (PDO) (#5483)

swoole · Sep 19, 2024 · 6142b66 · 6142b66
1 parent 7e30a33
commit 6142b66
Show file tree

Hide file tree

Showing 49 changed files with 15,761 additions and 130 deletions.
diff --git a/config.m4 b/config.m4
@@ -1070,31 +1070,42 @@ EOF
 	        thirdparty/php81/pdo_pgsql/pgsql_driver.c \
 	        thirdparty/php81/pdo_pgsql/pgsql_statement.c \
 	        thirdparty/php83/pdo_pgsql/pgsql_driver.c \
-            thirdparty/php83/pdo_pgsql/pgsql_statement.c"
+            thirdparty/php83/pdo_pgsql/pgsql_statement.c \
+            thirdparty/php83/pdo_pgsql/pgsql_statement.c \
+            thirdparty/php84/pdo_pgsql/pgsql_driver.c \
+            thirdparty/php84/pdo_pgsql/pgsql_statement.c \
+            thirdparty/php84/pdo_pgsql/pgsql_sql_parser.c"
 	fi
 
 	if test "$PHP_SWOOLE_ORACLE" != "no"; then
         swoole_source_file="$swoole_source_file \
             thirdparty/php81/pdo_oci/oci_driver.c \
             thirdparty/php81/pdo_oci/oci_statement.c \
             thirdparty/php83/pdo_oci/oci_driver.c \
-            thirdparty/php83/pdo_oci/oci_statement.c"
+            thirdparty/php83/pdo_oci/oci_statement.c \
+            thirdparty/php84/pdo_oci/oci_driver.c \
+            thirdparty/php84/pdo_oci/oci_statement.c"
     fi
 
 	if test "$PHP_SWOOLE_ODBC" != "no"; then
 	    swoole_source_file="$swoole_source_file \
 	        thirdparty/php81/pdo_odbc/odbc_driver.c \
 	        thirdparty/php81/pdo_odbc/odbc_stmt.c \
 	        thirdparty/php83/pdo_odbc/odbc_driver.c \
-            thirdparty/php83/pdo_odbc/odbc_stmt.c"
+            thirdparty/php83/pdo_odbc/odbc_stmt.c \
+            thirdparty/php84/pdo_odbc/odbc_driver.c \
+            thirdparty/php84/pdo_odbc/odbc_stmt.c"
 	fi
 
 	if test "$PHP_SWOOLE_SQLITE" != "no"; then
         swoole_source_file="$swoole_source_file \
             thirdparty/php81/pdo_sqlite/sqlite_driver.c \
             thirdparty/php81/pdo_sqlite/sqlite_statement.c \
             thirdparty/php83/pdo_sqlite/sqlite_driver.c \
-            thirdparty/php83/pdo_sqlite/sqlite_statement.c"
+            thirdparty/php83/pdo_sqlite/sqlite_statement.c \
+            thirdparty/php84/pdo_sqlite/sqlite_driver.c \
+            thirdparty/php84/pdo_sqlite/sqlite_statement.c \
+            thirdparty/php84/pdo_sqlite/sqlite_sql_parser.c"
     fi
 
     SW_ASM_DIR="thirdparty/boost/asm/"
@@ -1255,17 +1266,21 @@ EOF
 	if test "$PHP_SWOOLE_PGSQL" != "no"; then
         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)
     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)
     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)
     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)
     fi
 fi
diff --git a/ext-src/php_swoole_odbc.h b/ext-src/php_swoole_odbc.h
@@ -24,7 +24,17 @@ BEGIN_EXTERN_C()
 
 #include "ext/pdo/php_pdo_driver.h"
 
+#if PHP_VERSION_ID >= 80000 && PHP_VERSION_ID < 80100
+#include "thirdparty/php80/pdo_odbc/php_pdo_odbc_int.h"
+#elif PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80200
 #include "thirdparty/php81/pdo_odbc/php_pdo_odbc_int.h"
+#elif PHP_VERSION_ID >= 80200 && PHP_VERSION_ID < 80300
+#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
+#include "thirdparty/php84/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
@@ -25,7 +25,18 @@
 BEGIN_EXTERN_C()
 
 #include "ext/pdo/php_pdo_driver.h"
+
+#if PHP_VERSION_ID >= 80000 && PHP_VERSION_ID < 80100
+#include "thirdparty/php80/pdo_oci/php_pdo_oci_int.h"
+#elif PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80200
+#include "thirdparty/php81/pdo_oci/php_pdo_oci_int.h"
+#elif PHP_VERSION_ID >= 80200 && PHP_VERSION_ID < 80300
 #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
+#include "thirdparty/php84/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
@@ -25,6 +25,19 @@ BEGIN_EXTERN_C()
 
 #include "ext/pdo/php_pdo_driver.h"
 
+#if PHP_VERSION_ID >= 80000 && PHP_VERSION_ID < 80100
+#include "thirdparty/php80/pdo_pgsql/php_pdo_pgsql_int.h"
+#elif PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80200
+#include "thirdparty/php81/pdo_pgsql/php_pdo_pgsql_int.h"
+#elif PHP_VERSION_ID >= 80200 && PHP_VERSION_ID < 80300
+#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
+#include "thirdparty/php84/pdo_pgsql/php_pdo_pgsql_int.h"
+#endif
+
+
 extern const pdo_driver_t swoole_pdo_pgsql_driver;
 
 #include <libpq-fe.h>

diff --git a/ext-src/php_swoole_sqlite.h b/ext-src/php_swoole_sqlite.h
@@ -24,7 +24,18 @@
 BEGIN_EXTERN_C()
 
 #include "ext/pdo/php_pdo_driver.h"
+
+#if PHP_VERSION_ID >= 80000 && PHP_VERSION_ID < 80100
+#include "thirdparty/php80/pdo_sqlite/php_pdo_sqlite_int.h"
+#elif PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80200
+#include "thirdparty/php81/pdo_sqlite/php_pdo_sqlite_int.h"
+#elif PHP_VERSION_ID >= 80200 && PHP_VERSION_ID < 80300
 #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
+#include "thirdparty/php84/pdo_sqlite/php_pdo_sqlite_int.h"
+#endif
 
 extern const pdo_driver_t swoole_pdo_sqlite_driver;
 void swoole_sqlite_set_blocking(bool blocking);

diff --git a/ext-src/swoole_pgsql.cc b/ext-src/swoole_pgsql.cc
@@ -22,7 +22,6 @@
 #include "swoole_coroutine_system.h"
 
 #ifdef SW_USE_PGSQL
-#include "thirdparty/php81/pdo_pgsql/php_pdo_pgsql_int.h"
 
 using swoole::Reactor;
 using swoole::coroutine::Socket;