Refer to method rather than function name in error message

diff --git a/Zend/tests/call_static_004.phpt b/Zend/tests/call_static_004.phpt
index 427c12fc960cf6053dd3d08fd870a5a085d19a92..af53afb12be54c7cb88f5cc13fc31352b5e5cb61 100644 (file)
--- a/Zend/tests/call_static_004.phpt
+++ b/Zend/tests/call_static_004.phpt
@@ -18,7 +18,7 @@ foo::$a();
 --EXPECTF--
 string(3) "AaA"
 
-Fatal error: Uncaught Error: Function name must be a string in %s:%d
+Fatal error: Uncaught Error: Method name must be a string in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

diff --git a/Zend/tests/dynamic_call_002.phpt b/Zend/tests/dynamic_call_002.phpt
index a0908622583aa49474089bd068ec5967e3525db7..2fcb8702eb27d91406f61d595ed388b63278e6b3 100644 (file)
--- a/Zend/tests/dynamic_call_002.phpt
+++ b/Zend/tests/dynamic_call_002.phpt
@@ -9,7 +9,7 @@ $a::$a();
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Function name must be a string in %s:%d
+Fatal error: Uncaught Error: Method name must be a string in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

diff --git a/Zend/tests/dynamic_call_003.phpt b/Zend/tests/dynamic_call_003.phpt
index a400e3359674977783c5ef12cab751c10e6208b5..c19b68eccc34e41724cc3a73628290a53a8a58ed 100644 (file)
--- a/Zend/tests/dynamic_call_003.phpt
+++ b/Zend/tests/dynamic_call_003.phpt
@@ -10,7 +10,7 @@ $a::$b();
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Function name must be a string in %s:%d
+Fatal error: Uncaught Error: Method name must be a string in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 608d24f5080ae961b09448f74ae0cbcd05214837..92b20627e1abf298ca424bb61ab6486a68585dae 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3563,7 +3563,7 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, UNUSED|CLASS_FETCH|CONST|VAR,
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
                                        FREE_OP2();
                                        HANDLE_EXCEPTION();
                                } while (0);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 3940598619a67521e2660890cda5228e31ee7d85..3a11acbdc89bf8353bebf03ab971c939854f7dba 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5762,7 +5762,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
 
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -7937,7 +7937,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
                                        zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -8680,7 +8680,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
 
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -10193,7 +10193,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
 
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -22627,7 +22627,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
 
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -24857,7 +24857,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
                                        zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -26129,7 +26129,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
 
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -28382,7 +28382,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
 
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -30550,7 +30550,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
 
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -32418,7 +32418,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
                                        zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -32834,7 +32834,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
 
                                        HANDLE_EXCEPTION();
                                } while (0);
@@ -34812,7 +34812,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_U
                                                        HANDLE_EXCEPTION();
                                                }
                                        }
-                                       zend_throw_error(NULL, "Function name must be a string");
+                                       zend_throw_error(NULL, "Method name must be a string");
 
                                        HANDLE_EXCEPTION();
                                } while (0);