fix php8.3

swoole · Dec 22, 2023 · dbe46ec · dbe46ec
1 parent 66e9f8b
commit dbe46ec
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ C++ wrapper for Zend API
 
 ## Requirements
 
-- PHP 7.2 or later
+- PHP 8.0 or later
 - Linux/MacOS/Windows
 - GCC 4.8 or later
 - Composer
@@ -35,7 +35,7 @@ phpx create cpp_ext
 
 ## Generate ArgInfo & Function Entires
 ```shell
-php script/gen_stub.php your_stub_dir
+php bin/gen_stub.php your_stub_dir
 ```
 
 ## Build extension

diff --git a/script/gen.php → bin/gen.php b/script/gen.php → bin/gen.php
diff --git a/script/gen_stub.php → bin/gen_stub.php b/script/gen_stub.php → bin/gen_stub.php
diff --git a/script/pack.php → bin/pack.php b/script/pack.php → bin/pack.php
diff --git a/build.sh b/build.sh
@@ -2,4 +2,4 @@ cd console && \
 echo "composer update" && \
 composer update && \
 cd ../ && \
-/usr/bin/env php -d phar.readonly=off script/pack.php
+/usr/bin/env php -d phar.readonly=off bin/pack.php
diff --git a/include/phpx.h b/include/phpx.h
@@ -26,8 +26,8 @@ extern "C" {
 #include "php_streams.h"
 #include "php_network.h"
 
-#if PHP_VERSION_ID < 70200
-#error "only supports PHP7 or later."
+#if PHP_VERSION_ID < 80000
+#error "only supports PHP8 or later."
 #endif
 
 #include "zend_interfaces.h"

diff --git a/phpinfo.php b/phpinfo.php
diff --git a/src/function.cc b/src/function.cc
@@ -31,27 +31,29 @@ Variant http_build_query(const Variant &data, const char *prefix, const char *ar
 
     size_t prefix_len = prefix != nullptr ? strlen(prefix) : 0;
 
-#if PHP_VERSION_ID < 80000
-    auto retval =
-#endif
-        php_url_encode_hash_ex(HASH_OF(_data.ptr()),
-                               &formstr,
-                               prefix,
-                               prefix_len,
-                               NULL,
-                               0,
-                               NULL,
-                               0,
-                               (_data.isObject() ? _data.ptr() : NULL),
-                               (char *) arg_sep,
-                               enc_type);
-#if PHP_VERSION_ID < 80000
-    if (retval == FAILURE) {
-        if (formstr.s) {
-            smart_str_free(&formstr);
-        }
-        return false;
-    }
+#if PHP_VERSION_ID >= 80300
+    auto _arg_sep = zend_string_init(arg_sep, strlen(arg_sep), 0);
+    php_url_encode_hash_ex(HASH_OF(_data.ptr()),
+                           &formstr,
+                           prefix,
+                           prefix_len,
+                           NULL,
+                           NULL,
+                           _arg_sep,
+                           enc_type);
+    zend_string_release(_arg_sep);
+#else
+    php_url_encode_hash_ex(HASH_OF(_data.ptr()),
+                           &formstr,
+                           prefix,
+                           prefix_len,
+                           NULL,
+                           0,
+                           NULL,
+                           0,
+                           (_data.isObject() ? _data.ptr() : NULL),
+                           (char *) arg_sep,
+                           enc_type);
 #endif
 
     if (!formstr.s) {