From: Gustavo André dos Santos Lopes Date: Mon, 15 Nov 2010 01:57:16 +0000 (+0000) Subject: - Altered htmlentities19.phpt (now htmlentities24.phpt) to reflect new default encoding X-Git-Tag: php-5.4.0alpha1~191^2~673 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24636a7e1c54015d916fff82b2c55074f74238fc;p=php - Altered htmlentities19.phpt (now htmlentities24.phpt) to reflect new default encoding being UTF-8. - Moved ext/standard/tests/file/htmlentities19.phpt and htmlspecialchars.phpt to the proper directory (tests/strings instead of tests/file). htmlentities19.phpt had to be renamed in order not to clash with an existing file. --- diff --git a/ext/standard/tests/file/htmlentities19.phpt b/ext/standard/tests/strings/htmlentities24.phpt similarity index 98% rename from ext/standard/tests/file/htmlentities19.phpt rename to ext/standard/tests/strings/htmlentities24.phpt index c858ccb7d4..3ffdd65a5f 100644 --- a/ext/standard/tests/file/htmlentities19.phpt +++ b/ext/standard/tests/strings/htmlentities24.phpt @@ -14,9 +14,9 @@ for($i=0; $i<256; $i++) /* giving arguments as NULL */ echo "\n*** Testing htmlentities() with NULL as first,second and third argument ***\n"; var_dump( htmlentities("\x82\x86\x99\x9f\x80\x82\x81", NULL, 'cp1252') ); -var_dump( htmlentities("\x82\x86\x99\x9f\x80\x82\x81", ENT_QUOTES, NULL) ); -var_dump( htmlentities("\x82\x86\x99\x9f\x80\x82\x81", ENT_NOQUOTES, NULL) ); -var_dump( htmlentities("\x82\x86\x99\x9f\x80\x82\x81", ENT_COMPAT, NULL) ); +var_dump( htmlentities("\x82\x86\x99\x9f\x80\x82\x81", ENT_QUOTES, NULL) ); /* UTF-8 assumed */ +var_dump( htmlentities("\x82\x86\x99\x9f\x80\x82\x81", ENT_NOQUOTES, NULL) ); /* UTF-8 assumed */ +var_dump( htmlentities("\x82\x86\x99\x9f\x80\x82\x81", ENT_COMPAT, NULL) ); /* UTF-8 assumed */ var_dump( htmlentities(NULL, NULL, NULL) ); /* giving long string to check for proper memory re-allocation */ @@ -305,9 +305,9 @@ string(16) "6368722832353529" *** Testing htmlentities() with NULL as first,second and third argument *** string(42) "‚†™Ÿ€‚" -string(7) "‚†™Ÿ€‚" -string(7) "‚†™Ÿ€‚" -string(7) "‚†™Ÿ€‚" +string(0) "" +string(0) "" +string(0) "" string(0) "" *** Checking for proper memory allocation with long string *** diff --git a/ext/standard/tests/file/htmlspecialchars.phpt b/ext/standard/tests/strings/htmlspecialchars.phpt similarity index 100% rename from ext/standard/tests/file/htmlspecialchars.phpt rename to ext/standard/tests/strings/htmlspecialchars.phpt