Skip to content

Commit 0a59a71

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix brittle test
2 parents c1a80e0 + 6b99a8b commit 0a59a71

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
@@ -29,10 +29,12 @@ $_SESSION["Blah"] = "Hello World!";
2929
$_SESSION["Foo"] = FALSE;
3030
$_SESSION["Guff"] = 1234567890;
3131
var_dump($_SESSION);
32+
$oldsession = $_SESSION;
3233

3334
var_dump(session_write_close());
3435
session_start();
35-
var_dump($_SESSION);
36+
// the session may have been GC'd or not; we accept either outcome
37+
var_dump($_SESSION === $oldsession || $_SESSION === []);
3638
var_dump(session_destroy());
3739
session_start();
3840
var_dump($_SESSION);
@@ -51,14 +53,7 @@ array(3) {
5153
int(1234567890)
5254
}
5355
bool(true)
54-
array(3) {
55-
["Blah"]=>
56-
string(12) "Hello World!"
57-
["Foo"]=>
58-
bool(false)
59-
["Guff"]=>
60-
int(1234567890)
61-
}
56+
bool(true)
6257
bool(true)
6358
array(0) {
6459
}

0 commit comments

Comments
 (0)