Review fixes

Author: kocsismate

ext/standard/basic_functions.stub.php

@@ -1043,7 +1043,7 @@ function link(string $target, string $link): bool {}
 
 /* mail.c */
 
-function mail(string $to, string $subject, string $message, array|string|null $additional_headers = null, string $additional_parameters = ""): bool {}
+function mail(string $to, string $subject, string $message, array|string $additional_headers = [], string $additional_parameters = ""): bool {}
 
 /* math.c */
 
@@ -1193,9 +1193,9 @@ function mt_srand(int $seed = 0, int $mode = MT_RAND_MT19937): void {}
 /** @alias mt_srand */
 function srand(int $seed = 0, int $mode = MT_RAND_MT19937): void {}
 
-function rand(?int $min = null, ?int $max = null): int {}
+function rand(int $min = UNKNOWN, int $max = UNKNOWN): int {}
 
-function mt_rand(?int $min = null, ?int $max = null): int {}
+function mt_rand(int $min = UNKNOWN, int $max = UNKNOWN): int {}
 
 function mt_getrandmax(): int {}
 

ext/standard/basic_functions_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ea127c860262164d9b3397780878263d6aa12361 */
+ * Stub hash: c51ad7a5f254f8d28f2b2c0b46e214c44f0f96cf */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -1601,7 +1601,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_mail, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, subject, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
-	ZEND_ARG_TYPE_MASK(0, additional_headers, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
+	ZEND_ARG_TYPE_MASK(0, additional_headers, MAY_BE_ARRAY|MAY_BE_STRING, "[]")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, additional_parameters, IS_STRING, 0, "\"\"")
 ZEND_END_ARG_INFO()
 
@@ -1830,8 +1830,8 @@ ZEND_END_ARG_INFO()
 #define arginfo_srand arginfo_mt_srand
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rand, 0, 0, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, min, IS_LONG, 1, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, max, IS_LONG, 1, "null")
+	ZEND_ARG_TYPE_INFO(0, min, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO(0, max, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_mt_rand arginfo_rand

ext/standard/filestat.c

@@ -621,8 +621,8 @@ PHP_FUNCTION(touch)
 	} else if (!filetime_is_null && fileatime_is_null) {
 		newtime->modtime = newtime->actime = filetime;
 	} else if (filetime_is_null && !fileatime_is_null) {
-		newtime->modtime = fileatime;
-		newtime->actime = fileatime;
+		zend_argument_value_error(2, "cannot be null when argument #3 ($atime) is an integer");
+		RETURN_THROWS();
 	} else {
 		newtime->modtime = filetime;
 		newtime->actime = fileatime;

ext/standard/mail.c

@@ -267,7 +267,7 @@ PHP_FUNCTION(mail)
 		Z_PARAM_STRING(subject, subject_len)
 		Z_PARAM_STRING(message, message_len)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_STR_OR_ARRAY_HT_OR_NULL(headers_str, headers_ht)
+		Z_PARAM_STR_OR_ARRAY_HT(headers_str, headers_ht)
 		Z_PARAM_STR(extra_cmd)
 	ZEND_PARSE_PARAMETERS_END();
 

ext/standard/mt_rand.c

@@ -303,27 +303,19 @@ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)
 /* {{{ Returns a random number from Mersenne Twister */
 PHP_FUNCTION(mt_rand)
 {
-	zend_long min, max;
-	zend_bool min_is_null = 1, max_is_null = 1;
+	zend_long min;
+	zend_long max;
+	int argc = ZEND_NUM_ARGS();
 
-	ZEND_PARSE_PARAMETERS_START(0, 2)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_LONG_OR_NULL(min, min_is_null)
-		Z_PARAM_LONG_OR_NULL(max, max_is_null)
-	ZEND_PARSE_PARAMETERS_END();
-
-	if (min_is_null && max_is_null) {
+	if (argc == 0) {
 		// genrand_int31 in mt19937ar.c performs a right shift
 		RETURN_LONG(php_mt_rand() >> 1);
 	}
 
-	if (min_is_null) {
-		min = 0;
-	}
-
-	if (max_is_null) {
-		max = PHP_MT_RAND_MAX;
-	}
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_LONG(min)
+		Z_PARAM_LONG(max)
+	ZEND_PARSE_PARAMETERS_END();
 
 	if (UNEXPECTED(max < min)) {
 		zend_argument_value_error(2, "must be greater than or equal to argument #1 ($min)");

ext/standard/rand.c

@@ -43,26 +43,18 @@ PHPAPI zend_long php_rand(void)
 /* {{{ Returns a random number from Mersenne Twister */
 PHP_FUNCTION(rand)
 {
-	zend_long min, max;
-	zend_bool min_is_null = 1, max_is_null = 1;
+	zend_long min;
+	zend_long max;
+	int argc = ZEND_NUM_ARGS();
 
-	ZEND_PARSE_PARAMETERS_START(0, 2)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_LONG_OR_NULL(min, min_is_null)
-		Z_PARAM_LONG_OR_NULL(max, max_is_null)
-	ZEND_PARSE_PARAMETERS_END();
-
-	if (min_is_null && max_is_null) {
+	if (argc == 0) {
 		RETURN_LONG(php_mt_rand() >> 1);
 	}
 
-	if (min_is_null) {
-		min = 0;
-	}
-
-	if (max_is_null) {
-		max = PHP_MT_RAND_MAX;
-	}
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_LONG(min)
+		Z_PARAM_LONG(max)
+	ZEND_PARSE_PARAMETERS_END();
 
 	if (max < min) {
 		RETURN_LONG(php_mt_rand_common(max, min));

ext/standard/tests/file/touch.phpt

@@ -35,6 +35,12 @@ var_dump(touch("/no/such/file/or/directory"));
 
 @unlink($filename);
 
+try {
+    touch("/no/such/file/or/directory", null, 1599492068);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 echo "Done\n";
 ?>
 --EXPECTF--
@@ -51,4 +57,5 @@ int(100)
 
 Warning: touch(): Unable to create file /no/such/file/or/directory because %s in %s on line %d
 bool(false)
+touch(): Argument #2 ($time) cannot be null when argument #3 ($atime) is an integer
 Done