From: Raghubansh Kumar Date: Tue, 9 Oct 2007 10:56:45 +0000 (+0000) Subject: fix tests X-Git-Tag: php-5.2.5RC1~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf428e90a55dbee3789925064aa61130a4fff37b;p=php fix tests --- diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt index 01ef78176e..a86f86d058 100644 --- 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 7c6af2d57d..58cb0515c3 100644 --- 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 f6fd545203..00dbbdeee4 100644 --- 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 850a198868..a42c543b52 100644 --- 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 d27f04c67c..066d642cdc 100644 --- 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 7be0665fc5..a226bba7ed 100644 --- 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 cc3547ae6e..fcd3f21239 100644 --- 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 50fadf8fc1..4d58fd7a05 100644 --- 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 c9473e433d..bf4a7fad9f 100644 --- 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 5841d28580..089d6f86bb 100644 --- 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(%s) "Resource id #%d" Done diff --git a/ext/standard/tests/strings/strtr_variation5.phpt b/ext/standard/tests/strings/strtr_variation5.phpt index 7b52451117..7bd1704734 100644 --- 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 1e2e1b9414..0f5875c723 100644 --- 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 2aed2be0d1..2a3ceeeb80 100644 --- 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 20a05dcd2b..fbc1e8634a 100644 --- 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