Skip to content

Commit a172eb2

Browse files
committed
test: improve test output and coverage
1 parent d1d79ac commit a172eb2

File tree

2 files changed

+37
-3
lines changed

2 files changed

+37
-3
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--TEST--
2+
Test session.cookie_samesite with invalid INI value
3+
--INI--
4+
session.cookie_samesite=Invalid
5+
--EXTENSIONS--
6+
session
7+
--SKIPIF--
8+
<?php include('skipif.inc'); ?>
9+
--FILE--
10+
<?php
11+
12+
ob_start();
13+
14+
var_dump(ini_get("session.cookie_samesite"));
15+
16+
echo "Done";
17+
ob_end_flush();
18+
?>
19+
--EXPECTF--
20+
Warning: PHP Startup: session.cookie_samesite must be "Strict", "Lax", "None", or "" in Unknown on line 0
21+
string(0) ""
22+
Done

ext/session/tests/session_set_cookie_params_variation6.phpt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ session
1111

1212
ob_start();
1313

14-
// Valid values
14+
echo "-- Valid values --\n";
1515
var_dump(ini_get("session.cookie_samesite"));
1616
var_dump(session_set_cookie_params(["samesite" => "Strict"]));
1717
var_dump(ini_get("session.cookie_samesite"));
@@ -20,11 +20,15 @@ var_dump(ini_get("session.cookie_samesite"));
2020
var_dump(session_set_cookie_params(["samesite" => ""]));
2121
var_dump(ini_get("session.cookie_samesite"));
2222

23-
// Invalid value
23+
echo "-- Invalid value via session_set_cookie_params --\n";
2424
var_dump(session_set_cookie_params(["samesite" => "Invalid"]));
2525
var_dump(ini_get("session.cookie_samesite"));
2626

27-
// Cannot change while session is active
27+
echo "-- Invalid value via ini_set --\n";
28+
var_dump(ini_set("session.cookie_samesite", "Invalid"));
29+
var_dump(ini_get("session.cookie_samesite"));
30+
31+
echo "-- Cannot change while session is active --\n";
2832
var_dump(session_set_cookie_params(["samesite" => "Lax"]));
2933
var_dump(session_start());
3034
var_dump(session_set_cookie_params(["samesite" => "Strict"]));
@@ -34,17 +38,25 @@ echo "Done";
3438
ob_end_flush();
3539
?>
3640
--EXPECTF--
41+
-- Valid values --
3742
string(3) "Lax"
3843
bool(true)
3944
string(6) "Strict"
4045
bool(true)
4146
string(4) "None"
4247
bool(true)
4348
string(0) ""
49+
-- Invalid value via session_set_cookie_params --
4450

4551
Warning: session_set_cookie_params(): session.cookie_samesite must be "Strict", "Lax", "None", or "" in %s on line %d
4652
bool(false)
4753
string(0) ""
54+
-- Invalid value via ini_set --
55+
56+
Warning: ini_set(): session.cookie_samesite must be "Strict", "Lax", "None", or "" in %s on line %d
57+
bool(false)
58+
string(0) ""
59+
-- Cannot change while session is active --
4860
bool(true)
4961
bool(true)
5062

0 commit comments

Comments
 (0)