Change message as proposed by Jon.

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index fad2ac26b6727765b5b6f50889eacfbb9a3fc799..e74278935ef0aee950ba70520afe803e5c648912 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2525,7 +2525,7 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
                        } else {
                                severity = E_STRICT;
                        }
-                       zend_error(severity, "Cannot call non static method %s::%s() static", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
+                       zend_error(severity, "Non-static method %s::%s() cannot be called statically", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
                }
        }
        if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {      

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index c526cd9525b5817dccdbda9635b0df327dbddba4..63a0e4254bd7d935c3e94b98ab5c0e6f6fd7b984 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -723,7 +723,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
                        } else {
                                severity = E_STRICT;
                        }
-                       zend_error(E_STRICT, "Cannot call non static method %s::%s() static", calling_scope->name, EX(function_state).function->common.function_name);
+                       zend_error(E_STRICT, "Non-static method %s::%s() cannot be called statically", calling_scope->name, EX(function_state).function->common.function_name);
                }
        }