fix tests

diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt
index 01ef78176ec6204b68c1785692fc89a717a74840..a86f86d058784995919b2267d26527c8ed0c675c 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 --

diff --git a/ext/standard/tests/strings/chunk_split_variation1.phpt b/ext/standard/tests/strings/chunk_split_variation1.phpt
index 7c6af2d57d919e9b6c7eca9245d2ebbe01540452..58cb0515c33c25ea66e865fb7a1866dc64094538 100644 (file)
--- a/ext/standard/tests/strings/chunk_split_variation1.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation1.phpt
@@ -163,5 +163,5 @@ string(1) " "
 -- Iteration 27 --
 string(1) " "
 -- Iteration 28 --
-string(21) "Re so ur ce  i d  #%d "
+string(%d) "Re so ur ce  i d  #%d "
 Done

diff --git a/ext/standard/tests/strings/chunk_split_variation3.phpt b/ext/standard/tests/strings/chunk_split_variation3.phpt
index f6fd54520359d53bdd6459ad06d90037f69a839a..00dbbdeee46da6f91f2d71c3b54713d01bc6611c 100644 (file)
--- a/ext/standard/tests/strings/chunk_split_variation3.phpt
+++ b/ext/standard/tests/strings/chunk_split_variation3.phpt
@@ -154,5 +154,5 @@ string(22) "This is simple string."
 -- Iteration 25 --
 string(22) "This is simple string."
 -- Iteration 26 --
-string(106) "ThisResource id #%d is Resource id #%dsimpResource id #%dle sResource id #%dtrinResource id #%dg.Resource id #%d"
+string(%d) "ThisResource id #%d is Resource id #%dsimpResource id #%dle sResource id #%dtrinResource id #%dg.Resource id #%d"
 Done

diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt
index 850a198868710c48c0aee31d9b815b81e5d732b3..a42c543b52b162fe8bb3a92bd812a0798353662f 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 --

diff --git a/ext/standard/tests/strings/nl2br_variation5.phpt b/ext/standard/tests/strings/nl2br_variation5.phpt
index d27f04c67c94e94e4d194b1e1c56a13a77d792c8..066d642cdcb511a0fd50cd4de353ea51595da8fb 100644 (file)
--- a/ext/standard/tests/strings/nl2br_variation5.phpt
+++ b/ext/standard/tests/strings/nl2br_variation5.phpt
@@ -140,7 +140,7 @@ string(1) "1"
 -- Iteration 20 --
 string(0) ""
 -- Iteration 21 --
-string(14) "Resource id #%d"
+string(%d) "Resource id #%d"
 -- Iteration 22 --
 string(9) "My String"
 -- Iteration 23 --

diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt
index 7be0665fc5c89a181dae181e3c502e99e9b7fd80..a226bba7edbc8cdf751d1b9804ca406d186c6f5d 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation1.phpt
+++ b/ext/standard/tests/strings/sprintf_variation1.phpt
@@ -264,7 +264,7 @@ string(0) ""
 string(0) ""
 
 -- Iteration 26 --
-string(14) "Resource id #%d"
-string(14) "Resource id #%d"
-string(14) "Resource id #%d"
+string(%d) "Resource id #%d"
+string(%d) "Resource id #%d"
+string(%d) "Resource id #%d"
 Done

diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt
index cc3547ae6ef188e812a4900320af10d0907023c9..fcd3f212398e297c6fb53c00b830619d23506a36 100644 (file)
--- a/ext/standard/tests/strings/sprintf_variation2.phpt
+++ b/ext/standard/tests/strings/sprintf_variation2.phpt
@@ -214,6 +214,6 @@ 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

diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt
index 50fadf8fc14dbe4a7c3c5bbfcdbd12b77e11c0d0..4d58fd7a0543e60dfe317752a3380f6bdcd0e6d0 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 --

diff --git a/ext/standard/tests/strings/strrev_variation4.phpt b/ext/standard/tests/strings/strrev_variation4.phpt
index c9473e433d2ce174d993c70a54b5d9992b1273c7..bf4a7fad9fbb74a6b0ee025ce433ed6356fba083 100644 (file)
--- a/ext/standard/tests/strings/strrev_variation4.phpt
+++ b/ext/standard/tests/strings/strrev_variation4.phpt
@@ -170,7 +170,7 @@ string(0) ""
 string(6) "tcejbo"
 
 -- Iterator 24 --
-string(14) "%d# di ecruoseR"
+string(%d) "%d# di ecruoseR"
 
 -- Iterator 25 --
 string(0) ""

diff --git a/ext/standard/tests/strings/strtok_variation1.phpt b/ext/standard/tests/strings/strtok_variation1.phpt
index 5841d285803201d67a5c09d7c25a39b1c8941590..3c754c88a68c097700fdcb8787660d92efa41b61 100644 (file)
--- a/ext/standard/tests/strings/strtok_variation1.phpt
+++ b/ext/standard/tests/strings/strtok_variation1.phpt
@@ -168,5 +168,5 @@ bool(false)
 -- Iteration 25 --
 bool(false)
 -- Iteration 26 --
-string(14) "Resource id #%d"
+string(%d) "Resource id #%d"
 Done

diff --git a/ext/standard/tests/strings/strtr_variation5.phpt b/ext/standard/tests/strings/strtr_variation5.phpt
index 7b5245111777faa11b9178a9346d65484df1637c..7bd1704734a1dd207fd4ba7d0916562e98796805 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 #%d"
+string(%d) "Resource id #%d"
 -- Iteration 18 --
 string(0) ""
 -- Iteration 19 --

diff --git a/ext/standard/tests/strings/strtr_variation9.phpt b/ext/standard/tests/strings/strtr_variation9.phpt
index 1e2e1b941449c8538827d48e3215b3f425756b0f..0f5875c723ae0367bca90b3c3f05fbd8411eb95c 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 #%d"
+string(%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/ucwords_variation1.phpt b/ext/standard/tests/strings/ucwords_variation1.phpt
index 2aed2be0d154f1f325e965390bf2d1db0d5d1d8d..2a3ceeeb8002518caa2e2c1c3dd09b1de0af4a7a 100644 (file)
--- a/ext/standard/tests/strings/ucwords_variation1.phpt
+++ b/ext/standard/tests/strings/ucwords_variation1.phpt
@@ -195,5 +195,5 @@ string(0) ""
 -- Iteration 35 --
 string(0) ""
 -- Iteration 36 --
-string(14) "Resource Id #%d"
+string(%d) "Resource Id #%d"
 Done

diff --git a/ext/standard/tests/strings/vsprintf_variation2.phpt b/ext/standard/tests/strings/vsprintf_variation2.phpt
index 20a05dcd2b1989e860ea0996db2392ddaee94eed..fbc1e8634a4f2a95a075ab80a90689461b6d8ed1 100644 (file)
--- a/ext/standard/tests/strings/vsprintf_variation2.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation2.phpt
@@ -173,5 +173,5 @@ 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