hirokawa                                 Sun, 11 Sep 2011 03:56:16 +0000

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

Log:
revert previous commit.

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str.phpt
    U   php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str02.phpt

Modified: php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str.phpt   
2011-09-11 03:55:08 UTC (rev 316486)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str.phpt   
2011-09-11 03:56:16 UTC (rev 316487)
@@ -2,14 +2,12 @@
 mb_parse_str()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FAIL--
-register_globals calls killed the ability for mb_parse_str() to register into 
the global scope (obsolete in PHP 5.4)
+--XFAIL--
+register_globals calls killed the ability for mb_parse_str() to register into 
the global scope
 --INI--
 arg_separator.input=&
 --FILE--
 <?php
-ini_set('include_path', dirname(__FILE__));
-include_once('common.inc');
 $queries = array(
        "foo=abc&bar=def",
        "%2bfoo=def&-bar=jkl",
@@ -39,9 +37,8 @@
 }
 string(0) ""
 string(0) ""
-ERR: Warning
-string(0) ""
-string(0) ""
+string(3) "abc"
+string(3) "def"
 array(2) {
   ["+foo"]=>
   string(3) "def"
@@ -50,7 +47,6 @@
 }
 string(0) ""
 string(0) ""
-ERR: Warning
 string(0) ""
 string(0) ""
 array(2) {
@@ -71,6 +67,15 @@
 }
 string(0) ""
 string(0) ""
-ERR: Warning
-string(0) ""
-string(0) ""
+array(3) {
+  [0]=>
+  string(3) "abc"
+  [1]=>
+  string(3) "def"
+  [2]=>
+  string(3) "ghi"
+}
+array(1) {
+  [0]=>
+  string(3) "jkl"
+}

Modified: php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str02.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str02.phpt 
2011-09-11 03:55:08 UTC (rev 316486)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str02.phpt 
2011-09-11 03:56:16 UTC (rev 316487)
@@ -3,13 +3,11 @@
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --XFAIL--
-register_globals calls killed the ability for mb_parse_str() to register into 
the global scope (obsolete in PHP 5.4)
+register_globals calls killed the ability for mb_parse_str() to register into 
the global scope
 --INI--
 arg_separator.input=&#
 --FILE--
 <?php
-ini_set('include_path', dirname(__FILE__));
-include_once('common.inc');
 $queries = array(
        "foo=abc#bar=def&fubar=ghi",
        "%2bfoo=def&-bar=jkl#+fubar",

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

Reply via email to