hirokawa Sun, 11 Sep 2011 03:55:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316486
Log:
revert previous commit.
Changed paths:
A php/php-src/branches/PHP_5_4/ext/mbstring/tests/bug20087.phpt
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
Added: php/php-src/branches/PHP_5_4/ext/mbstring/tests/bug20087.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mbstring/tests/bug20087.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/tests/bug20087.phpt
2011-09-11 03:55:08 UTC (rev 316486)
@@ -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"
+
Property changes on:
php/php-src/branches/PHP_5_4/ext/mbstring/tests/bug20087.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
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 02:41:00 UTC (rev 316485)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str.phpt
2011-09-11 03:55:08 UTC (rev 316486)
@@ -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 @@
}
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 @@
}
string(0) ""
string(0) ""
+ERR: Warning
string(0) ""
string(0) ""
array(2) {
@@ -67,15 +71,6 @@
}
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) ""
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 02:41:00 UTC (rev 316485)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/tests/mb_parse_str02.phpt
2011-09-11 03:55:08 UTC (rev 316486)
@@ -3,11 +3,13 @@
--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",
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
