- 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 c858ccb7d4139344214c7975ba7047599b5b14a8..3ffdd65a5ffb2cf6ec734f125358ea64e7191f57 100644 (file)
--- 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) "&sbquo;&dagger;&trade;&Yuml;&euro;&sbquo;\81"
-string(7) "\82\86\99\9f\80\82\81"
-string(7) "\82\86\99\9f\80\82\81"
-string(7) "\82\86\99\9f\80\82\81"
+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