ext/pcntl: Use standard wording for ValueError

Girgias · Girgias · commit 4f11fa208f86 · 2024-08-18T23:59:17.000+02:00
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
@@ -1693,8 +1693,9 @@ PHP_FUNCTION(pcntl_setcpuaffinity)
 		Z_PARAM_ARRAY(hmask)
 	ZEND_PARSE_PARAMETERS_END();
 
+	// TODO Why are the arguments optional?
 	if (!hmask || zend_hash_num_elements(Z_ARRVAL_P(hmask)) == 0) {
-		zend_argument_value_error(2, "must not be empty");
+		zend_argument_cannot_be_empty_error(2);
 		RETURN_THROWS();
 	}
 
diff --git a/ext/pcntl/tests/pcntl_cpuaffinity.phpt b/ext/pcntl/tests/pcntl_cpuaffinity.phpt
@@ -60,7 +60,7 @@ array(0) {
 array(0) {
 }
 bool(true)
-pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) must not be empty
+pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cannot be empty
 pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id invalid value (def)
 pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id must be between 0 and %d (%d)
 pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id must be between 0 and %d (-1024)

Original file line number	Diff line number	Diff line change
`@@ -1693,8 +1693,9 @@ PHP_FUNCTION(pcntl_setcpuaffinity)`
`1693`	`1693`	`Z_PARAM_ARRAY(hmask)`
`1694`	`1694`	`ZEND_PARSE_PARAMETERS_END();`
`1695`	`1695`
	`1696`	`+ // TODO Why are the arguments optional?`
`1696`	`1697`	`if (!hmask \|\| zend_hash_num_elements(Z_ARRVAL_P(hmask)) == 0) {`
`1697`		`- zend_argument_value_error(2, "must not be empty");`
	`1698`	`+ zend_argument_cannot_be_empty_error(2);`
`1698`	`1699`	`RETURN_THROWS();`
`1699`	`1700`	`}`
`1700`	`1701`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ array(0) {`
`60`	`60`	`array(0) {`
`61`	`61`	`}`
`62`	`62`	`bool(true)`
`63`		`-pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) must not be empty`
	`63`	`+pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cannot be empty`
`64`	`64`	`pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id invalid value (def)`
`65`	`65`	`pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id must be between 0 and %d (%d)`
`66`	`66`	`pcntl_setcpuaffinity(): Argument #2 ($cpu_ids) cpu id must be between 0 and %d (-1024)`