kraghuba Tue Oct 9 11:51:49 2007 UTC Modified files: /php-src/ext/standard/tests/strings stripslashes_variation1.phpt sprintf_variation1.phpt strtr_variation5.phpt sprintf_variation2.phpt join_variation1.phpt addslashes_variation1.phpt strtr_variation9.phpt strrchr_variation9.phpt vsprintf_variation2.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/stripslashes_variation1.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/stripslashes_variation1.phpt diff -u php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.3 php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.4 --- php-src/ext/standard/tests/strings/stripslashes_variation1.phpt:1.3 Tue Oct 9 05:22:51 2007 +++ php-src/ext/standard/tests/strings/stripslashes_variation1.phpt Tue Oct 9 11:51:48 2007 @@ -162,7 +162,7 @@ -- 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 @@ -- Iteration 23 -- unicode(6) "obj'ct" -- Iteration 24 -- -unicode(14) "Resource id #%d" +unicode(%d) "Resource id #%d" -- Iteration 25 -- unicode(0) "" -- Iteration 26 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation1.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/sprintf_variation1.phpt diff -u php-src/ext/standard/tests/strings/sprintf_variation1.phpt:1.3 php-src/ext/standard/tests/strings/sprintf_variation1.phpt:1.4 --- php-src/ext/standard/tests/strings/sprintf_variation1.phpt:1.3 Tue Oct 9 05:22:51 2007 +++ php-src/ext/standard/tests/strings/sprintf_variation1.phpt Tue Oct 9 11:51:48 2007 @@ -264,9 +264,9 @@ 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) "" -- 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 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtr_variation5.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/strtr_variation5.phpt diff -u php-src/ext/standard/tests/strings/strtr_variation5.phpt:1.3 php-src/ext/standard/tests/strings/strtr_variation5.phpt:1.4 --- php-src/ext/standard/tests/strings/strtr_variation5.phpt:1.3 Tue Oct 9 05:22:51 2007 +++ php-src/ext/standard/tests/strings/strtr_variation5.phpt Tue Oct 9 11:51:48 2007 @@ -129,7 +129,7 @@ -- 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 @@ -- Iteration 16 -- unicode(13) "s02ple objec1" -- Iteration 17 -- -unicode(14) "Resource id #%d" +unicode(%d) "Resource id #%d" -- Iteration 18 -- unicode(0) "" -- Iteration 19 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/sprintf_variation2.phpt diff -u php-src/ext/standard/tests/strings/sprintf_variation2.phpt:1.2 php-src/ext/standard/tests/strings/sprintf_variation2.phpt:1.3 --- php-src/ext/standard/tests/strings/sprintf_variation2.phpt:1.2 Sat Sep 29 14:15:53 2007 +++ php-src/ext/standard/tests/strings/sprintf_variation2.phpt Tue Oct 9 11:51:48 2007 @@ -234,8 +234,8 @@ 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-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/join_variation1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/strings/join_variation1.phpt diff -u php-src/ext/standard/tests/strings/join_variation1.phpt:1.1 php-src/ext/standard/tests/strings/join_variation1.phpt:1.2 --- php-src/ext/standard/tests/strings/join_variation1.phpt:1.1 Sat Sep 29 09:08:24 2007 +++ php-src/ext/standard/tests/strings/join_variation1.phpt Tue Oct 9 11:51:48 2007 @@ -159,7 +159,7 @@ -- 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 @@ -- Iteration 23 -- unicode(16) "element1element2" -- Iteration 24 -- -unicode(30) "element1Resource id #%delement2" +unicode(%d) "element1Resource id #%delement2" -- Iteration 25 -- unicode(16) "element1element2" -- Iteration 26 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/addslashes_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/addslashes_variation1.phpt diff -u php-src/ext/standard/tests/strings/addslashes_variation1.phpt:1.2 php-src/ext/standard/tests/strings/addslashes_variation1.phpt:1.3 --- php-src/ext/standard/tests/strings/addslashes_variation1.phpt:1.2 Thu Sep 6 04:02:56 2007 +++ php-src/ext/standard/tests/strings/addslashes_variation1.phpt Tue Oct 9 11:51:48 2007 @@ -162,7 +162,7 @@ -- 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 @@ -- Iteration 23 -- unicode(7) "obj\'ct" -- Iteration 24 -- -unicode(14) "Resource id #%d" +unicode(%d) "Resource id #%d" -- Iteration 25 -- unicode(0) "" -- Iteration 26 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtr_variation9.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/strtr_variation9.phpt diff -u php-src/ext/standard/tests/strings/strtr_variation9.phpt:1.3 php-src/ext/standard/tests/strings/strtr_variation9.phpt:1.4 --- php-src/ext/standard/tests/strings/strtr_variation9.phpt:1.3 Tue Oct 9 05:22:51 2007 +++ php-src/ext/standard/tests/strings/strtr_variation9.phpt Tue Oct 9 11:51:48 2007 @@ -224,7 +224,7 @@ 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 @@ 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) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrchr_variation9.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/strrchr_variation9.phpt diff -u php-src/ext/standard/tests/strings/strrchr_variation9.phpt:1.2 php-src/ext/standard/tests/strings/strrchr_variation9.phpt:1.3 --- php-src/ext/standard/tests/strings/strrchr_variation9.phpt:1.2 Sat Sep 29 09:24:27 2007 +++ php-src/ext/standard/tests/strings/strrchr_variation9.phpt Tue Oct 9 11:51:48 2007 @@ -188,7 +188,7 @@ -- 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 @@ -- Iteration 23 -- bool(false) -- Iteration 24 -- -unicode(14) "Resource id #5" +unicode(%d) "Resource id #5" -- Iteration 25 -- bool(false) -- Iteration 26 -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_variation2.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.2 php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.3 --- php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.2 Fri Oct 5 18:12:35 2007 +++ php-src/ext/standard/tests/strings/vsprintf_variation2.phpt Tue Oct 9 11:51:48 2007 @@ -173,7 +173,7 @@ bool(false) -- Iteration 23 -- -string(14) "Resource id #%d" +string(%d) "Resource id #%d" Done --UEXPECTF--
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php