felipe          Fri Jun 13 00:18:57 2008 UTC

  Modified files:              
    /php-src/ext/filter/tests   007.phpt 011.phpt 036.phpt 039.phpt 
    /php-src/ext/gd/tests       image_type_to_mime_type_variation2.phpt 
    /php-src/ext/spl/tests      bug44615.phpt fastarray_004.phpt 
                                fastarray_009.phpt fastarray_015.phpt 
                                fileobject_004.phpt 
                                regexIterator_setMode_error.phpt 
    /php-src/ext/standard/tests/strings bug44703.phpt 
                                        htmlentities-utf.phpt 
                                        htmlentities01.phpt 
                                        htmlentities11.phpt 
                                        htmlentities12.phpt 
                                        htmlentities18.phpt substr.phpt 
  Log:
  - Fixed tests (unicode results, UEXPECT, line endings)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/007.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/filter/tests/007.phpt
diff -u php-src/ext/filter/tests/007.phpt:1.6 
php-src/ext/filter/tests/007.phpt:1.7
--- php-src/ext/filter/tests/007.phpt:1.6       Wed Apr 18 07:57:31 2007
+++ php-src/ext/filter/tests/007.phpt   Fri Jun 13 00:18:57 2008
@@ -50,7 +50,7 @@
 bool(false)
 bool(false)
 
-Warning: filter_has_var() expects parameter 1 to be long, string given in 
%s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be long, Unicode string given 
in %s007.php on line %d
 bool(false)
 
 Warning: filter_has_var() expects parameter 1 to be long, array given in 
%s007.php on line %d
@@ -59,6 +59,6 @@
 Warning: filter_has_var() expects parameter 1 to be long, array given in 
%s007.php on line %d
 bool(false)
 
-Warning: filter_has_var() expects parameter 1 to be long, string given in 
%s007.php on line %d
+Warning: filter_has_var() expects parameter 1 to be long, Unicode string given 
in %s007.php on line %d
 bool(false)
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/011.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/filter/tests/011.phpt
diff -u php-src/ext/filter/tests/011.phpt:1.8 
php-src/ext/filter/tests/011.phpt:1.9
--- php-src/ext/filter/tests/011.phpt:1.8       Thu Apr 26 23:42:35 2007
+++ php-src/ext/filter/tests/011.phpt   Fri Jun 13 00:18:57 2008
@@ -40,10 +40,10 @@
 string(29) "<p>string</p>"
 bool(false)
 
-Warning: filter_var() expects parameter 2 to be long, string given in 
%s011.php on line %d
+Warning: filter_var() expects parameter 2 to be long, Unicode string given in 
%s011.php on line %d
 NULL
 
-Warning: filter_input() expects parameter 3 to be long, string given in 
%s011.php on line %d
+Warning: filter_input() expects parameter 3 to be long, Unicode string given 
in %s011.php on line %d
 NULL
 
 Warning: filter_var() expects at most 3 parameters, 5 given in %s011.php on 
line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/036.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/filter/tests/036.phpt
diff -u php-src/ext/filter/tests/036.phpt:1.3 
php-src/ext/filter/tests/036.phpt:1.4
--- php-src/ext/filter/tests/036.phpt:1.3       Wed Oct  4 11:56:15 2006
+++ php-src/ext/filter/tests/036.phpt   Fri Jun 13 00:18:57 2008
@@ -24,16 +24,16 @@
 ?>
 --EXPECTF--    
 array(2) {
-  ["test1"]=>
+  [u"test1"]=>
   int(1)
-  ["test2"]=>
+  [u"test2"]=>
   int(1)
 }
 array(2) {
-  ["test1"]=>
+  [u"test1"]=>
   int(1)
-  ["test2"]=>
-  &string(1) "1"
+  [u"test2"]=>
+  &unicode(1) "1"
 }
-string(1) "1"
+unicode(1) "1"
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/039.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/filter/tests/039.phpt
diff -u php-src/ext/filter/tests/039.phpt:1.3 
php-src/ext/filter/tests/039.phpt:1.4
--- php-src/ext/filter/tests/039.phpt:1.3       Tue Dec  5 01:23:42 2006
+++ php-src/ext/filter/tests/039.phpt   Fri Jun 13 00:18:57 2008
@@ -58,9 +58,9 @@
 }
 array(2) {
   [0]=>
-  string(1) "1"
-  ["blah"]=>
-  string(4) "hoho"
+  unicode(1) "1"
+  [u"blah"]=>
+  unicode(4) "hoho"
 }
 bool(false)
 bool(false)
@@ -78,16 +78,16 @@
 array(0) {
 }
 array(1) {
-  ["var_name"]=>
+  [u"var_name"]=>
   NULL
 }
 array(1) {
-  ["var_name"]=>
+  [u"var_name"]=>
   NULL
 }
 array(1) {
-  ["var_name"]=>
-  string(0) ""
+  [u"var_name"]=>
+  unicode(0) ""
 }
 -- (5)
 
@@ -98,20 +98,20 @@
 bool(false)
 bool(false)
 array(1) {
-  [""]=>
-  string(0) ""
+  [u""]=>
+  unicode(0) ""
 }
 int(-1)
 bool(false)
 array(1) {
-  [""]=>
-  string(0) ""
+  [u""]=>
+  unicode(0) ""
 }
 int(100000)
 bool(false)
 array(1) {
-  [""]=>
-  string(0) ""
+  [u""]=>
+  unicode(0) ""
 }
-string(0) ""
+unicode(0) ""
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/image_type_to_mime_type_variation2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/gd/tests/image_type_to_mime_type_variation2.phpt
diff -u php-src/ext/gd/tests/image_type_to_mime_type_variation2.phpt:1.2 
php-src/ext/gd/tests/image_type_to_mime_type_variation2.phpt:1.3
--- php-src/ext/gd/tests/image_type_to_mime_type_variation2.phpt:1.2    Tue Jun 
10 18:31:37 2008
+++ php-src/ext/gd/tests/image_type_to_mime_type_variation2.phpt        Fri Jun 
13 00:18:57 2008
@@ -1,119 +1,80 @@
---TEST--
-Test image_type_to_mime_type() function : usage variations  - Pass decimal, 
octal, and hexadecimal values as imagetype
---FILE--
-<?php
-/* Prototype  : string image_type_to_mime_type(int imagetype)
- * Description: Get Mime-Type for image-type returned by getimagesize, 
exif_read_data, exif_thumbnail, exif_imagetype 
- * Source code: ext/standard/image.c
- */
-
-echo "*** Testing image_type_to_mime_type() : usage variations ***\n";
-
-error_reporting(E_ALL ^ E_NOTICE);
-$values =  array (
-  //Decimal values
-  0,
-  1,
-  12345,
-  -12345,
-  
-  //Octal values
-  02,
-  010,
-  030071,
-  -030071,
-  
-  //Hexadecimal values
-  0x0,
-  0x1,
-  0xABCD,
-  -0xABCD
-);
-
-// loop through each element of the array for imagetype
-$iterator = 1;
-foreach($values as $value) {
-      echo "\n-- Iteration $iterator --\n";
-      var_dump( image_type_to_mime_type($value) );
-      $iterator++;
-};
-?>
-===DONE===
---EXPECT--
-*** Testing image_type_to_mime_type() : usage variations ***
-
--- Iteration 1 --
-string(24) "application/octet-stream"
-
--- Iteration 2 --
-string(9) "image/gif"
-
--- Iteration 3 --
-string(24) "application/octet-stream"
-
--- Iteration 4 --
-string(24) "application/octet-stream"
-
--- Iteration 5 --
-string(10) "image/jpeg"
-
--- Iteration 6 --
-string(10) "image/tiff"
-
--- Iteration 7 --
-string(24) "application/octet-stream"
-
--- Iteration 8 --
-string(24) "application/octet-stream"
-
--- Iteration 9 --
-string(24) "application/octet-stream"
-
--- Iteration 10 --
-string(9) "image/gif"
-
--- Iteration 11 --
-string(24) "application/octet-stream"
-
--- Iteration 12 --
-string(24) "application/octet-stream"
-===DONE===
---UEXPECT--
-*** Testing image_type_to_mime_type() : usage variations ***
-
--- Iteration 1 --
-unicode(24) "application/octet-stream"
-
--- Iteration 2 --
-unicode(9) "image/gif"
-
--- Iteration 3 --
-unicode(24) "application/octet-stream"
-
--- Iteration 4 --
-unicode(24) "application/octet-stream"
-
--- Iteration 5 --
-unicode(10) "image/jpeg"
-
--- Iteration 6 --
-unicode(10) "image/tiff"
-
--- Iteration 7 --
-unicode(24) "application/octet-stream"
-
--- Iteration 8 --
-unicode(24) "application/octet-stream"
-
--- Iteration 9 --
-unicode(24) "application/octet-stream"
-
--- Iteration 10 --
-unicode(9) "image/gif"
-
--- Iteration 11 --
-unicode(24) "application/octet-stream"
-
--- Iteration 12 --
-unicode(24) "application/octet-stream"
-===DONE===
+--TEST--
+Test image_type_to_mime_type() function : usage variations  - Pass decimal, 
octal, and hexadecimal values as imagetype
+--FILE--
+<?php
+/* Prototype  : string image_type_to_mime_type(int imagetype)
+ * Description: Get Mime-Type for image-type returned by getimagesize, 
exif_read_data, exif_thumbnail, exif_imagetype 
+ * Source code: ext/standard/image.c
+ */
+
+echo "*** Testing image_type_to_mime_type() : usage variations ***\n";
+
+error_reporting(E_ALL ^ E_NOTICE);
+$values =  array (
+  //Decimal values
+  0,
+  1,
+  12345,
+  -12345,
+  
+  //Octal values
+  02,
+  010,
+  030071,
+  -030071,
+  
+  //Hexadecimal values
+  0x0,
+  0x1,
+  0xABCD,
+  -0xABCD
+);
+
+// loop through each element of the array for imagetype
+$iterator = 1;
+foreach($values as $value) {
+      echo "\n-- Iteration $iterator --\n";
+      var_dump( image_type_to_mime_type($value) );
+      $iterator++;
+};
+?>
+===DONE===
+--EXPECT--
+*** Testing image_type_to_mime_type() : usage variations ***
+
+-- Iteration 1 --
+unicode(24) "application/octet-stream"
+
+-- Iteration 2 --
+unicode(9) "image/gif"
+
+-- Iteration 3 --
+unicode(24) "application/octet-stream"
+
+-- Iteration 4 --
+unicode(24) "application/octet-stream"
+
+-- Iteration 5 --
+unicode(10) "image/jpeg"
+
+-- Iteration 6 --
+unicode(10) "image/tiff"
+
+-- Iteration 7 --
+unicode(24) "application/octet-stream"
+
+-- Iteration 8 --
+unicode(24) "application/octet-stream"
+
+-- Iteration 9 --
+unicode(24) "application/octet-stream"
+
+-- Iteration 10 --
+unicode(9) "image/gif"
+
+-- Iteration 11 --
+unicode(24) "application/octet-stream"
+
+-- Iteration 12 --
+unicode(24) "application/octet-stream"
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug44615.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/spl/tests/bug44615.phpt
diff -u php-src/ext/spl/tests/bug44615.phpt:1.1 
php-src/ext/spl/tests/bug44615.phpt:1.2
--- php-src/ext/spl/tests/bug44615.phpt:1.1     Thu Jun 12 20:51:25 2008
+++ php-src/ext/spl/tests/bug44615.phpt Fri Jun 13 00:18:57 2008
@@ -21,12 +21,12 @@
 }
 ?>
 --EXPECTF--
-string(1) "z"
+unicode(1) "z"
 object(stdClass)#1 (0) {
 }
-string(1) "q"
-string(1) "s"
+unicode(1) "q"
+unicode(1) "s"
 Second:
-string(1) "z"
-string(1) "q"
-string(1) "s"
+unicode(1) "z"
+unicode(1) "q"
+unicode(1) "s"
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fastarray_004.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/fastarray_004.phpt
diff -u php-src/ext/spl/tests/fastarray_004.phpt:1.2 
php-src/ext/spl/tests/fastarray_004.phpt:1.3
--- php-src/ext/spl/tests/fastarray_004.phpt:1.2        Sat Jun  7 14:10:21 2008
+++ php-src/ext/spl/tests/fastarray_004.phpt    Fri Jun 13 00:18:57 2008
@@ -14,3 +14,5 @@
 ?>
 ===DONE===
 --EXPECTF--
+unicode(29) "Index invalid or out of range"
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fastarray_009.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/spl/tests/fastarray_009.phpt
diff -u php-src/ext/spl/tests/fastarray_009.phpt:1.1 
php-src/ext/spl/tests/fastarray_009.phpt:1.2
--- php-src/ext/spl/tests/fastarray_009.phpt:1.1        Sat Jun  7 14:10:21 2008
+++ php-src/ext/spl/tests/fastarray_009.phpt    Fri Jun 13 00:18:57 2008
@@ -7,4 +7,4 @@
 
 ?>
 --EXPECTF--
-Warning: SplFastArray::__construct() expects parameter 1 to be long, string 
given in %s on line %d
+Warning: SplFastArray::__construct() expects parameter 1 to be long, Unicode 
string given in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fastarray_015.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/spl/tests/fastarray_015.phpt
diff -u php-src/ext/spl/tests/fastarray_015.phpt:1.1 
php-src/ext/spl/tests/fastarray_015.phpt:1.2
--- php-src/ext/spl/tests/fastarray_015.phpt:1.1        Sat Jun  7 21:35:53 2008
+++ php-src/ext/spl/tests/fastarray_015.phpt    Fri Jun 13 00:18:57 2008
@@ -40,7 +40,7 @@
 echo "Done\n";
 ?>
 --EXPECTF--    
-Warning: SplFastArray::__construct() expects parameter 1 to be long, string 
given in %s on line %d
+Warning: SplFastArray::__construct() expects parameter 1 to be long, Unicode 
string given in %s on line %d
 Index invalid or out of range
 Index invalid or out of range
 Index invalid or out of range
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fileobject_004.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/fileobject_004.phpt
diff -u php-src/ext/spl/tests/fileobject_004.phpt:1.2 
php-src/ext/spl/tests/fileobject_004.phpt:1.3
--- php-src/ext/spl/tests/fileobject_004.phpt:1.2       Sat May 24 14:12:00 2008
+++ php-src/ext/spl/tests/fileobject_004.phpt   Fri Jun 13 00:18:57 2008
@@ -16,7 +16,7 @@
 ?>
 ==DONE==
 --EXPECTF--
-string(%d) "%sspl%stests"
-string(19) "fileobject_004.phpt"
-string(%d) "%sspl%stests%sfileobject_004.phpt"
+unicode(%d) "%sspl%stests"
+unicode(19) "fileobject_004.phpt"
+unicode(%d) "%sspl%stests%sfileobject_004.phpt"
 ==DONE==
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/regexIterator_setMode_error.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/spl/tests/regexIterator_setMode_error.phpt
diff -u php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.3 
php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.4
--- php-src/ext/spl/tests/regexIterator_setMode_error.phpt:1.3  Sat May 24 
14:17:44 2008
+++ php-src/ext/spl/tests/regexIterator_setMode_error.phpt      Fri Jun 13 
00:18:57 2008
@@ -22,7 +22,7 @@
 ?>
 --EXPECTF--
 int(0)
-string(14) "Illegal mode 7"
+unicode(14) "Illegal mode 7"
 int(0)
 
-Warning: RegexIterator::setMode() expects parameter 1 to be long, string given 
in %s on line %d
+Warning: RegexIterator::setMode() expects parameter 1 to be long, Unicode 
string given in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug44703.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/bug44703.phpt
diff -u php-src/ext/standard/tests/strings/bug44703.phpt:1.3 
php-src/ext/standard/tests/strings/bug44703.phpt:1.4
--- php-src/ext/standard/tests/strings/bug44703.phpt:1.3        Tue May 27 
10:50:45 2008
+++ php-src/ext/standard/tests/strings/bug44703.phpt    Fri Jun 13 00:18:57 2008
@@ -23,24 +23,24 @@
 ?>
 --EXPECTF--
 Warning: htmlspecialchars(): charset `1' not supported, assuming iso-8859-1 in 
%s on line %d
-string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
+unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
 
 Warning: htmlspecialchars(): charset `12' not supported, assuming iso-8859-1 
in %s on line %d
-string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
+unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
 
 Warning: htmlspecialchars(): charset `125' not supported, assuming iso-8859-1 
in %s on line %d
-string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
-string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
+unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
+unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
 
 Warning: htmlspecialchars(): charset `12526' not supported, assuming 
iso-8859-1 in %s on line %d
-string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
-string(8) "&lt;&gt;"
+unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
+unicode(8) "&lt;&gt;"
 
 Warning: htmlspecialchars(): charset `8666' not supported, assuming iso-8859-1 
in %s on line %d
-string(8) "&lt;&gt;"
-string(8) "&lt;&gt;"
-string(8) "&lt;&gt;"
-string(8) "&lt;&gt;"
+unicode(8) "&lt;&gt;"
+unicode(8) "&lt;&gt;"
+unicode(8) "&lt;&gt;"
+unicode(8) "&lt;&gt;"
 
 Warning: htmlspecialchars(): charset 
`aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
 not supported, assuming iso-8859-1 in %s on line %d
-string(8) "&lt;&gt;"
+unicode(8) "&lt;&gt;"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities-utf.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities-utf.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities-utf.phpt:1.3 
php-src/ext/standard/tests/strings/htmlentities-utf.phpt:1.4
--- php-src/ext/standard/tests/strings/htmlentities-utf.phpt:1.3        Tue May 
27 10:50:45 2008
+++ php-src/ext/standard/tests/strings/htmlentities-utf.phpt    Fri Jun 13 
00:18:57 2008
@@ -14,21 +14,21 @@
 }
 ?>
 --EXPECT--
-string(8) "266c743b"
-string(8) "266c743b"
-string(0) ""
-string(0) ""
-string(4) "d090"
-string(4) "d090"
-string(0) ""
-string(0) ""
-string(8) "d090d0b0"
-string(8) "d090d0b0"
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-string(8) "2667743b"
-string(8) "2667743b"
+unicode(8) "266c743b"
+unicode(8) "266c743b"
+unicode(0) ""
+unicode(0) ""
+unicode(4) "d090"
+unicode(4) "d090"
+unicode(0) ""
+unicode(0) ""
+unicode(8) "d090d0b0"
+unicode(8) "d090d0b0"
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(0) ""
+unicode(8) "2667743b"
+unicode(8) "2667743b"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities01.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities01.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities01.phpt:1.2 
php-src/ext/standard/tests/strings/htmlentities01.phpt:1.3
--- php-src/ext/standard/tests/strings/htmlentities01.phpt:1.2  Sun Nov  3 
08:37:59 2002
+++ php-src/ext/standard/tests/strings/htmlentities01.phpt      Fri Jun 13 
00:18:57 2008
@@ -9,5 +9,5 @@
        var_dump(htmlentities("\x80\xa2\xa3\xa4\xa5", ENT_QUOTES, 'cp1252'));
 ?>
 --EXPECT--
-string(28) "&sbquo;&dagger;&trade;&Yuml;"
-string(32) "&euro;&cent;&pound;&curren;&yen;"
+unicode(28) "&sbquo;&dagger;&trade;&Yuml;"
+unicode(32) "&euro;&cent;&pound;&curren;&yen;"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities11.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities11.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities11.phpt:1.2 
php-src/ext/standard/tests/strings/htmlentities11.phpt:1.3
--- php-src/ext/standard/tests/strings/htmlentities11.phpt:1.2  Sat Oct 26 
16:09:50 2002
+++ php-src/ext/standard/tests/strings/htmlentities11.phpt      Fri Jun 13 
00:18:57 2008
@@ -11,4 +11,4 @@
 ?>
 --EXPECT--
 ISO-8859-15
-string(20) "&OElig;&oelig;&Yuml;"
+unicode(20) "&OElig;&oelig;&Yuml;"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities12.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities12.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities12.phpt:1.2 
php-src/ext/standard/tests/strings/htmlentities12.phpt:1.3
--- php-src/ext/standard/tests/strings/htmlentities12.phpt:1.2  Sat Oct 26 
16:09:50 2002
+++ php-src/ext/standard/tests/strings/htmlentities12.phpt      Fri Jun 13 
00:18:57 2008
@@ -11,4 +11,4 @@
 ?>
 --EXPECT--
 ISO-8859-1
-string(18) "&auml;&ouml;&uuml;"
+unicode(18) "&auml;&ouml;&uuml;"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities18.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities18.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities18.phpt:1.2 
php-src/ext/standard/tests/strings/htmlentities18.phpt:1.3
--- php-src/ext/standard/tests/strings/htmlentities18.phpt:1.2  Tue May 29 
20:11:23 2007
+++ php-src/ext/standard/tests/strings/htmlentities18.phpt      Fri Jun 13 
00:18:57 2008
@@ -20,21 +20,21 @@
 }
 ?>
 --EXPECT--
-string(3) "abc"
-string(3) "abc"
-string(13) "abc&amp;sfdsa"
-string(13) "abc&amp;sfdsa"
-string(33) "test&#043;s &amp; some more &#68;"
-string(33) "test&#043;s &amp; some more &#68;"
-string(24) "&; &amp;amp &amp;#a; &9;"
-string(24) "&; &amp;amp &amp;#a; &9;"
-string(32) "&amp;kffjadfdhsjfhjasdhffasdfas;"
-string(32) "&amp;kffjadfdhsjfhjasdhffasdfas;"
-string(16) "&amp;#8787978789"
-string(16) "&amp;#8787978789"
-string(5) "&amp;"
-string(5) "&amp;"
-string(15) "&amp;&amp;&amp;"
-string(15) "&amp;&amp;&amp;"
-string(17) "&amp;ab&amp;&amp;"
-string(17) "&amp;ab&amp;&amp;"
+unicode(3) "abc"
+unicode(3) "abc"
+unicode(13) "abc&amp;sfdsa"
+unicode(13) "abc&amp;sfdsa"
+unicode(33) "test&#043;s &amp; some more &#68;"
+unicode(33) "test&#043;s &amp; some more &#68;"
+unicode(24) "&; &amp;amp &amp;#a; &9;"
+unicode(24) "&; &amp;amp &amp;#a; &9;"
+unicode(32) "&amp;kffjadfdhsjfhjasdhffasdfas;"
+unicode(32) "&amp;kffjadfdhsjfhjasdhffasdfas;"
+unicode(16) "&amp;#8787978789"
+unicode(16) "&amp;#8787978789"
+unicode(5) "&amp;"
+unicode(5) "&amp;"
+unicode(15) "&amp;&amp;&amp;"
+unicode(15) "&amp;&amp;&amp;"
+unicode(17) "&amp;ab&amp;&amp;"
+unicode(17) "&amp;ab&amp;&amp;"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/substr.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/tests/strings/substr.phpt
diff -u php-src/ext/standard/tests/strings/substr.phpt:1.5 
php-src/ext/standard/tests/strings/substr.phpt:1.6
--- php-src/ext/standard/tests/strings/substr.phpt:1.5  Tue May 27 10:50:47 2008
+++ php-src/ext/standard/tests/strings/substr.phpt      Fri Jun 13 00:18:57 2008
@@ -223,6 +223,6 @@
 unicode(26) "ñtërnâtiônàlizætiøn"
 
 *** Start before the first char ***
-string(4) "abcd"
+unicode(4) "abcd"
 
 Done

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

Reply via email to