[5.1]Sync PHP 8.3 pdo code (#5360)

* sync PHP 8.3 pdo code * fix error
swoole · Jun 6, 2024 · 8e8db8b · 8e8db8b
1 parent e35090e
commit 8e8db8b
Show file tree

Hide file tree

Showing 17 changed files with 5,966 additions and 9 deletions.
diff --git a/config.m4 b/config.m4
@@ -1059,23 +1059,29 @@ EOF
 	        thirdparty/php80/pdo_pgsql/pgsql_driver.c \
 	        thirdparty/php80/pdo_pgsql/pgsql_statement.c \
 	        thirdparty/php81/pdo_pgsql/pgsql_driver.c \
-	        thirdparty/php81/pdo_pgsql/pgsql_statement.c"
+	        thirdparty/php81/pdo_pgsql/pgsql_statement.c \
+	        thirdparty/php83/pdo_pgsql/pgsql_driver.c \
+            thirdparty/php83/pdo_pgsql/pgsql_statement.c"
 	fi
 
 	if test "$PHP_SWOOLE_ORACLE" != "no"; then
         swoole_source_file="$swoole_source_file \
             thirdparty/php80/pdo_oci/oci_driver.c \
             thirdparty/php80/pdo_oci/oci_statement.c \
             thirdparty/php81/pdo_oci/oci_driver.c \
-            thirdparty/php81/pdo_oci/oci_statement.c"
+            thirdparty/php81/pdo_oci/oci_statement.c \
+            thirdparty/php83/pdo_oci/oci_driver.c \
+            thirdparty/php83/pdo_oci/oci_statement.c"
     fi
 
 	if test "$PHP_SWOOLE_ODBC" != "no"; then
 	    swoole_source_file="$swoole_source_file \
 	        thirdparty/php80/pdo_odbc/odbc_driver.c \
 	        thirdparty/php80/pdo_odbc/odbc_stmt.c \
 	        thirdparty/php81/pdo_odbc/odbc_driver.c \
-	        thirdparty/php81/pdo_odbc/odbc_stmt.c"
+	        thirdparty/php81/pdo_odbc/odbc_stmt.c \
+	        thirdparty/php83/pdo_odbc/odbc_driver.c \
+            thirdparty/php83/pdo_odbc/odbc_stmt.c"
 	fi
 
 	if test "$PHP_SWOOLE_SQLITE" != "no"; then
@@ -1242,14 +1248,17 @@ EOF
 	if test "$PHP_SWOOLE_PGSQL" != "no"; then
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php80/pdo_pgsql)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_pgsql)
+        PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_pgsql)
     fi
     if test "$PHP_SWOOLE_ODBC" != "no"; then
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php80/pdo_odbc)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_odbc)
+        PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_odbc)
     fi
     if test "$PHP_SWOOLE_ORACLE" != "no"; then
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php80/pdo_oci)
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php81/pdo_oci)
+        PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php83/pdo_oci)
     fi
     if test "$PHP_SWOOLE_SQLITE" != "no"; then
         PHP_ADD_BUILD_DIR($ext_builddir/thirdparty/php80/pdo_sqlite)

diff --git a/thirdparty/php81/pdo_oci/oci_driver.c b/thirdparty/php81/pdo_oci/oci_driver.c
@@ -17,7 +17,8 @@
 #define SW_USE_ORACLE_HOOK
 #include "php_swoole_oracle.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
+
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"

diff --git a/thirdparty/php81/pdo_oci/oci_statement.c b/thirdparty/php81/pdo_oci/oci_statement.c
@@ -16,7 +16,8 @@
 #define SW_USE_ORACLE_HOOK
 #include "php_swoole_oracle.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
+
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"

diff --git a/thirdparty/php81/pdo_odbc/odbc_driver.c b/thirdparty/php81/pdo_odbc/odbc_driver.c
@@ -17,7 +17,7 @@
 #define SW_USE_ODBC_HOOK
 #include "php_swoole_odbc.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
 
 #include "php.h"
 #include "php_ini.h"

diff --git a/thirdparty/php81/pdo_odbc/odbc_stmt.c b/thirdparty/php81/pdo_odbc/odbc_stmt.c
@@ -17,7 +17,7 @@
 #define SW_USE_ODBC_HOOK
 #include "php_swoole_odbc.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
 
 #include "php.h"
 #include "php_ini.h"

diff --git a/thirdparty/php81/pdo_pgsql/pgsql_driver.c b/thirdparty/php81/pdo_pgsql/pgsql_driver.c
@@ -19,7 +19,7 @@
 #define SW_USE_PGSQL_HOOK
 #include "php_swoole_pgsql.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
 
 #include "php.h"
 #include "php_ini.h"

diff --git a/thirdparty/php81/pdo_pgsql/pgsql_statement.c b/thirdparty/php81/pdo_pgsql/pgsql_statement.c
@@ -19,7 +19,7 @@
 #define SW_USE_PGSQL_HOOK
 #include "php_swoole_pgsql.h"
 
-#if PHP_VERSION_ID >= 80100
+#if PHP_VERSION_ID >= 80100 && PHP_VERSION_ID < 80300
 
 #include "php.h"
 #include "php_ini.h"