Fix tests

11 files changed, 26 insertions, 26 deletions

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 667456cc1d..83e899a2bc 100644
--- 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 e907b2132c..9d5f732b53 100644
--- 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 858a2e2a6a..e9a3cc2feb 100644
--- 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 b9a5f4581f..103b13baa7 100644
--- 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 e491ba17f3..a996eb8d26 100644
--- 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 8d71ce44a8..7344ae1ef3 100644
--- 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 799592045b..28cb692f0e 100644
--- 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 33787448c0..a8b57dc541 100644
--- 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 e60134ff75..02304f4974 100644
--- 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 f7f50d255f..706ef793ef 100644
--- 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 f54aec4686..f536aa72ac 100644
--- 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)