Merge branch 'PHP-7.0'

* PHP-7.0:
  fix tests

Author: weltling

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

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)
 

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)