cvs: php-src /ext/standard/tests/array array_merge_recursive_variation5.phpt
| From: | Antony Dovgal | Date: | Wed, 23 Jan 2008 11:38:31 +0000 |
| Subject: | cvs: php-src /ext/standard/tests/array array_merge_recursive_variation5.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-47953@lists.php.net to get a copy of this message | ||
tony2001 Wed Jan 23 11:38:31 2008 UTC
Modified files:
/php-src/ext/standard/tests/array
array_merge_recursive_variation5.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_merge_recursive_variation5.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_merge_recursive_variation5.phpt
diff -u php-src/ext/standard/tests/array/array_merge_recursive_variation5.phpt:1.1
php-src/ext/standard/tests/array/array_merge_recursive_variation5.phpt:1.2
--- php-src/ext/standard/tests/array/array_merge_recursive_variation5.phpt:1.1 Tue Dec 11 09:04:49
2007
+++ php-src/ext/standard/tests/array/array_merge_recursive_variation5.phpt Wed Jan 23 11:38:31 2008
@@ -374,8 +374,10 @@
object(classA)#%d (0) {
}
["string"]=>
- array(1) {
+ array(2) {
[0]=>
+ NULL
+ [1]=>
string(5) "hello"
}
["resource"]=>
@@ -698,8 +700,10 @@
object(classA)#%d (0) {
}
[u"string"]=>
- array(1) {
+ array(2) {
[0]=>
+ NULL
+ [1]=>
unicode(5) "hello"
}
[u"resource"]=>