hirokawa                                 Sat, 14 Jan 2012 09:07:10 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=322265

Log:
fixed failed tests (backport from PHP_5_4/trunk).

Changed paths:
    U   
php/php-src/branches/PHP_5_3/Zend/tests/multibyte/multibyte_encoding_003.phpt
    U   php/php-src/branches/PHP_5_3/ext/mbstring/tests/mb_ereg_search_pos.phpt
    U   php/php-src/branches/PHP_5_3/ext/mbstring/tests/zend_multibyte-10.phpt
    U   php/php-src/branches/PHP_5_3/ext/mbstring/tests/zend_multibyte-11.phpt

Modified: 
php/php-src/branches/PHP_5_3/Zend/tests/multibyte/multibyte_encoding_003.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_3/Zend/tests/multibyte/multibyte_encoding_003.phpt   
    2012-01-14 07:46:02 UTC (rev 322264)
+++ 
php/php-src/branches/PHP_5_3/Zend/tests/multibyte/multibyte_encoding_003.phpt   
    2012-01-14 09:07:10 UTC (rev 322265)
@@ -18,5 +18,5 @@
 
 
 --EXPECT--
-H
-
\ No newline at end of file
+Hello World
+===DONE===

Modified: 
php/php-src/branches/PHP_5_3/ext/mbstring/tests/mb_ereg_search_pos.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mbstring/tests/mb_ereg_search_pos.phpt     
2012-01-14 07:46:02 UTC (rev 322264)
+++ php/php-src/branches/PHP_5_3/ext/mbstring/tests/mb_ereg_search_pos.phpt     
2012-01-14 09:07:10 UTC (rev 322265)
@@ -6,7 +6,7 @@
 ?>
 --FILE--
 <?php
-
+mb_regex_encoding('iso-8859-1');
 $test_str = 'I�t�rn�ti�n�liz�ti�n';

 if(mb_ereg_search_init($test_str))

Modified: php/php-src/branches/PHP_5_3/ext/mbstring/tests/zend_multibyte-10.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mbstring/tests/zend_multibyte-10.phpt      
2012-01-14 07:46:02 UTC (rev 322264)
+++ php/php-src/branches/PHP_5_3/ext/mbstring/tests/zend_multibyte-10.phpt      
2012-01-14 09:07:10 UTC (rev 322265)
@@ -11,6 +11,8 @@
 <?php
 declare(encoding="ISO-8859-15");
 declare(encoding="ISO-8859-1");
+echo "ok\n";
 ?>
 --EXPECTF--
-Fatal error: Encoding declaration pragma must be the very first statement in 
the script in %s on line 3
+ok
+

Modified: php/php-src/branches/PHP_5_3/ext/mbstring/tests/zend_multibyte-11.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mbstring/tests/zend_multibyte-11.phpt      
2012-01-14 07:46:02 UTC (rev 322264)
+++ php/php-src/branches/PHP_5_3/ext/mbstring/tests/zend_multibyte-11.phpt      
2012-01-14 09:07:10 UTC (rev 322265)
@@ -11,7 +11,8 @@
 <?php
 declare(encoding="ISO-8859-15") {
        declare(encoding="ISO-8859-1");
+       echo "ok\n";
 }
 ?>
 --EXPECTF--
-Fatal error: Encoding declaration pragma must be the very first statement in 
the script in %s on line 3
+ok

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

Reply via email to