php · kocsismate · Apr 1, 2020 · Apr 3, 2020
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
@@ -339,7 +339,7 @@ static PHP_FUNCTION(bzread)
 	php_stream_from_zval(stream, bz);
 
 	if (len  < 0) {
-		zend_value_error("Length cannot be negative");
+		zend_argument_value_error(2, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
@@ -367,7 +367,7 @@ static PHP_FUNCTION(bzopen)
 	}
 
 	if (mode_len != 1 || (mode[0] != 'r' && mode[0] != 'w')) {
-		zend_value_error("'%s' is not a valid mode for bzopen(). Only 'w' and 'r' are supported.", mode);
+		zend_argument_value_error(2, "must be a valid mode. Only 'w' and 'r' are supported");
 		RETURN_THROWS();
 	}
 

diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt
@@ -37,15 +37,15 @@ var_dump(bzopen($fp, "r"));
 
 ?>
 --EXPECTF--
-'' is not a valid mode for bzopen(). Only 'w' and 'r' are supported.
+bzopen(): Argument #2 ($mode) must be a valid mode. Only 'w' and 'r' are supported
 
 Warning: bzopen(): Filename cannot be empty in %s on line %d
 bool(false)
 
 Warning: bzopen(): Filename cannot be empty in %s on line %d
 bool(false)
-'x' is not a valid mode for bzopen(). Only 'w' and 'r' are supported.
-'rw' is not a valid mode for bzopen(). Only 'w' and 'r' are supported.
+bzopen(): Argument #2 ($mode) must be a valid mode. Only 'w' and 'r' are supported
+bzopen(): Argument #2 ($mode) must be a valid mode. Only 'w' and 'r' are supported
 
 Warning: bzopen(no_such_file): Failed to open stream: No such file or directory in %s on line %d
 bool(false)

diff --git a/ext/bz2/tests/003-mb.phpt b/ext/bz2/tests/003-mb.phpt
@@ -21,7 +21,7 @@ var_dump(bzread($fd, 100000));
 ?>
 --EXPECT--
 string(0) ""
-Length cannot be negative
+bzread(): Argument #2 ($length) must be greater than or equal to 0
 string(1) "R"
 string(2) "is"
 string(251) "ing up from the heart of the desert

diff --git a/ext/bz2/tests/003.phpt b/ext/bz2/tests/003.phpt
@@ -21,7 +21,7 @@ var_dump(bzread($fd, 100000));
 ?>
 --EXPECT--
 string(0) ""
-Length cannot be negative
+bzread(): Argument #2 ($length) must be greater than or equal to 0
 string(1) "R"
 string(2) "is"
 string(251) "ing up from the heart of the desert

diff --git a/ext/calendar/cal_unix.c b/ext/calendar/cal_unix.c
@@ -35,7 +35,7 @@ PHP_FUNCTION(unixtojd)
 	if (!ts) {
 		ts = time(NULL);
 	} else if (ts < 0) {
-		zend_value_error("Timestamp must not be negative");
+		zend_argument_value_error(1, "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 

diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
@@ -217,7 +217,7 @@ PHP_FUNCTION(cal_info)
 
 
 	if (cal != -1 && (cal < 0 || cal >= CAL_NUM_CALS)) {
-		zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal);
+		zend_argument_value_error(1, "must be a valid calendar ID");
 		RETURN_THROWS();
 	}
 
@@ -239,7 +239,7 @@ PHP_FUNCTION(cal_days_in_month)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal);
+		zend_argument_value_error(1, "must be a valid calendar ID");
 		RETURN_THROWS();
 	}
 
@@ -285,7 +285,7 @@ PHP_FUNCTION(cal_to_jd)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal);
+		zend_argument_value_error(1, "must be a valid calendar ID");
 		RETURN_THROWS();
 	}
 
@@ -306,7 +306,7 @@ PHP_FUNCTION(cal_from_jd)
 	}
 
 	if (cal < 0 || cal >= CAL_NUM_CALS) {
-		zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal);
+		zend_argument_value_error(2, "must be a valid calendar ID");
 		RETURN_THROWS();
 	}
 	calendar = &cal_conversion_table[cal];

diff --git a/ext/calendar/easter.c b/ext/calendar/easter.c
@@ -49,7 +49,7 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, zend_long gm)
 	}
 
 	if (gm && (year<1970 || year>2037)) {				/* out of range for timestamps */
-		zend_value_error("This function is only valid for years between 1970 and 2037 inclusive");
+		zend_argument_value_error(1, "must be between 1970 and 2037 (inclusive)");
 		RETURN_THROWS();
 	}
 

diff --git a/ext/calendar/tests/cal_days_in_month_error1.phpt b/ext/calendar/tests/cal_days_in_month_error1.phpt
@@ -18,5 +18,5 @@ try{
 }
 ?>
 --EXPECT--
-Invalid calendar ID: -1
+cal_days_in_month(): Argument #1 ($calendar) must be a valid calendar ID
 Invalid date
diff --git a/ext/calendar/tests/cal_from_jd_error1.phpt b/ext/calendar/tests/cal_from_jd_error1.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-Invalid calendar ID: -1
+cal_from_jd(): Argument #2 ($calendar) must be a valid calendar ID
diff --git a/ext/calendar/tests/cal_info.phpt b/ext/calendar/tests/cal_info.phpt
@@ -216,4 +216,4 @@ Array
     [calname] => Julian
     [calsymbol] => CAL_JULIAN
 )
-Invalid calendar ID: 99999
+cal_info(): Argument #1 ($calendar) must be a valid calendar ID
diff --git a/ext/calendar/tests/cal_to_jd_error1.phpt b/ext/calendar/tests/cal_to_jd_error1.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-Invalid calendar ID: -1
+cal_to_jd(): Argument #1 ($calendar) must be a valid calendar ID
diff --git a/ext/calendar/tests/easter_date.phpt b/ext/calendar/tests/easter_date.phpt
@@ -22,4 +22,4 @@ try {
 2000-04-23
 2001-04-15
 2002-03-31
-This function is only valid for years between 1970 and 2037 inclusive
+easter_date(): Argument #1 ($year) must be between 1970 and 2037 (inclusive)
diff --git a/ext/calendar/tests/unixtojd_error1.phpt b/ext/calendar/tests/unixtojd_error1.phpt
@@ -20,7 +20,7 @@ var_dump(unixtojd(null)) . PHP_EOL;
 var_dump(unixtojd(time())) . PHP_EOL;
 ?>
 --EXPECTF--
-Timestamp must not be negative
+unixtojd(): Argument #1 ($timestamp) must be greater than or equal to 0
 int(%d)
 int(%d)
 int(%d)
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ try { @@
 -04-23
 -04-15
 -03-31
-    This function is only valid for years between 1970 and 2037 inclusive
+    easter_date(): Argument #1 ($year) must be between 1970 and 2037 (inclusive)