0002-php8-explicitly-declare-arginfo.patch 2.4 KB

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