Zend: Use zend_bad_method_call() when cloning from the wrong scope (php#18999)

Author: TimWolla

Zend/zend_builtin_functions.c

@@ -93,11 +93,7 @@ ZEND_FUNCTION(clone)
 		if (clone->common.scope != scope) {
 			if (UNEXPECTED(clone->common.fn_flags & ZEND_ACC_PRIVATE)
 			 || UNEXPECTED(!zend_check_protected(zend_get_function_root_class(clone), scope))) {
-				zend_throw_error(NULL, "Call to %s %s::__clone() from %s%s",
-					zend_visibility_string(clone->common.fn_flags), ZSTR_VAL(clone->common.scope->name),
-					scope ? "scope " : "global scope",
-					scope ? ZSTR_VAL(scope->name) : ""
-				);
+				zend_bad_method_call(clone, clone->common.function_name, scope);
 				RETURN_THROWS();
 			}
 		}

Zend/zend_execute.c

@@ -4123,15 +4123,6 @@ static zend_never_inline void zend_fetch_this_var(int type OPLINE_DC EXECUTE_DAT
 	}
 }
 
-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_clone_call(zend_function *clone, zend_class_entry *scope)
-{
-	zend_throw_error(NULL, "Call to %s %s::__clone() from %s%s",
-		zend_visibility_string(clone->common.fn_flags), ZSTR_VAL(clone->common.scope->name),
-		scope ? "scope " : "global scope",
-		scope ? ZSTR_VAL(scope->name) : ""
-	);
-}
-
 #if ZEND_INTENSIVE_DEBUGGING
 
 #define CHECK_SYMBOL_TABLES()													\

Zend/zend_vm_def.h

@@ -6046,7 +6046,7 @@ ZEND_VM_COLD_CONST_HANDLER(110, ZEND_CLONE, CONST|TMPVAR|UNUSED|THIS|CV, ANY)
 		if (clone->common.scope != scope) {
 			if (UNEXPECTED(clone->common.fn_flags & ZEND_ACC_PRIVATE)
 			 || UNEXPECTED(!zend_check_protected(zend_get_function_root_class(clone), scope))) {
-				zend_wrong_clone_call(clone, scope);
+				zend_bad_method_call(clone, clone->common.function_name, scope);
 				FREE_OP1();
 				ZVAL_UNDEF(EX_VAR(opline->result.var));
 				HANDLE_EXCEPTION();

Zend/zend_vm_execute.h

@@ -17,4 +17,4 @@ try {
 
 ?>
 --EXPECT--
-Error: Call to protected test::__clone() from global scope
+Error: Call to protected method test::__clone() from global scope

tests/classes/factory_and_singleton_007.phpt

@@ -17,4 +17,4 @@ try {
 
 ?>
 --EXPECT--
-Error: Call to private test::__clone() from global scope
+Error: Call to private method test::__clone() from global scope