Adjust error messages

Author: arnaud-lb

Zend/tests/partial_application/errors_001.phpt

@@ -6,32 +6,45 @@ function foo($a, $b, $c) {
 
 }
 
+class C {
+    function f($a, $b, $c) {
+    }
+}
+
 try {
     foo(?);
 } catch (Error $ex) {
-    printf("%s\n", $ex->getMessage());
+    printf("%s: %s\n", $ex::class, $ex->getMessage());
 }
 
 try {
     foo(?, ?, ?, ?);
 } catch (Error $ex) {
-    printf("%s\n", $ex->getMessage());
+    printf("%s: %s\n", $ex::class, $ex->getMessage());
+}
+
+try {
+    $c = new C();
+    $c->f(?);
+} catch (Error $ex) {
+    printf("%s: %s\n", $ex::class, $ex->getMessage());
 }
 
 try {
     property_exists(?);
 } catch (Error $ex) {
-    printf("%s\n", $ex->getMessage());
+    printf("%s: %s\n", $ex::class, $ex->getMessage());
 }
 
 try {
     usleep(?, ?);
 } catch (Error $ex) {
-    printf("%s\n", $ex->getMessage());
+    printf("%s: %s\n", $ex::class, $ex->getMessage());
 }
 ?>
 --EXPECT--
-not enough arguments or placeholders for application of foo, 1 given and exactly 3 expected
-too many arguments or placeholders for application of foo, 4 given and a maximum of 3 expected
-not enough arguments or placeholders for application of property_exists, 1 given and exactly 2 expected
-too many arguments or placeholders for application of usleep, 2 given and a maximum of 1 expected
+ArgumentCountError: Partial application of foo() expects exactly 3 arguments, 1 given
+ArgumentCountError: Partial application of foo() expects at most 3 arguments, 4 given
+ArgumentCountError: Partial application of C::f() expects exactly 3 arguments, 1 given
+ArgumentCountError: Partial application of property_exists() expects exactly 2 arguments, 1 given
+ArgumentCountError: Partial application of usleep() expects at most 1 arguments, 2 given

Zend/tests/partial_application/rfc_examples_003.phpt

@@ -10,23 +10,23 @@ if (time() > 0) {
 try {
     stuff(?);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ": ", $e->getMessage(), "\n";
 }
 
 try {
     stuff(?, ?, ?, ?, ?, ?);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ": ", $e->getMessage(), "\n";
 }
 
 try {
     stuff(?, ?, 3.5, null, i: 5);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ": ", $e->getMessage(), "\n";
 }
 
 ?>
---EXPECTF--
-not enough arguments or placeholders for application of stuff, 1 given and at least 4 expected
-too many arguments or placeholders for application of stuff, 6 given and a maximum of 5 expected
-Named parameter $i overwrites previous placeholder
+--EXPECT--
+ArgumentCountError: Partial application of stuff() expects at least 4 arguments, 1 given
+ArgumentCountError: Partial application of stuff() expects at most 5 arguments, 6 given
+Error: Named parameter $i overwrites previous placeholder

Zend/tests/partial_application/variation_variadics_008.phpt

@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECTF--
-too many arguments or placeholders for application of {closure:%s}, 2 given and a maximum of 1 expected
+Partial application of {closure:%s:%d}() expects at most 1 arguments, 2 given

Zend/zend_partial.c

@@ -57,27 +57,18 @@ static zend_always_inline void zend_partial_args_underflow(
 	const char *limit = function->common.num_args <= function->common.required_num_args ?
 			"exactly" : "at least";
 
-	zend_throw_error(NULL,
-		"not enough arguments or placeholders for application of %s, "
-		"%d given and %s %d expected",
-		ZSTR_VAL(symbol), args, limit, expected);
+	zend_argument_count_error(
+		"Partial application of %s() expects %s %d arguments, %d given",
+		ZSTR_VAL(symbol), limit, expected, args);
 }
 
 static zend_always_inline void zend_partial_args_overflow(
 		zend_function *function, zend_string *symbol, uint32_t args,
 		uint32_t expected)
 {
-	if (function->type == ZEND_USER_FUNCTION) {
-		zend_throw_error(NULL,
-			"too many arguments or placeholders for application of %s, "
-			"%d given and a maximum of %d expected",
-			ZSTR_VAL(symbol), args, expected);
-	} else {
-		zend_throw_error(NULL,
-			"too many arguments or placeholders for application of %s, "
-			"%d given and a maximum of %d expected",
-			ZSTR_VAL(symbol), args, expected);
-	}
+	zend_argument_count_error(
+		"Partial application of %s() expects at most %d arguments, %d given",
+		ZSTR_VAL(symbol), expected, args);
 }
 
 void zend_partial_args_check(zend_execute_data *call) {