1From 0f5132e09d970cacabcca3bab01405bc25b87d66 Mon Sep 17 00:00:00 2001
2From: cdosoftei <ciprian.dosoftei@gmail.com>
3Date: Tue, 11 Aug 2020 12:42:17 -0400
4Subject: [PATCH] php8: explicitly declare arginfo
5
6[Hervé: Taken from https://github.com/laruence/php-lua/pull/47 to fix
7PHP8 compatibility.]
8Signed-off-by: Herve Codina <herve.codina@bootlin.com>
9---
10 lua.c         | 7 +++++--
11 lua_closure.c | 5 ++++-
12 2 files changed, 9 insertions(+), 3 deletions(-)
13
14diff --git a/lua.c b/lua.c
15index f2648ac..bbbd623 100755
16--- a/lua.c
17+++ b/lua.c
18@@ -35,6 +35,9 @@ static zend_object_handlers lua_object_handlers;
19 /** {{{ ARG_INFO
20  *
21  */
22+ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
23+ZEND_END_ARG_INFO()
24+
25 ZEND_BEGIN_ARG_INFO_EX(arginfo_lua_call, 0, 0, 2)
26 	ZEND_ARG_INFO(0, method)
27 	ZEND_ARG_INFO(0, args)
28@@ -817,12 +820,12 @@ PHP_METHOD(lua, __construct) {
29  *
30  */
31 zend_function_entry lua_class_methods[] = {
32-	PHP_ME(lua, __construct,		NULL,  					ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
33+	PHP_ME(lua, __construct,		arginfo_void,				ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
34 	PHP_ME(lua, eval,          		arginfo_lua_eval,  		ZEND_ACC_PUBLIC)
35 	PHP_ME(lua, include,			arginfo_lua_include, 	ZEND_ACC_PUBLIC)
36 	PHP_ME(lua, call,				arginfo_lua_call,  		ZEND_ACC_PUBLIC)
37 	PHP_ME(lua, assign,				arginfo_lua_assign,		ZEND_ACC_PUBLIC)
38-	PHP_ME(lua, getVersion,			NULL, 					ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
39+	PHP_ME(lua, getVersion,			arginfo_void,				ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
40 	PHP_ME(lua, registerCallback,	arginfo_lua_register, 	ZEND_ACC_PUBLIC)
41 	PHP_MALIAS(lua, __call, call, 	arginfo_lua_call,		ZEND_ACC_PUBLIC)
42 	PHP_FE_END
43diff --git a/lua_closure.c b/lua_closure.c
44index 50ef039..b0f6780 100644
45--- a/lua_closure.c
46+++ b/lua_closure.c
47@@ -39,6 +39,9 @@ static zend_object_handlers lua_closure_handlers;
48 /** {{{ ARG_INFO
49  *
50  */
51+ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
52+ZEND_END_ARG_INFO()
53+
54 ZEND_BEGIN_ARG_INFO_EX(arginfo_lua_invoke, 0, 0, 1)
55 	ZEND_ARG_INFO(0, arg)
56 	ZEND_ARG_INFO(0, ...)
57@@ -145,7 +148,7 @@ PHP_METHOD(lua_closure, invoke) {
58 /* {{{ lua_class_methods[]
59  */
60 zend_function_entry lua_closure_methods[] = {
61-	PHP_ME(lua_closure, __construct,		NULL,  					ZEND_ACC_PRIVATE|ZEND_ACC_CTOR)
62+	PHP_ME(lua_closure, __construct,		arginfo_void,				ZEND_ACC_PRIVATE|ZEND_ACC_CTOR)
63 	PHP_ME(lua_closure, invoke,				arginfo_lua_invoke,  	ZEND_ACC_PUBLIC)
64 	PHP_MALIAS(lua_closure, __invoke, invoke, arginfo_lua_invoke,	ZEND_ACC_PUBLIC)
65 	PHP_FE_END
66--
672.31.1
68
69