Merge branch 'PHP-7.0'

* PHP-7.0:
  yet one revert
  Revert "adjust test for 7.0"

Conflicts:
	ext/session/tests/bug69111.phpt

4 files changed, 23 insertions, 29 deletions

diff --git a/ext/session/tests/bug32330.phpt b/ext/session/tests/bug32330.phpt
index fe83cc9504..98d442ae5c 100644
--- a/ext/session/tests/bug32330.phpt
+++ b/ext/session/tests/bug32330.phpt
@@ -69,17 +69,17 @@ $_SESSION['E'] = 'F';
 ?>
 --EXPECTF--
 open: path = /tmp, name = sid
-gc: maxlifetime = %d
 read: id = %s
+gc: maxlifetime = %d
 write: id = %s, data = A|s:1:"B";
 close
 open: path = /tmp, name = sid
-gc: maxlifetime = %d
 read: id = %s
+gc: maxlifetime = %d
 destroy: id = %s
 close
 open: path = /tmp, name = sid
-gc: maxlifetime = %d
 read: id = %s
+gc: maxlifetime = %d
 write: id = %s, data = E|s:1:"F";
 close
diff --git a/ext/session/tests/bug69111.phpt b/ext/session/tests/bug69111.phpt
index 4b65c026ed..75b78f01ac 100644
--- a/ext/session/tests/bug69111.phpt
+++ b/ext/session/tests/bug69111.phpt
@@ -1,9 +1,5 @@
 --TEST--
-Bug #69111 (Crash in SessionHandler::read())
---INI--
-session.save_path=
-session.save_handler=files
-session.name=PHPSESSID
+Bug #69111 Crash in SessionHandler::read()
 --SKIPIF--
 --XFAIL--
 It is still a leak
@@ -16,23 +12,11 @@ session_set_save_handler($sh);
 $savePath = ini_get('session.save_path');
 $sessionName = ini_get('session.name');
 
-// session_start(); // Uncommenting this makes it not crash when reading the session (see below), but it will not return any data.
+// session_start(); // Uncommenting this makes it not crash when reading the session (see below), but it will not return any data. 
 
 $sh->open($savePath, $sessionName);
 $sh->write("foo", "bar");
-$sh->read($id);
-$sh->gc(1245);
-$sh->close();
+var_dump($sh->read(@$id));
 ?>
 --EXPECTF--
-Warning: SessionHandler::open(): Session is not active in %s on line 10
-
-Warning: SessionHandler::write(): Session is not active in %s on line 11
-
-Notice: Undefined variable: id in %s on line 12
-
-Warning: SessionHandler::read(): Session is not active in %s on line 12
-
-Warning: SessionHandler::gc(): Session is not active in %s on line 13
-
-Warning: SessionHandler::close(): Session is not active in %s on line 14
+bool(false)
diff --git a/ext/session/tests/session_set_save_handler_variation4.phpt b/ext/session/tests/session_set_save_handler_variation4.phpt
index 67aa70c4af..a711fdea59 100644
--- a/ext/session/tests/session_set_save_handler_variation4.phpt
+++ b/ext/session/tests/session_set_save_handler_variation4.phpt
@@ -52,9 +52,9 @@ ob_end_flush();
 *** Testing session_set_save_handler() : variation ***
 
 Open [%s,PHPSESSID]
+Read [%s,%s]
 GC [0]
 1 deleted
-Read [%s,%s]
 array(3) {
   ["Blah"]=>
   string(12) "Hello World!"
@@ -67,12 +67,20 @@ Write [%s,%s,Blah|s:12:"Hello World!";Foo|b:0;Guff|i:1234567890;]
 Close [%s,PHPSESSID]
 NULL
 Open [%s,PHPSESSID]
+Read [%s,%s]
 GC [0]
 1 deleted
-Read [%s,%s]
-array(0) {
+array(3) {
+  ["Blah"]=>
+  string(12) "Hello World!"
+  ["Foo"]=>
+  bool(false)
+  ["Guff"]=>
+  int(1234567890)
 }
 Destroy [%s,%s]
+
+Warning: unlink(%s): No such file or directory in %s on line %s
 Close [%s,PHPSESSID]
 bool(true)
 
diff --git a/ext/session/tests/session_set_save_handler_variation5.phpt b/ext/session/tests/session_set_save_handler_variation5.phpt
index 4c1687cac6..6ad600e4d1 100644
--- a/ext/session/tests/session_set_save_handler_variation5.phpt
+++ b/ext/session/tests/session_set_save_handler_variation5.phpt
@@ -62,9 +62,9 @@ string(0) ""
 bool(true)
 Open [%s,PHPSESSID]
 CreateID [PHPT-%d]
+Read [%s,PHPT-%d]
 GC [0]
 1 deleted
-Read [%s,PHPT-%d]
 bool(true)
 string(%d) "PHPT-%d"
 Write [%s,PHPT-%d,]
@@ -76,9 +76,9 @@ string(%d) "PHPT-%d"
 bool(true)
 Open [%s,PHPSESSID]
 ValidateID [%s,PHPT-%d]
+Read [%s,PHPT-%d]
 GC [0]
 1 deleted
-Read [%s,PHPT-%d]
 bool(true)
 Write [%s,PHPT-%d,]
 Close [%s,PHPSESSID]
@@ -88,10 +88,12 @@ string(%d) "PHPT-%d"
 string(%d) "PHPT-%d"
 Open [%s,PHPSESSID]
 ValidateID [%s,PHPT-%d]
+Read [%s,PHPT-%d]
 GC [0]
 1 deleted
-Read [%s,PHPT-%d]
 bool(true)
 Destroy [%s,PHPT-%d]
+
+Warning: unlink(%s): No such file or directory in %s on line %d
 Close [%s,PHPSESSID]
 bool(true)