From: Raghubansh Kumar Date: Tue, 9 Oct 2007 11:51:48 +0000 (+0000) Subject: fix tests X-Git-Tag: RELEASE_2_0_0a1~1624 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb27fe1933ac94bc492a2bd0e3b1d4c8d406a014;p=php fix tests --- diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt index 6ae915b297..0b25e3fb10 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 -- @@ -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 2d2eac20b0..b94517bff2 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 -- @@ -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 8fdf667558..8b4726f7cc 100644 --- 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 7b70234a3b..a351ba14ba 100644 --- 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 85a576b634..4e56dcde20 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 -- @@ -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 3adb99f9e6..5b9bf801f4 100644 --- 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 cb96aefc9c..6b7c8a376a 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 #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 fbfe1aee04..494f71907b 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 #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 70607cfb04..f81f0121a3 100644 --- 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--