Address revie comment + UPGRADING

Author: Girgias

UPGRADING

@@ -59,6 +59,14 @@ PHP 8.3 UPGRADE NOTES
     modifiable pointers but was rejected due to complexity. For this reason, it
     was decided to remove the feature instead.
 
+- PCNTL:
+  . The functions pcntl_sigwaitinfo() and pcntl_sigtimedwait() now throw:
+    - A TypeError if a value of the $signals array is not an integer
+    - A ValueError if the $signals array is empty
+    - A ValueError if a value of the $signals array is not a valid signal number
+    Moreover, those functions now always return false on failure.
+    In some case previously it could return the value -1.
+
 - Standard:
   . The range() function has had various changes:
     * A TypeError is now thrown when passing objects, resources, or arrays

ext/pcntl/pcntl.c

@@ -794,8 +794,8 @@ static bool php_pcntl_process_user_signal_infos(
 			return false;
 		}
 		/* Signals are positive integers */
-		if (tmp < 0 || tmp > INT_MAX) {
-			zend_argument_value_error(1, "signals must be between 0 and %d", INT_MAX);
+		if (tmp < 1 || tmp >= PCNTL_G(num_signals)) {
+			zend_argument_value_error(1, "signals must be between 1 and %d", PCNTL_G(num_signals));
 			return false;
 		}
 
@@ -836,8 +836,7 @@ PHP_FUNCTION(pcntl_sigwaitinfo)
 	if (signal_no == -1 && errno != EAGAIN) {
 		PCNTL_G(last_error) = errno;
 		php_error_docref(NULL, E_WARNING, "%s", strerror(errno));
-		// TODO BC Break, as -1 used to be returned?
-		// RETURN_FALSE;
+		RETURN_FALSE;
 	}
 
 	/* sigwaitinfo can return 0 on success on some platforms, e.g. NetBSD */

ext/pcntl/tests/pcntl_sigtimedwait_errors.phpt

@@ -17,6 +17,12 @@ try {
     echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 
+try {
+    $signals = [0];
+    $signal_no = pcntl_sigtimedwait($signals, $signal_infos, 2);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 try {
     $signals = [-1];
     $signal_no = pcntl_sigtimedwait($signals, $signal_infos, 2);
@@ -32,16 +38,16 @@ try {
 }
 
 /* Unlikely valid signal */
-$signals = [2**10];
-$signal_no = pcntl_sigtimedwait($signals, $signal_infos, 2);
-var_dump($signal_no);
-var_dump($signal_infos);
+try {
+    $signals = [2**10];
+    $signal_no = pcntl_sigtimedwait($signals, $signal_infos, 2);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 ?>
 --EXPECTF--
 ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) cannot be empty
-ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) signals must be between 0 and %d
+ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) signals must be between 1 and %d
+ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) signals must be between 1 and %d
 TypeError: pcntl_sigtimedwait(): Argument #1 ($signals) signals must be of type int, string given
-
-Warning: pcntl_sigtimedwait(): Invalid argument in %s on line %d
-bool(false)
-NULL
+ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) signals must be between 1 and %d

ext/pcntl/tests/pcntl_sigwaitinfo_errors.phpt

@@ -17,6 +17,12 @@ try {
     echo $e::class, ': ', $e->getMessage(), PHP_EOL;
 }
 
+try {
+    $signals = [0];
+    $signal_no = pcntl_sigwaitinfo($signals, $signal_infos);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 try {
     $signals = [-1];
     $signal_no = pcntl_sigwaitinfo($signals, $signal_infos);
@@ -32,16 +38,16 @@ try {
 }
 
 /* Unlikely valid signal */
-$signals = [2**10];
-$signal_no = pcntl_sigwaitinfo($signals, $signal_infos);
-var_dump($signal_no);
-var_dump($signal_infos);
+try {
+    $signals = [2**10];
+    $signal_no = pcntl_sigwaitinfo($signals, $signal_infos);
+} catch (\Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
 ?>
 --EXPECTF--
 ValueError: pcntl_sigwaitinfo(): Argument #1 ($signals) cannot be empty
-ValueError: pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be between 0 and %d
+ValueError: pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be between 1 and %d
+ValueError: pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be between 1 and %d
 TypeError: pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be of type int, string given
-
-Warning: pcntl_sigwaitinfo(): Invalid argument in %s on line %d
-bool(false)
-NULL
+ValueError: pcntl_sigwaitinfo(): Argument #1 ($signals) signals must be between 1 and %d