Fix PHP8 compatibility (named params) (#3598)

swoole · Aug 27, 2020 · 78c2826 · 78c2826
1 parent e360010
commit 78c2826
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/php_swoole.h b/php_swoole.h
@@ -1002,7 +1002,9 @@ static sw_inline int sw_zend_call_function_ex(zval *function_name, zend_fcall_in
     fci.retval = retval ? retval : &_retval;
     fci.param_count = param_count;
     fci.params = params;
-#if PHP_VERSION_ID < 80000
+#if PHP_VERSION_ID >= 80000
+    fci.named_params = NULL;
+#else
     fci.no_separation = 0;
 #endif
 

diff --git a/swoole_runtime.cc b/swoole_runtime.cc
@@ -1611,11 +1611,13 @@ static PHP_FUNCTION(swoole_user_func_handler) {
     zend_fcall_info fci;
     fci.size = sizeof(fci);
     fci.object = nullptr;
-    fci.function_name = {};
+    ZVAL_UNDEF(&fci.function_name);
     fci.retval = return_value;
     fci.param_count = ZEND_NUM_ARGS();
     fci.params = ZEND_CALL_ARG(execute_data, 1);
-#if PHP_VERSION_ID < 80000
+#if PHP_VERSION_ID >= 80000
+    fci.named_params = NULL;
+#else
     fci.no_separation = 1;
 #endif