revert previous commit.

diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt
new file mode 100644 (file)
index 0000000..bcd1901
--- /dev/null
+++ b/ext/mbstring/tests/bug20087.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #20087 (Assertion failure)
+--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
+--FILE--
+<?php
+ini_set('include_path', dirname(__FILE__));
+include_once('common.inc');
+$testmoo = "blah blah";
+var_dump(mb_parse_str("testmoo"));
+var_dump($testmoo);
+var_dump(mb_parse_str("test=moo"));
+var_dump($test);
+?>
+--EXPECT--
+bool(true)
+string(0) ""
+bool(true)
+string(3) "moo"
+

diff --git a/ext/mbstring/tests/mb_parse_str.phpt b/ext/mbstring/tests/mb_parse_str.phpt
index f11b943c2628cfc90a5544be20eb86bf60236c59..03a8ccb10b3d706a89ec0b6ba5c0ccf463a74922 100644 (file)
--- a/ext/mbstring/tests/mb_parse_str.phpt
+++ b/ext/mbstring/tests/mb_parse_str.phpt
@@ -2,12 +2,14 @@
 mb_parse_str()
 --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
+--FAIL--
+register_globals calls killed the ability for mb_parse_str() to register into the global scope (obsolete in PHP 5.4)
 --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",
@@ -37,8 +39,9 @@ array(2) {
 }
 string(0) ""
 string(0) ""
-string(3) "abc"
-string(3) "def"
+ERR: Warning
+string(0) ""
+string(0) ""
 array(2) {
   ["+foo"]=>
   string(3) "def"
@@ -47,6 +50,7 @@ array(2) {
 }
 string(0) ""
 string(0) ""
+ERR: Warning
 string(0) ""
 string(0) ""
 array(2) {
@@ -67,15 +71,6 @@ array(2) {
 }
 string(0) ""
 string(0) ""
-array(3) {
-  [0]=>
-  string(3) "abc"
-  [1]=>
-  string(3) "def"
-  [2]=>
-  string(3) "ghi"
-}
-array(1) {
-  [0]=>
-  string(3) "jkl"
-}
+ERR: Warning
+string(0) ""
+string(0) ""

diff --git a/ext/mbstring/tests/mb_parse_str02.phpt b/ext/mbstring/tests/mb_parse_str02.phpt
index d9b5eb20d9380252194eb4ced30a16cd3a07846b..09dca578381ef02d36ff3172093561f951c1485e 100644 (file)
--- a/ext/mbstring/tests/mb_parse_str02.phpt
+++ b/ext/mbstring/tests/mb_parse_str02.phpt
@@ -3,11 +3,13 @@ mb_parse_str() test 2
 --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
+register_globals calls killed the ability for mb_parse_str() to register into the global scope (obsolete in PHP 5.4)
 --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",