Fixed ValueError message in count_chars()

Girgias · Girgias · commit adc5edd411d2 · 2023-02-26T14:27:46.000Z
The value of the mode argument must be between 0 and 4 inclusive, not 1 and 4.
diff --git a/ext/standard/string.c b/ext/standard/string.c
@@ -5292,7 +5292,7 @@ PHP_FUNCTION(count_chars)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (mymode < 0 || mymode > 4) {
-		zend_argument_value_error(2, "must be between 1 and 4 (inclusive)");
+		zend_argument_value_error(2, "must be between 0 and 4 (inclusive)");
 		RETURN_THROWS();
 	}
 
diff --git a/ext/standard/tests/strings/count_chars_basic.phpt b/ext/standard/tests/strings/count_chars_basic.phpt
@@ -1569,4 +1569,4 @@ array(238) {
 }
 string(18) " Rabcdefghimnorstu"
 string(476) "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f5051535455565758595a5b5c5d5e5f606a6b6c7071767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"
-count_chars(): Argument #2 ($mode) must be between 1 and 4 (inclusive)
+count_chars(): Argument #2 ($mode) must be between 0 and 4 (inclusive)

Original file line number	Diff line number	Diff line change
`@@ -5292,7 +5292,7 @@ PHP_FUNCTION(count_chars)`
`5292`	`5292`	`ZEND_PARSE_PARAMETERS_END();`
`5293`	`5293`
`5294`	`5294`	`if (mymode < 0 \|\| mymode > 4) {`
`5295`		`- zend_argument_value_error(2, "must be between 1 and 4 (inclusive)");`
	`5295`	`+ zend_argument_value_error(2, "must be between 0 and 4 (inclusive)");`
`5296`	`5296`	`RETURN_THROWS();`
`5297`	`5297`	`}`
`5298`	`5298`
Original file line number	Diff line number	Diff line change
`@@ -1569,4 +1569,4 @@ array(238) {`
`1569`	`1569`	`}`
`1570`	`1570`	`string(18) " Rabcdefghimnorstu"`
`1571`	`1571`	`string(476) "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f5051535455565758595a5b5c5d5e5f606a6b6c7071767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"`
`1572`		`-count_chars(): Argument #2 ($mode) must be between 1 and 4 (inclusive)`
	`1572`	`+count_chars(): Argument #2 ($mode) must be between 0 and 4 (inclusive)`