Skip to content

Commit 2d1b872

Browse files
committed
Try to fix setcookie() tests on 32-bit
1 parent a6a9611 commit 2d1b872

File tree

3 files changed

+40
-15
lines changed

3 files changed

+40
-15
lines changed

ext/standard/tests/network/setcookie_array_option_error.phpt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ try {
2525
} catch (\ValueError $e) {
2626
echo $e->getMessage() . "\n";
2727
}
28-
// Invalid expiration date
29-
// To go above year 9999: 60 * 60 * 24 * 365 * 9999
30-
try {
31-
setcookie('name', 'value', ['expires' => 315328464000]);
32-
} catch (\ValueError $e) {
33-
echo $e->getMessage() . "\n";
34-
}
3528
// Invalid path key content
3629
try {
3730
setcookie('name', 'value', ['path' => '/;/']);
@@ -52,17 +45,28 @@ try {
5245
echo $e->getMessage() . "\n";
5346
}
5447

48+
if (PHP_INT_SIZE == 8) {
49+
try {
50+
// To go above year 9999: 60 * 60 * 24 * 365 * 9999
51+
setrawcookie('name', 'value', ['expires' => 315328464000]);
52+
} catch (\ValueError $e) {
53+
var_dump($e->getMessage() == 'setcookie(): "expires" option cannot have a year greater than 9999');
54+
}
55+
} else {
56+
var_dump(true);
57+
}
58+
5559
var_dump(headers_list());
5660
--EXPECTHEADERS--
5761

5862
--EXPECTF--
5963
setcookie(): option "unknown_key" is invalid
6064
setcookie(): option array cannot have numeric keys
6165
setcookie(): option "foo" is invalid
62-
setcookie(): "expires" option cannot have a year greater than 9999
6366
setcookie(): "path" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
6467
setcookie(): "domain" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
6568
setcookie(): Expects exactly 3 arguments when argument #3 ($expires_or_options) is an array
69+
bool(false)
6670
array(1) {
6771
[0]=>
6872
string(%s) "X-Powered-By: PHP/%s"

ext/standard/tests/network/setcookie_error.phpt

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ try {
2222
} catch (\ValueError $e) {
2323
echo $e->getMessage() . "\n";
2424
}
25-
// To go above year 9999: 60 * 60 * 24 * 365 * 9999
26-
try {
27-
setcookie('name', 'value', 315328464000);
28-
} catch (\ValueError $e) {
29-
echo $e->getMessage() . "\n";
30-
}
3125
try {
3226
setcookie('name', 'value', 100, 'invalid;');
3327
} catch (\ValueError $e) {
@@ -39,15 +33,28 @@ try {
3933
echo $e->getMessage() . "\n";
4034
}
4135

36+
if (PHP_INT_SIZE == 8) {
37+
try {
38+
// To go above year 9999: 60 * 60 * 24 * 365 * 9999
39+
setcookie('name', 'value', 315328464000);
40+
} catch (\ValueError $e) {
41+
var_dump($e->getMessage() == 'setcookie(): "expires" option cannot have a year greater than 9999');
42+
}
43+
} else {
44+
var_dump(true);
45+
}
46+
4247
var_dump(headers_list());
48+
49+
?>
4350
--EXPECTHEADERS--
4451

4552
--EXPECTF--
4653
setcookie(): Argument #1 ($name) cannot be empty
4754
setcookie(): Argument #1 ($name) cannot contain "=", ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
48-
setcookie(): "expires" option cannot have a year greater than 9999
4955
setcookie(): "path" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
5056
setcookie(): "domain" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
57+
bool(true)
5158
array(2) {
5259
[0]=>
5360
string(%d) "X-Powered-By: PHP/%s"

ext/standard/tests/network/setrawcookie_error.phpt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,20 @@ try {
3939
echo $e->getMessage() . "\n";
4040
}
4141

42+
if (PHP_INT_SIZE == 8) {
43+
try {
44+
// To go above year 9999: 60 * 60 * 24 * 365 * 9999
45+
setrawcookie('name', 'value', 315328464000);
46+
} catch (\ValueError $e) {
47+
var_dump($e->getMessage() == 'setrawcookie(): "expires" option cannot have a year greater than 9999');
48+
}
49+
} else {
50+
var_dump(true);
51+
}
52+
4253
var_dump(headers_list());
54+
55+
?>
4356
--EXPECTHEADERS--
4457

4558
--EXPECTF--
@@ -49,6 +62,7 @@ setrawcookie(): Argument #2 ($value) cannot contain ",", ";", " ", "\t", "\r", "
4962
setrawcookie(): "expires" option cannot have a year greater than 9999
5063
setrawcookie(): "path" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
5164
setrawcookie(): "domain" option cannot contain ",", ";", " ", "\t", "\r", "\n", "\013", or "\014"
65+
bool(true)
5266
array(1) {
5367
[0]=>
5468
string(%d) "X-Powered-By: PHP/%s"

0 commit comments

Comments
 (0)