diff --git a/UPGRADING b/UPGRADING index ccea43b31fa..991c4bf0b40 100644 --- a/UPGRADING +++ b/UPGRADING @@ -46,6 +46,12 @@ PHP 7.4 UPGRADE NOTES 4. Deprecated Functionality ======================================== +- Core: + . Unbinding $this of a non-static method through a combination of + ReflectionMethod::getClosure() and closure rebinding is deprecated. Doing + so is equivalent to calling a non-static method statically, which has been + deprecated since PHP 7.0. + ======================================== 5. Changed Functions ======================================== diff --git a/Zend/tests/closure_061.phpt b/Zend/tests/closure_061.phpt index 1aa579a4095..f01e3935704 100644 --- a/Zend/tests/closure_061.phpt +++ b/Zend/tests/closure_061.phpt @@ -175,6 +175,8 @@ Cannot rebind scope of closure created by ReflectionFunctionAbstract::getClosure ------------------- bindTo(null, Cls::class): +Unbinding $this of a method is deprecated + Success! bindTo(new Cls, Cls::class): diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 56808e2496e..6ee23255094 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -82,10 +82,14 @@ static zend_bool zend_valid_closure_binding( ZSTR_VAL(Z_OBJCE_P(newthis)->name)); return 0; } - } else if (!(func->common.fn_flags & ZEND_ACC_STATIC) && func->common.scope - && func->type == ZEND_INTERNAL_FUNCTION) { - zend_error(E_WARNING, "Cannot unbind $this of internal method"); - return 0; + } else if (is_fake_closure && func->common.scope + && !(func->common.fn_flags & ZEND_ACC_STATIC)) { + if (func->type == ZEND_INTERNAL_FUNCTION) { + zend_error(E_WARNING, "Cannot unbind $this of internal method"); + return 0; + } else { + zend_error(E_DEPRECATED, "Unbinding $this of a method is deprecated"); + } } if (scope && scope != func->common.scope && scope->type == ZEND_INTERNAL_CLASS) {