Fix tests

diff --git a/ext/session/tests/session_set_save_handler_class_001.phpt b/ext/session/tests/session_set_save_handler_class_001.phpt
index 667456cc1d94bc182712a54c46dbbe7beeb851ca..83e899a2bc1e0df2b5e3c455d7a277834b5cb2ed 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_001.phpt
+++ b/ext/session/tests/session_set_save_handler_class_001.phpt
@@ -53,15 +53,15 @@ session_unset();
 --EXPECTF--
 *** Testing session_set_save_handler() : basic class wrapping existing handler ***
 Open 
-Read %x
-string(32) "%x"
+Read %s
+string(%d) "%s"
 string(5) "files"
 string(4) "user"
 int(2)
 array(0) {
 }
-Open %x
-Read %x
+Open %s
+Read %s
 array(1) {
   ["foo"]=>
   string(5) "hello"

diff --git a/ext/session/tests/session_set_save_handler_class_002.phpt b/ext/session/tests/session_set_save_handler_class_002.phpt
index e907b2132cbda1389cfb4cb7f6340c9fd35f5e54..9d5f732b536680c452918991acd1bb95b33c233e 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_002.phpt
+++ b/ext/session/tests/session_set_save_handler_class_002.phpt
@@ -91,7 +91,7 @@ session_unset();
 
 --EXPECTF--
 *** Testing session_set_save_handler() : full handler implementation ***
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(1) {
   ["foo"]=>
@@ -101,7 +101,7 @@ array(1) {
   ["foo"]=>
   string(5) "hello"
 }
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(1) {
   ["foo"]=>

diff --git a/ext/session/tests/session_set_save_handler_class_003.phpt b/ext/session/tests/session_set_save_handler_class_003.phpt
index 858a2e2a6ac7afb1ef1571694c456de6d6475a04..e9a3cc2febab46ecc5122fa5d28a01af99d02301 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_003.phpt
+++ b/ext/session/tests/session_set_save_handler_class_003.phpt
@@ -70,7 +70,7 @@ array(1) {
   string(5) "hello"
 }
 int(4)
-string(32) "%x"
+string(%d) "%s"
 array(1) {
   ["foo"]=>
   string(5) "hello"

diff --git a/ext/session/tests/session_set_save_handler_class_004.phpt b/ext/session/tests/session_set_save_handler_class_004.phpt
index b9a5f4581f0be6c403a011bee02030ad3651dec9..103b13baa7e94a1d75abcf796d6041aa82e84f5d 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_004.phpt
+++ b/ext/session/tests/session_set_save_handler_class_004.phpt
@@ -36,7 +36,7 @@ session_unset();
 
 --EXPECTF--
 *** Testing session_set_save_handler() : default object ***
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(1) {
   ["foo"]=>

diff --git a/ext/session/tests/session_set_save_handler_class_005.phpt b/ext/session/tests/session_set_save_handler_class_005.phpt
index e491ba17f3313dce526d9e70fcadafec6601ce4e..a996eb8d2609b6913106702df1d8491120091879 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_005.phpt
+++ b/ext/session/tests/session_set_save_handler_class_005.phpt
@@ -44,7 +44,7 @@ session_unset();
 *** Testing session_set_save_handler() : incomplete implementation ***
 
 Warning: SessionHandler::read(): Parent session handler is not open in %ssession_set_save_handler_class_005.php on line %d
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(0) {
 }

diff --git a/ext/session/tests/session_set_save_handler_class_007.phpt b/ext/session/tests/session_set_save_handler_class_007.phpt
index 8d71ce44a8678aaf04876029fe8b33d20ab6a4a6..7344ae1ef30b2778f17ffb701df249c29866f235 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_007.phpt
+++ b/ext/session/tests/session_set_save_handler_class_007.phpt
@@ -63,12 +63,12 @@ ob_end_flush();
 --EXPECTF--
 *** Testing session_set_save_handler() : manual shutdown, reopen ***
 (#1) constructor called
-(#1) finish called %x
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) finish called %s
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 (#2) constructor called
 (#1) destructor called
 done
-(#2) writing %x = foo|s:3:"bar";
-(#2) closing %x
+(#2) writing %s = foo|s:3:"bar";
+(#2) closing %s
 (#2) destructor called

diff --git a/ext/session/tests/session_set_save_handler_class_008.phpt b/ext/session/tests/session_set_save_handler_class_008.phpt
index 799592045bd9995dee50ab470a495f3a2681be06..28cb692f0e17dcd101ca25ffec44fb9245836dbb 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_008.phpt
+++ b/ext/session/tests/session_set_save_handler_class_008.phpt
@@ -58,8 +58,8 @@ ob_end_flush();
 --EXPECTF--
 *** Testing session_set_save_handler() : manual shutdown ***
 (#1) constructor called
-(#1) finish called %x
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) finish called %s
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 done
 (#1) destructor called

diff --git a/ext/session/tests/session_set_save_handler_class_009.phpt b/ext/session/tests/session_set_save_handler_class_009.phpt
index 33787448c042d8aba5af4d2ff292de0ac3508cdb..a8b57dc541836ef2364cb425da150aab39f55738 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_009.phpt
+++ b/ext/session/tests/session_set_save_handler_class_009.phpt
@@ -57,6 +57,6 @@ ob_end_flush();
 *** Testing session_set_save_handler() : implicit shutdown ***
 (#1) constructor called
 done
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 (#1) destructor called

diff --git a/ext/session/tests/session_set_save_handler_class_010.phpt b/ext/session/tests/session_set_save_handler_class_010.phpt
index e60134ff75f3e29d748f829d84565e582c5db90c..02304f4974bce28eeca3c824476a3360e5131704 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_010.phpt
+++ b/ext/session/tests/session_set_save_handler_class_010.phpt
@@ -57,7 +57,7 @@ ob_end_flush();
 *** Testing session_set_save_handler() : manual shutdown function ***
 (#1) constructor called
 done
-(#1) finish called %x
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) finish called %s
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 (#1) destructor called

diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt
index f7f50d255f61db86ebe147ea79c4a9bb3ecfc947..706ef793ef7287cb2c6716cc67a23ab98a1424d9 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_012.phpt
+++ b/ext/session/tests/session_set_save_handler_class_012.phpt
@@ -44,10 +44,10 @@ var_dump(session_id(), $oldHandler, ini_get('session.save_handler'), $handler->i
 Open 
 
 Warning: SessionHandler::open() expects exactly 2 parameters, 0 given in %s on line %d
-Read %x
+Read %s
 
 Warning: SessionHandler::read(): Parent session handler is not open in %s on line %d
-string(32) "%x"
+string(%d) "%s"
 string(5) "files"
 string(4) "user"
 int(2)

diff --git a/ext/session/tests/session_set_save_handler_class_013.phpt b/ext/session/tests/session_set_save_handler_class_013.phpt
index f54aec46864c216e88040306a39448f7cb1f9791..f536aa72accc8feb79ed5da711763b8e4cca2ed4 100644 (file)
--- a/ext/session/tests/session_set_save_handler_class_013.phpt
+++ b/ext/session/tests/session_set_save_handler_class_013.phpt
@@ -45,8 +45,8 @@ var_dump(session_id(), $oldHandler, ini_get('session.save_handler'), $handler->i
 --EXPECTF--
 *** Testing session_set_save_handler() : incorrect arguments for existing handler close ***
 Open 
-Read %x
-string(32) "%x"
+Read %s
+string(%d) "%s"
 string(5) "files"
 string(4) "user"
 int(2)