From d44530f717c3cb92b2141992a0938bc547d28435 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Mon, 30 May 2022 14:27:01 +0200 Subject: [PATCH] remove V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX polyfill --- v8js_v8.h | 4 ---- v8js_v8object_class.cc | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/v8js_v8.h b/v8js_v8.h index 5c13f00..46e28a9 100644 --- a/v8js_v8.h +++ b/v8js_v8.h @@ -88,10 +88,6 @@ int v8js_get_properties_hash(v8::Local jsValue, HashTable *retval, in V8JS_CTX_PROLOGUE(ctx); -// polyfill for ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX, which changes between 7.1 and 7.2 -#define V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \ - ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) - // In PHP 8.1, mismatched tentative return types emit a deprecation notice. // https://wiki.php.net/rfc/internal_method_return_types // diff --git a/v8js_v8object_class.cc b/v8js_v8object_class.cc index 4399e54..c2d2697 100644 --- a/v8js_v8object_class.cc +++ b/v8js_v8object_class.cc @@ -959,19 +959,19 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_v8generator_wakeup, 0) ZEND_END_ARG_INFO() -V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_current, 0, 0, IS_MIXED, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_current, 0, 0, IS_MIXED, 0) ZEND_END_ARG_INFO() -V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_key, 0, 0, IS_MIXED, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_key, 0, 0, IS_MIXED, 0) ZEND_END_ARG_INFO() -V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_next, 0, 0, IS_VOID, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_next, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() -V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_rewind, 0, 0, IS_VOID, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_rewind, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() -V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_valid, 0, 0, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_valid, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() static const zend_function_entry v8js_v8generator_methods[] = {/* {{{ */