Improve error message for deprecated methods

Author: kocsismate

Zend/tests/call_to_deprecated_method.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Test that a notice is thrown for deprecated methods
+--SKIPIF--
+<?php
+if (!extension_loaded('zend-test')) {
+    die('skip zend-test extension not loaded');
+}
+--FILE--
+<?php
+
+set_error_handler(function($code, $msg) {
+    throw new Error($msg);
+});
+
+$test = new _ZendTestClass();
+
+try {
+    echo $test;
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Method _ZendTestClass::__toString() is deprecated

Zend/zend_execute.c

@@ -1504,10 +1504,14 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_property_read(z
 
 static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_function *fbc)
 {
-	zend_error(E_DEPRECATED, "Function %s%s%s() is deprecated",
-		fbc->common.scope ? ZSTR_VAL(fbc->common.scope->name) : "",
-		fbc->common.scope ? "::" : "",
-		ZSTR_VAL(fbc->common.function_name));
+	if (fbc->common.scope) {
+		zend_error(E_DEPRECATED, "Method %s::%s() is deprecated",
+			ZSTR_VAL(fbc->common.scope->name),
+			ZSTR_VAL(fbc->common.function_name)
+		);
+	} else {
+		zend_error(E_DEPRECATED, "Function %s() is deprecated", ZSTR_VAL(fbc->common.function_name));
+	}
 }
 
 static zend_never_inline void zend_assign_to_string_offset(zval *str, zval *dim, zval *value OPLINE_DC EXECUTE_DATA_DC)