zoe             Mon Feb 16 20:08:02 2009 UTC

  Modified files:              
    /php-src/ext/standard/tests/file    file_get_contents_variation5.phpt 
  Log:
  fix tests
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation5.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/file/file_get_contents_variation5.phpt
diff -u php-src/ext/standard/tests/file/file_get_contents_variation5.phpt:1.2 
php-src/ext/standard/tests/file/file_get_contents_variation5.phpt:1.3
--- php-src/ext/standard/tests/file/file_get_contents_variation5.phpt:1.2       
Wed Nov 26 17:48:41 2008
+++ php-src/ext/standard/tests/file/file_get_contents_variation5.phpt   Mon Feb 
16 20:08:02 2009
@@ -1,7 +1,5 @@
 --TEST--
 Test file_get_contents() function : usage variation 
---XFAIL--
-Pending completion of Unicode streams
 --CREDITS--
 Dave Kelsey <d_kel...@uk.ibm.com>
 --FILE--
@@ -124,31 +122,31 @@
 *** Testing file_get_contents() : usage variation ***
 
 --int 0--
-unicode(%d) "contents read"
+string(%d) "contents read"
 
 --int 1--
-unicode(%d) "ontents read"
+string(%d) "ontents read"
 
 --int 12345--
-unicode(%d) ""
+string(%d) ""
 
 --int -12345--
-unicode(%d) "contents read"
+string(%d) "contents read"
 
 --float 10.5--
-unicode(3) "ead"
+string(3) "ead"
 
 --float -10.5--
-unicode(%d) "contents read"
+string(%d) "contents read"
 
 --float 12.3456789000e10--
-unicode(%d) %s
+string(%d) %s
 
 --float -12.3456789000e10--
-unicode(%d) %s
+string(%d) %s
 
 --float .5--
-unicode(%d) "contents read"
+string(%d) "contents read"
 
 --empty array--
 Error: 2 - file_get_contents() expects parameter 4 to be long, array given, 
%s(%d)
@@ -167,45 +165,45 @@
 NULL
 
 --uppercase NULL--
-unicode(%d) "contents read"
+string(%d) "contents read"
 
 --lowercase null--
-unicode(%d) "contents read"
+string(%d) "contents read"
 
 --lowercase true--
-unicode(12) "ontents read"
+string(12) "ontents read"
 
 --lowercase false--
-unicode(%d) "contents read"
+string(%d) "contents read"
 
 --uppercase TRUE--
-unicode(12) "ontents read"
+string(12) "ontents read"
 
 --uppercase FALSE--
-unicode(%d) "contents read"
+string(%d) "contents read"
 
 --empty string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, Unicode string 
given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, string given, 
%s(%d)
 NULL
 
 --empty string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, Unicode string 
given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, string given, 
%s(%d)
 NULL
 
 --string DQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, Unicode string 
given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, string given, 
%s(%d)
 NULL
 
 --string SQ--
-Error: 2 - file_get_contents() expects parameter 4 to be long, Unicode string 
given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, string given, 
%s(%d)
 NULL
 
 --mixed case string--
-Error: 2 - file_get_contents() expects parameter 4 to be long, Unicode string 
given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, string given, 
%s(%d)
 NULL
 
 --heredoc--
-Error: 2 - file_get_contents() expects parameter 4 to be long, Unicode string 
given, %s(%d)
+Error: 2 - file_get_contents() expects parameter 4 to be long, string given, 
%s(%d)
 NULL
 
 --instance of classWithToString--
@@ -217,8 +215,8 @@
 NULL
 
 --undefined var--
-unicode(%d) "contents read"
+string(%d) "contents read"
 
 --unset var--
-unicode(%d) "contents read"
+string(%d) "contents read"
 ===DONE===



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to