Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix brittle test

1 files changed, 4 insertions, 9 deletions

diff --git a/ext/session/tests/session_module_name_variation4.phpt b/ext/session/tests/session_module_name_variation4.phpt
index 303a5f8939..a45df64362 100644
--- a/ext/session/tests/session_module_name_variation4.phpt
+++ b/ext/session/tests/session_module_name_variation4.phpt
@@ -29,10 +29,12 @@ $_SESSION["Blah"] = "Hello World!";
 $_SESSION["Foo"] = FALSE;
 $_SESSION["Guff"] = 1234567890;
 var_dump($_SESSION);
+$oldsession = $_SESSION;
 
 var_dump(session_write_close());
 session_start();
-var_dump($_SESSION);
+// the session may have been GC'd or not; we accept either outcome
+var_dump($_SESSION === $oldsession || $_SESSION === []);
 var_dump(session_destroy());
 session_start();
 var_dump($_SESSION);
@@ -51,14 +53,7 @@ array(3) {
   int(1234567890)
 }
 bool(true)
-array(3) {
-  ["Blah"]=>
-  string(12) "Hello World!"
-  ["Foo"]=>
-  bool(false)
-  ["Guff"]=>
-  int(1234567890)
-}
+bool(true)
 bool(true)
 array(0) {
 }