Compatible with PHP-8.0-alpha2 (#3458)

swoole · Jul 10, 2020 · 93d43ce · 93d43ce
1 parent ca587dd
commit 93d43ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/php_swoole.h b/php_swoole.h
@@ -628,23 +628,23 @@ void php_swoole_sha256(const char *str, int _len, uchar *digest);
     else {k = ZSTR_VAL(_foreach_key), klen=ZSTR_LEN(_foreach_key); ktype = 1;} {
 #define SW_HASHTABLE_FOREACH_END()                 } ZEND_HASH_FOREACH_END();
 
-static sw_inline int add_assoc_ulong_safe_ex(zval *arg, const char *key, size_t key_len, zend_ulong value)
+static sw_inline void add_assoc_ulong_safe_ex(zval *arg, const char *key, size_t key_len, zend_ulong value)
 {
     if (sw_likely(value <= ZEND_LONG_MAX))
     {
-        return add_assoc_long_ex(arg, key, key_len, value);
+        add_assoc_long_ex(arg, key, key_len, value);
     }
     else
     {
         char buf[MAX_LENGTH_OF_LONG + 1];
         size_t len = sw_snprintf(buf, sizeof(buf), ZEND_ULONG_FMT, value);
-        return add_assoc_stringl_ex(arg, key, key_len, buf, len);
+        add_assoc_stringl_ex(arg, key, key_len, buf, len);
     }
 }
 
-static sw_inline int add_assoc_ulong_safe(zval *arg, const char *key, zend_ulong value)
+static sw_inline void add_assoc_ulong_safe(zval *arg, const char *key, zend_ulong value)
 {
-    return add_assoc_ulong_safe_ex(arg, key, strlen(key), value);
+    add_assoc_ulong_safe_ex(arg, key, strlen(key), value);
 }
 
 //----------------------------------Class API------------------------------------
@@ -1000,7 +1000,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
     fci.no_separation = 0;
+#endif
 
     ret = zend_call_function(&fci, fci_cache);
 

diff --git a/swoole_runtime.cc b/swoole_runtime.cc
@@ -1888,7 +1888,9 @@ static PHP_FUNCTION(swoole_user_func_handler)
     fci.retval = return_value;
     fci.param_count = ZEND_NUM_ARGS();
     fci.params = ZEND_CALL_ARG(execute_data, 1);
+#if PHP_VERSION_ID < 80000
     fci.no_separation = 1;
+#endif
 
     real_func *rf = (real_func *) zend_hash_find_ptr(function_table, execute_data->func->common.function_name);
     zend_call_function(&fci, rf->fci_cache);