Skip to content

Commit dd30a3d

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix brittle test
2 parents f1436c4 + 0a59a71 commit dd30a3d

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

ext/session/tests/session_module_name_variation4.phpt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ $_SESSION["Blah"] = "Hello World!";
2323
$_SESSION["Foo"] = FALSE;
2424
$_SESSION["Guff"] = 1234567890;
2525
var_dump($_SESSION);
26+
$oldsession = $_SESSION;
2627

2728
var_dump(session_write_close());
2829
session_start();
29-
var_dump($_SESSION);
30+
// the session may have been GC'd or not; we accept either outcome
31+
var_dump($_SESSION === $oldsession || $_SESSION === []);
3032
var_dump(session_destroy());
3133
session_start();
3234
var_dump($_SESSION);
@@ -45,14 +47,7 @@ array(3) {
4547
int(1234567890)
4648
}
4749
bool(true)
48-
array(3) {
49-
["Blah"]=>
50-
string(12) "Hello World!"
51-
["Foo"]=>
52-
bool(false)
53-
["Guff"]=>
54-
int(1234567890)
55-
}
50+
bool(true)
5651
bool(true)
5752
array(0) {
5853
}

0 commit comments

Comments
 (0)