From 6be2206aab6a0ffe6ea2eefcfaacd4f37f0459b4 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Mon, 30 May 2022 14:15:00 +0200 Subject: [PATCH] eliminate PHP_MAJOR_VERSION checks --- v8js_array_access.cc | 8 -------- v8js_methods.cc | 9 --------- v8js_object_export.cc | 8 -------- 3 files changed, 25 deletions(-) diff --git a/v8js_array_access.cc b/v8js_array_access.cc index 3151781..c9ca933 100644 --- a/v8js_array_access.cc +++ b/v8js_array_access.cc @@ -35,10 +35,6 @@ static zval v8js_array_access_dispatch(zend_object *object, const char *method_n zval php_value; fci.size = sizeof(fci); -#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0) - fci.function_table = &object->ce->function_table; - fci.symbol_table = NULL; -#endif ZVAL_STRING(&fci.function_name, method_name); fci.retval = &php_value; @@ -50,11 +46,7 @@ static zval v8js_array_access_dispatch(zend_object *object, const char *method_n fci.params = params; fci.object = object; -#if (PHP_MAJOR_VERSION < 8) - fci.no_separation = 0; -#else fci.named_params = NULL; -#endif zend_call_function(&fci, NULL); zval_dtor(&fci.function_name); diff --git a/v8js_methods.cc b/v8js_methods.cc index 519748b..614c064 100644 --- a/v8js_methods.cc +++ b/v8js_methods.cc @@ -311,13 +311,8 @@ V8JS_METHOD(require) ZVAL_STRING(¶ms[0], module_base_cstr); ZVAL_STRING(¶ms[1], module_id); - #if (PHP_MAJOR_VERSION < 8) - call_result = call_user_function_ex(EG(function_table), NULL, &c->module_normaliser, - &normaliser_result, 2, params, 0, NULL); - #else call_result = call_user_function(EG(function_table), NULL, &c->module_normaliser, &normaliser_result, 2, params); - #endif } isolate->Enter(); @@ -440,11 +435,7 @@ V8JS_METHOD(require) zend_try { ZVAL_STRING(¶ms[0], normalised_module_id); - #if (PHP_MAJOR_VERSION < 8) - call_result = call_user_function_ex(EG(function_table), NULL, &c->module_loader, &module_code, 1, params, 0, NULL); - #else call_result = call_user_function(EG(function_table), NULL, &c->module_loader, &module_code, 1, params); - #endif } zend_catch { v8js_terminate_execution(isolate); diff --git a/v8js_object_export.cc b/v8js_object_export.cc index 72fcb58..042a82a 100644 --- a/v8js_object_export.cc +++ b/v8js_object_export.cc @@ -59,10 +59,6 @@ static void v8js_call_php_func(zend_object *object, zend_function *method_ptr, c /* zend_fcall_info */ fci.size = sizeof(fci); -#if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0) - fci.function_table = &object->ce->function_table; - fci.symbol_table = NULL; -#endif fci.function_name = fname; fci.object = object; fci.retval = &retval; @@ -137,11 +133,7 @@ static void v8js_call_php_func(zend_object *object, zend_function *method_ptr, c } else { fci.params = NULL; } -#if (PHP_MAJOR_VERSION < 8) - fci.no_separation = 1; -#else fci.named_params = NULL; -#endif info.GetReturnValue().Set(V8JS_NULL); {