fix tests

diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt
index 6ae915b2979e4af479c22f79662f1af8d23ead62..0b25e3fb10e22ea4c11b6495d31e904044f8db9b 100644 (file)
--- a/ext/standard/tests/strings/addslashes_variation1.phpt
+++ b/ext/standard/tests/strings/addslashes_variation1.phpt
@@ -162,7 +162,7 @@ string(0) ""
 -- Iteration 23 --
 string(7) "obj\'ct"
 -- Iteration 24 --
-string(14) "Resource id #%d"
+string(%d) "Resource id #%d"
 -- Iteration 25 --
 string(0) ""
 -- Iteration 26 --
@@ -234,7 +234,7 @@ unicode(0) ""
 -- Iteration 23 --
 unicode(7) "obj\'ct"
 -- Iteration 24 --
-unicode(14) "Resource id #%d"
+unicode(%d) "Resource id #%d"
 -- Iteration 25 --
 unicode(0) ""
 -- Iteration 26 --

diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt
index 2d2eac20b0246abc5cd25623cc2cfb437ae1da18..b94517bff2a7bfb4bec8b9c5f9ebb47496f93d66 100644 (file)
--- a/ext/standard/tests/strings/join_variation1.phpt
+++ b/ext/standard/tests/strings/join_variation1.phpt
@@ -159,7 +159,7 @@ string(16) "element1element2"
 -- Iteration 23 --
 string(16) "element1element2"
 -- Iteration 24 --
-string(30) "element1Resource id #%delement2"
+string(%d) "element1Resource id #%delement2"
 -- Iteration 25 --
 string(16) "element1element2"
 -- Iteration 26 --
@@ -226,7 +226,7 @@ unicode(16) "element1element2"
 -- Iteration 23 --
 unicode(16) "element1element2"
 -- Iteration 24 --
-unicode(30) "element1Resource id #%delement2"
+unicode(%d) "element1Resource id #%delement2"
 -- Iteration 25 --
 unicode(16) "element1element2"
 -- Iteration 26 --

diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt
index 8fdf667558daf2b5dc695326739661f03ffd98ba..8b4726f7cc9ef4fc23e2f2ba4e2209f1649c5cf5 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation1.phpt
+++ b/ext/standard/tests/strings/sprintf_variation1.phpt
@@ -264,9 +264,9 @@ string(0) ""
 string(0) ""
 
 -- Iteration 26 --
-string(14) "Resource id #5"
-string(14) "Resource id #5"
-string(14) "Resource id #5"
+string(%d) "Resource id #5"
+string(%d) "Resource id #5"
+string(%d) "Resource id #5"
 Done
 
 --UEXPECTF--
@@ -429,7 +429,7 @@ unicode(0) ""
 unicode(0) ""
 
 -- Iteration 26 --
-unicode(14) "Resource id #%d"
-unicode(14) "Resource id #%d"
-unicode(14) "Resource id #%d"
+unicode(%d) "Resource id #%d"
+unicode(%d) "Resource id #%d"
+unicode(%d) "Resource id #%d"
 Done

diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt
index 7b70234a3b6a72e92830c28e9fe3b51cec0e03a7..a351ba14ba0e6860d7969dd1b9b26ac7e215ef73 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation2.phpt
+++ b/ext/standard/tests/strings/sprintf_variation2.phpt
@@ -234,8 +234,8 @@ string(0) ""
 string(0) ""
 
 -- Iteration 28 --
-string(14) "Resource id #%d"
-string(14) "Resource id #%d"
+string(%d) "Resource id #%d"
+string(%d) "Resource id #%d"
 Done
 
 --UEXPECTF--

diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt
index 85a576b634ba0b705a6e884488b5e4ed0f265d3b..4e56dcde2048f59ead1f6b36c003df79237db50f 100644 (file)
--- a/ext/standard/tests/strings/stripslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripslashes_variation1.phpt
@@ -162,7 +162,7 @@ string(0) ""
 -- Iteration 23 --
 string(6) "obj'ct"
 -- Iteration 24 --
-string(14) "Resource id #%d"
+string(%d) "Resource id #%d"
 -- Iteration 25 --
 string(0) ""
 -- Iteration 26 --
@@ -234,7 +234,7 @@ unicode(0) ""
 -- Iteration 23 --
 unicode(6) "obj'ct"
 -- Iteration 24 --
-unicode(14) "Resource id #%d"
+unicode(%d) "Resource id #%d"
 -- Iteration 25 --
 unicode(0) ""
 -- Iteration 26 --

diff --git a/ext/standard/tests/strings/strrchr_variation9.phpt b/ext/standard/tests/strings/strrchr_variation9.phpt
index 3adb99f9e6995749da8137fb9aea82679c1b386f..5b9bf801f42ad9dbb09829a168e03d30fca08d2f 100644 (file)
--- a/ext/standard/tests/strings/strrchr_variation9.phpt
+++ b/ext/standard/tests/strings/strrchr_variation9.phpt
@@ -188,7 +188,7 @@ bool(false)
 -- Iteration 23 --
 bool(false)
 -- Iteration 24 --
-string(14) "Resource id #5"
+string(%d) "Resource id #5"
 -- Iteration 25 --
 bool(false)
 -- Iteration 26 --
@@ -253,7 +253,7 @@ bool(false)
 -- Iteration 23 --
 bool(false)
 -- Iteration 24 --
-unicode(14) "Resource id #5"
+unicode(%d) "Resource id #5"
 -- Iteration 25 --
 bool(false)
 -- Iteration 26 --

diff --git a/ext/standard/tests/strings/strtr_variation5.phpt b/ext/standard/tests/strings/strtr_variation5.phpt
index cb96aefc9cd3631b0696a41816bb83301cef1f6c..6b7c8a376aa7913137f187aa077ef26da31affaa 100644 (file)
--- a/ext/standard/tests/strings/strtr_variation5.phpt
+++ b/ext/standard/tests/strings/strtr_variation5.phpt
@@ -129,7 +129,7 @@ string(0) ""
 -- Iteration 16 --
 string(13) "s02ple objec1"
 -- Iteration 17 --
-string(14) "Resource id #5"
+string(%d) "Resource id #5"
 -- Iteration 18 --
 string(0) ""
 -- Iteration 19 --
@@ -176,7 +176,7 @@ unicode(0) ""
 -- Iteration 16 --
 unicode(13) "s02ple objec1"
 -- Iteration 17 --
-unicode(14) "Resource id #%d"
+unicode(%d) "Resource id #%d"
 -- Iteration 18 --
 unicode(0) ""
 -- Iteration 19 --

diff --git a/ext/standard/tests/strings/strtr_variation9.phpt b/ext/standard/tests/strings/strtr_variation9.phpt
index fbfe1aee040468e1a52b66f09acff3bf546f56a1..494f71907b20bab59f6a18dac5a705bc53d92300 100644 (file)
--- a/ext/standard/tests/strings/strtr_variation9.phpt
+++ b/ext/standard/tests/strings/strtr_variation9.phpt
@@ -224,7 +224,7 @@ Warning: strtr(): The second argument is not an array in %s on line %d
 bool(false)
 
 -- Iteration 19 --
-string(14) "Resource id #5"
+string(%d) "Resource id #5"
 
 Warning: strtr(): The second argument is not an array in %s on line %d
 bool(false)
@@ -383,7 +383,7 @@ Warning: strtr(): The second argument is not an array in %s on line %d
 bool(false)
 
 -- Iteration 19 --
-unicode(14) "Resource id #%d"
+unicode(%d) "Resource id #%d"
 
 Warning: strtr(): The second argument is not an array in %s on line %d
 bool(false)

diff --git a/ext/standard/tests/strings/vsprintf_variation2.phpt b/ext/standard/tests/strings/vsprintf_variation2.phpt
index 70607cfb04a9ba94506026282072a4ba7ee72d20..f81f0121a34a66af615f6b5649f04d6782b57310 100644 (file)
--- a/ext/standard/tests/strings/vsprintf_variation2.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation2.phpt
@@ -173,7 +173,7 @@ Warning: vsprintf(): Too few arguments in %s on line %d
 bool(false)
 
 -- Iteration 23 --
-string(14) "Resource id #%d"
+string(%d) "Resource id #%d"
 Done
 
 --UEXPECTF--