0002-Fix-compatibility-with-php8-call_user_function_ex.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132
  1. From 8cf66c4b5dd657ca14552b27a42901db0a5e9280 Mon Sep 17 00:00:00 2001
  2. From: Herve Codina <herve.codina@bootlin.com>
  3. Date: Mon, 4 Oct 2021 17:13:45 +0200
  4. Subject: [PATCH] Fix compatibility with php8 - call_user_function_ex
  5. This patch fixes compatibility with php8 replacing
  6. call_user_function_ex by call_user_function.
  7. Upstream: https://github.com/derickr/pecl-dbus/pull/8
  8. Signed-off-by: Herve Codina <herve.codina@bootlin.com>
  9. ---
  10. dbus.c | 4 ++--
  11. 1 file changed, 2 insertions(+), 2 deletions(-)
  12. diff --git a/dbus.c b/dbus.c
  13. index a98e2ea..6fa9897 100644
  14. --- a/dbus.c
  15. +++ b/dbus.c
  16. @@ -1015,8 +1015,8 @@ php_dbus_do_method_call(php_dbus_obj *dbus,
  17. method_args = safe_emalloc(sizeof(zval *), num_elems, 0);
  18. }
  19. - if (call_user_function_ex(EG(function_table), object, &callback, &retval,
  20. - num_elems, method_args, 0, NULL) == SUCCESS) {
  21. + if (call_user_function(EG(function_table), object, &callback, &retval,
  22. + num_elems, method_args) == SUCCESS) {
  23. if (!Z_ISUNDEF(retval)) {
  24. reply = dbus_message_new_method_return(msg);
  25. php_dbus_append_parameters(reply, &retval, NULL,
  26. --
  27. 2.31.1