cvs: ZendEngine2 /tests unicode_001.phpt php-src/ext/pcre/tests bug42298.phpt bug47229.phpt

lbarnaud		Fri Apr 24 15:52:38 2009 UTC

  Modified files:              
    /php-src/ext/pcre/tests	bug47229.phpt bug42298.phpt 
    /ZendEngine2/tests	unicode_001.phpt 
  Log:
  Fix tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug47229.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pcre/tests/bug47229.phpt
diff -u php-src/ext/pcre/tests/bug47229.phpt:1.2 php-src/ext/pcre/tests/bug47229.phpt:1.3
--- php-src/ext/pcre/tests/bug47229.phpt:1.2	Wed Jan 28 22:40:35 2009
+++ php-src/ext/pcre/tests/bug47229.phpt	Fri Apr 24 15:52:38 2009
@@ -19,19 +19,19 @@
 var_dump($m);
 
 ?>
---EXPECT--
-string(13) "\-oh really\?"
+--EXPECTF--
+%string|unicode%(13) "\-oh really\?"
 array(1) {
   [0]=>
-  string(4) "a---"
+  %string|unicode%(4) "a---"
 }
 array(1) {
   [0]=>
-  string(1) "a"
+  %string|unicode%(1) "a"
 }
 array(1) {
   [0]=>
-  string(5) "a----"
+  %string|unicode%(5) "a----"
 }
 array(0) {
 }
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug42298.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/pcre/tests/bug42298.phpt
diff -u php-src/ext/pcre/tests/bug42298.phpt:1.4 php-src/ext/pcre/tests/bug42298.phpt:1.5
--- php-src/ext/pcre/tests/bug42298.phpt:1.4	Tue May 27 13:54:30 2008
+++ php-src/ext/pcre/tests/bug42298.phpt	Fri Apr 24 15:52:38 2009
@@ -1,12 +1,15 @@
 --TEST--
 Bug #42298 (pcre gives bogus results with /u)
+--INI--
+unicode.runtime_encoding=utf-8
+unicode.output_encoding=utf-8
 --FILE--
 <?php
-$str = "A\xc2\xa3BC";
+$str = b"A\xc2\xa3BC";
 preg_match_all('/\S\S/u', $str, $m);	var_dump($m);
 preg_match_all('/\S{2}/u', $str, $m);	var_dump($m);
 
-$str = "A\xe2\x82\xac ";
+$str = b"A\xe2\x82\xac ";
 preg_match_all('/\W\W/u', $str, $m);	var_dump($m);
 preg_match_all('/\W{2}/u', $str, $m);	var_dump($m);
 
@@ -16,7 +19,7 @@
   [0]=>
   array(2) {
     [0]=>
-    unicode(3) "A£"
+    unicode(2) "A£"
     [1]=>
     unicode(2) "BC"
   }
@@ -25,7 +28,7 @@
   [0]=>
   array(2) {
     [0]=>
-    unicode(3) "A£"
+    unicode(2) "A£"
     [1]=>
     unicode(2) "BC"
   }
@@ -34,13 +37,13 @@
   [0]=>
   array(1) {
     [0]=>
-    unicode(4) "€ "
+    unicode(2) "€ "
   }
 }
 array(1) {
   [0]=>
   array(1) {
     [0]=>
-    unicode(4) "€ "
+    unicode(2) "€ "
   }
 }
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/unicode_001.phpt?r1=1.2&r2=1.3&diff_format=u
Index: ZendEngine2/tests/unicode_001.phpt
diff -u ZendEngine2/tests/unicode_001.phpt:1.2 ZendEngine2/tests/unicode_001.phpt:1.3
--- ZendEngine2/tests/unicode_001.phpt:1.2	Mon May 26 14:33:44 2008
+++ ZendEngine2/tests/unicode_001.phpt	Fri Apr 24 15:52:38 2009
@@ -1,5 +1,7 @@
 --TEST--
 Comparing size of binary and unicode strings
+--INI--
+unicode.runtime_encoding=utf-8
 --FILE--
 <?php