diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2011-09-11 03:56:16 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2011-09-11 03:56:16 +0000 |
| commit | b870f233961c742cf72efd74df99ea258abb3026 (patch) | |
| tree | 374a41aab3a7e0a80a8510dfe26a2b8ae1fd3052 /ext/mbstring/tests | |
| parent | 1dd6fd0d4ff585c9e2d3bb261cca122bd25c3f7a (diff) | |
| download | php-git-b870f233961c742cf72efd74df99ea258abb3026.tar.gz | |
revert previous commit.
Diffstat (limited to 'ext/mbstring/tests')
| -rw-r--r-- | ext/mbstring/tests/mb_parse_str.phpt | 27 | ||||
| -rw-r--r-- | ext/mbstring/tests/mb_parse_str02.phpt | 4 |
2 files changed, 17 insertions, 14 deletions
diff --git a/ext/mbstring/tests/mb_parse_str.phpt b/ext/mbstring/tests/mb_parse_str.phpt index 03a8ccb10b..f11b943c26 100644 --- a/ext/mbstring/tests/mb_parse_str.phpt +++ b/ext/mbstring/tests/mb_parse_str.phpt @@ -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 @@ array(2) { } 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 @@ array(2) { } string(0) "" string(0) "" -ERR: Warning string(0) "" string(0) "" array(2) { @@ -71,6 +67,15 @@ array(2) { } 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" +} diff --git a/ext/mbstring/tests/mb_parse_str02.phpt b/ext/mbstring/tests/mb_parse_str02.phpt index 09dca57838..d9b5eb20d9 100644 --- a/ext/mbstring/tests/mb_parse_str02.phpt +++ b/ext/mbstring/tests/mb_parse_str02.phpt @@ -3,13 +3,11 @@ 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 (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", |