Skip to content

Commit e92b821

Browse files
committed
Test nits, and nanosecons must be strickly less than 1e9
1 parent 8887df9 commit e92b821

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

ext/pcntl/pcntl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ PHP_FUNCTION(pcntl_sigtimedwait)
892892
RETURN_THROWS();
893893
}
894894
/* Nanosecond between 0 and 1e9 */
895-
if (tv_nsec < 0 || tv_nsec > 1000000000) {
895+
if (tv_nsec < 0 || tv_nsec >= 1000000000) {
896896
zend_argument_value_error(4, "must be between 0 and 1e9");
897897
RETURN_THROWS();
898898
}

ext/pcntl/tests/pcntl_sigprocmask_errors.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ try {
1818
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
1919
}
2020
try {
21-
/* This used to return -1 prior to PHP 8.3.0 */
21+
/* This used to return -1 prior to PHP 8.4.0 */
2222
$signals = [];
2323
$signal_no = pcntl_sigprocmask(SIG_BLOCK, $signals);
2424
var_dump($signal_no);

ext/pcntl/tests/pcntl_sigtimedwait_errors.phpt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ max_execution_time=0
1010
<?php
1111

1212
try {
13-
/* This used to return -1 prior to PHP 8.3.0 */
13+
/* This used to return -1 prior to PHP 8.4.0 */
1414
$signals = [];
1515
$signal_no = pcntl_sigtimedwait($signals, $signal_infos, 2);
1616
var_dump($signal_no);
@@ -76,6 +76,14 @@ try {
7676
} catch (\Throwable $e) {
7777
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
7878
}
79+
/* 1_000_000_000ns = 1s so must throw */
80+
try {
81+
$signal_no = var_dump(pcntl_sigtimedwait([SIGTERM], $signal_infos, 0, 1_000_000_000));
82+
var_dump($signal_no);
83+
} catch (\Throwable $e) {
84+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
85+
}
86+
7987
?>
8088
--EXPECTF--
8189
ValueError: pcntl_sigtimedwait(): Argument #1 ($signals) cannot be empty
@@ -87,3 +95,4 @@ ValueError: pcntl_sigtimedwait(): Argument #3 ($seconds) must be greater than or
8795
ValueError: pcntl_sigtimedwait(): Argument #4 ($nanoseconds) must be between 0 and 1e9
8896
ValueError: pcntl_sigtimedwait(): Argument #4 ($nanoseconds) must be between 0 and 1e9
8997
ValueError: pcntl_sigtimedwait(): At least one of argument #3 ($seconds) or argument #4 ($nanoseconds) must be greater than 0
98+
ValueError: pcntl_sigtimedwait(): Argument #4 ($nanoseconds) must be between 0 and 1e9

ext/pcntl/tests/pcntl_sigwaitinfo_errors.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ max_execution_time=0
1010
<?php
1111

1212
try {
13-
/* This used to return -1 prior to PHP 8.3.0 */
13+
/* This used to return -1 prior to PHP 8.4.0 */
1414
$signals = [];
1515
$signal_no = pcntl_sigwaitinfo($signals, $signal_infos);
1616
var_dump($signal_no);

0 commit comments

Comments
 (0)