diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index b93b8f223b55..54e9a4a04049 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -72,6 +72,7 @@ ZEND_API zval* zend_call_method(zend_object *object, zend_class_entry *obj_ce, z } else { fn = *fn_proxy; } + ZEND_ASSERT(object || !fn->common.scope || (fn->common.fn_flags & ZEND_ACC_STATIC)); if (object) { called_scope = object->ce; diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c index 2be09665ba21..a824dff71a4c 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -1127,7 +1127,6 @@ static ZEND_FUNCTION(zend_call_method) zend_argument_type_error(1, "must be of type object|string, %s given", zend_zval_value_name(class_or_object)); return; } - ZEND_ASSERT((argc >= 2) && (argc <= 4)); zend_call_method(obj, ce, NULL, ZSTR_VAL(method_name), ZSTR_LEN(method_name), return_value, argc - 2, arg1, arg2); } diff --git a/ext/zend_test/tests/internal-call-internal-static-return.phpt b/ext/zend_test/tests/internal-call-internal-static-return.phpt index 5313e1115f35..b91159167fb4 100644 --- a/ext/zend_test/tests/internal-call-internal-static-return.phpt +++ b/ext/zend_test/tests/internal-call-internal-static-return.phpt @@ -20,8 +20,8 @@ var_dump(zend_call_method(IntIntStaticString::class, "tryFrom", "all the fish")) class StillReturnsStatic extends _ZendTestClass {} -var_dump(get_class(zend_call_method(_ZendTestClass::class, "returnsStatic"))); -var_dump(get_class(zend_call_method(StillReturnsStatic::class, "returnsStatic"))); +var_dump(get_class(zend_call_method(new _ZendTestClass(), "returnsStatic"))); +var_dump(get_class(zend_call_method(new StillReturnsStatic(), "returnsStatic"))); ?> --EXPECT--