Improve error messages mentioning parameters instead of arguments

Closes GH-5999

8 files changed, 28 insertions, 28 deletions

diff --git a/ext/standard/tests/strings/chr_error.phpt b/ext/standard/tests/strings/chr_error.phpt
index 59dfffd53b..aee28604d5 100644
--- a/ext/standard/tests/strings/chr_error.phpt
+++ b/ext/standard/tests/strings/chr_error.phpt
@@ -25,7 +25,7 @@ try {
 *** Testing chr() : error conditions ***
 
 -- Testing chr() function with no arguments --
-chr() expects exactly 1 parameter, 0 given
+chr() expects exactly 1 argument, 0 given
 
 -- Testing chr() function with more than expected no. of arguments --
-chr() expects exactly 1 parameter, 2 given
+chr() expects exactly 1 argument, 2 given
diff --git a/ext/standard/tests/strings/crypt.phpt b/ext/standard/tests/strings/crypt.phpt
index 462aea8b59..1d23656555 100644
--- a/ext/standard/tests/strings/crypt.phpt
+++ b/ext/standard/tests/strings/crypt.phpt
@@ -30,4 +30,4 @@ STD
 EXT
 MD5
 BLO
-crypt() expects exactly 2 parameters, 1 given
+crypt() expects exactly 2 arguments, 1 given
diff --git a/ext/standard/tests/strings/fprintf_error.phpt b/ext/standard/tests/strings/fprintf_error.phpt
index 3671300e60..39bc3ebff3 100644
--- a/ext/standard/tests/strings/fprintf_error.phpt
+++ b/ext/standard/tests/strings/fprintf_error.phpt
@@ -31,7 +31,7 @@ echo "Done\n";
 ?>
 --EXPECT--
 *** Testing Error Conditions ***
-fprintf() expects at least 2 parameters, 0 given
-fprintf() expects at least 2 parameters, 1 given
-fprintf() expects at least 2 parameters, 1 given
+fprintf() expects at least 2 arguments, 0 given
+fprintf() expects at least 2 arguments, 1 given
+fprintf() expects at least 2 arguments, 1 given
 Done
diff --git a/ext/standard/tests/strings/printf.phpt b/ext/standard/tests/strings/printf.phpt
index d77dd71c36..db47f58c53 100644
--- a/ext/standard/tests/strings/printf.phpt
+++ b/ext/standard/tests/strings/printf.phpt
@@ -238,10 +238,10 @@ printf("%d", $tempstring);
 ?>
 --EXPECTF--
 *** Output for zero argument ***
-printf() expects at least %d parameter, %d given
+printf() expects at least %d argument, %d given
 
 *** Output for insufficient number of arguments ***
-Error found: 5 parameters are required, 3 given
+Error found: 5 arguments are required, 3 given
 *** Output for scalar argument ***
 3
 *** Output for NULL as argument ***
diff --git a/ext/standard/tests/strings/printf_64bit.phpt b/ext/standard/tests/strings/printf_64bit.phpt
index b0e364b9c9..2886799cc7 100644
--- a/ext/standard/tests/strings/printf_64bit.phpt
+++ b/ext/standard/tests/strings/printf_64bit.phpt
@@ -238,10 +238,10 @@ printf("%d", $tempstring);
 ?>
 --EXPECTF--
 *** Output for zero argument ***
-printf() expects at least 1 parameter, 0 given
+printf() expects at least 1 argument, 0 given
 
 *** Output for insufficient number of arguments ***
-Error found: 5 parameters are required, 3 given
+Error found: 5 arguments are required, 3 given
 *** Output for scalar argument ***
 3
 *** Output for NULL as argument ***
diff --git a/ext/standard/tests/strings/printf_error.phpt b/ext/standard/tests/strings/printf_error.phpt
index 819bb7d1e0..2842f5cea1 100644
--- a/ext/standard/tests/strings/printf_error.phpt
+++ b/ext/standard/tests/strings/printf_error.phpt
@@ -60,18 +60,18 @@ try {
 *** Testing printf() : error conditions ***
 
 -- Testing printf() function with Zero arguments --
-printf() expects at least 1 parameter, 0 given
+printf() expects at least 1 argument, 0 given
 
 -- Testing printf() function with less than expected no. of arguments --
 
 -- Call printf with one argument less than expected --
-2 parameters are required, 1 given
-3 parameters are required, 2 given
-4 parameters are required, 3 given
+2 arguments are required, 1 given
+3 arguments are required, 2 given
+4 arguments are required, 3 given
 
 -- Call printf with two argument less than expected --
-3 parameters are required, 1 given
-4 parameters are required, 2 given
+3 arguments are required, 1 given
+4 arguments are required, 2 given
 
 -- Call printf with three argument less than expected --
-4 parameters are required, 1 given
+4 arguments are required, 1 given
diff --git a/ext/standard/tests/strings/sprintf_error.phpt b/ext/standard/tests/strings/sprintf_error.phpt
index 89ff16b72b..bab3fabae3 100644
--- a/ext/standard/tests/strings/sprintf_error.phpt
+++ b/ext/standard/tests/strings/sprintf_error.phpt
@@ -69,19 +69,19 @@ try {
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sprintf() : error conditions ***
 
 -- Testing sprintf() function with Zero arguments --
-sprintf() expects at least %d parameter, %d given
+sprintf() expects at least 1 argument, 0 given
 
 -- Testing sprintf() function with less than expected no. of arguments --
-2 parameters are required, 1 given
-3 parameters are required, 2 given
-4 parameters are required, 3 given
-3 parameters are required, 1 given
-4 parameters are required, 2 given
-4 parameters are required, 1 given
-101 parameters are required, 1 given
+2 arguments are required, 1 given
+3 arguments are required, 2 given
+4 arguments are required, 3 given
+3 arguments are required, 1 given
+4 arguments are required, 2 given
+4 arguments are required, 1 given
+101 arguments are required, 1 given
 Missing format specifier at end of string
 Done
diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt
index d93de7dc56..1c114daee4 100644
--- a/ext/standard/tests/strings/vfprintf_error1.phpt
+++ b/ext/standard/tests/strings/vfprintf_error1.phpt
@@ -38,5 +38,5 @@ unlink( $file );
 ?>
 --EXPECT--
 -- Testing vfprintf() function with more than expected no. of arguments --
-vfprintf() expects exactly 3 parameters, 4 given
-vfprintf() expects exactly 3 parameters, 4 given
+vfprintf() expects exactly 3 arguments, 4 given
+vfprintf() expects exactly 3 arguments, 4 given