Skip to content

Commit d44530f

Browse files
committed
remove V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX polyfill
1 parent 9b3d1d1 commit d44530f

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

v8js_v8.h

-4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ int v8js_get_properties_hash(v8::Local<v8::Value> jsValue, HashTable *retval, in
8888
V8JS_CTX_PROLOGUE(ctx);
8989

9090

91-
// polyfill for ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX, which changes between 7.1 and 7.2
92-
#define V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
93-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null)
94-
9591
// In PHP 8.1, mismatched tentative return types emit a deprecation notice.
9692
// https://wiki.php.net/rfc/internal_method_return_types
9793
//

v8js_v8object_class.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -959,19 +959,19 @@ ZEND_END_ARG_INFO()
959959
ZEND_BEGIN_ARG_INFO(arginfo_v8generator_wakeup, 0)
960960
ZEND_END_ARG_INFO()
961961

962-
V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_current, 0, 0, IS_MIXED, 0)
962+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_current, 0, 0, IS_MIXED, 0)
963963
ZEND_END_ARG_INFO()
964964

965-
V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_key, 0, 0, IS_MIXED, 0)
965+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_key, 0, 0, IS_MIXED, 0)
966966
ZEND_END_ARG_INFO()
967967

968-
V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_next, 0, 0, IS_VOID, 0)
968+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_next, 0, 0, IS_VOID, 0)
969969
ZEND_END_ARG_INFO()
970970

971-
V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_rewind, 0, 0, IS_VOID, 0)
971+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_rewind, 0, 0, IS_VOID, 0)
972972
ZEND_END_ARG_INFO()
973973

974-
V8_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_valid, 0, 0, _IS_BOOL, 0)
974+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8generator_valid, 0, 0, _IS_BOOL, 0)
975975
ZEND_END_ARG_INFO()
976976

977977
static const zend_function_entry v8js_v8generator_methods[] = {/* {{{ */

0 commit comments

Comments
 (0)