colder Tue May 6 23:08:07 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl spl_array.c
/php-src/ext/spl/tests bug38618.phpt
Log:
Add consistency with the flag
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.13&r2=1.71.2.17.2.13.2.14&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.13
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.14
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.13 Mon Feb 4 16:48:06 2008
+++ php-src/ext/spl/spl_array.c Tue May 6 23:08:06 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.13 2008/02/04 16:48:06 helly Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.14 2008/05/06 23:08:06 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -947,9 +947,6 @@
if (Z_TYPE_PP(array) == IS_ARRAY) {
SEPARATE_ZVAL_IF_NOT_REF(array);
- if (ZEND_NUM_ARGS() < 2) {
- ar_flags |= SPL_ARRAY_CHILD_ARRAYS_ONLY;
- }
}
if (ZEND_NUM_ARGS() > 2) {
@@ -1737,11 +1734,12 @@
REGISTER_SPL_CLASS_CONST_LONG(ArrayObject, "STD_PROP_LIST",
SPL_ARRAY_STD_PROP_LIST);
REGISTER_SPL_CLASS_CONST_LONG(ArrayObject, "ARRAY_AS_PROPS",
SPL_ARRAY_ARRAY_AS_PROPS);
- REGISTER_SPL_CLASS_CONST_LONG(ArrayObject,
"CHILD_ARRAYS_ONLY",SPL_ARRAY_CHILD_ARRAYS_ONLY);
REGISTER_SPL_CLASS_CONST_LONG(ArrayIterator, "STD_PROP_LIST",
SPL_ARRAY_STD_PROP_LIST);
REGISTER_SPL_CLASS_CONST_LONG(ArrayIterator, "ARRAY_AS_PROPS",
SPL_ARRAY_ARRAY_AS_PROPS);
- REGISTER_SPL_CLASS_CONST_LONG(ArrayIterator,
"CHILD_ARRAYS_ONLY",SPL_ARRAY_CHILD_ARRAYS_ONLY);
+
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveArrayIterator,
"CHILD_ARRAYS_ONLY", SPL_ARRAY_CHILD_ARRAYS_ONLY);
+
return SUCCESS;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug38618.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/spl/tests/bug38618.phpt
diff -u php-src/ext/spl/tests/bug38618.phpt:1.1.2.1
php-src/ext/spl/tests/bug38618.phpt:1.1.2.2
--- php-src/ext/spl/tests/bug38618.phpt:1.1.2.1 Wed Dec 5 15:56:41 2007
+++ php-src/ext/spl/tests/bug38618.phpt Tue May 6 23:08:06 2008
@@ -81,8 +81,8 @@
test_array($array, 'Protected Property');
-test_array($array, 'Public Property New', ArrayIterator::CHILD_ARRAYS_ONLY);
-test_array($array, 'Protected Property New', ArrayIterator::CHILD_ARRAYS_ONLY);
+test_array($array, 'Public Property New',
RecursiveArrayIterator::CHILD_ARRAYS_ONLY);
+test_array($array, 'Protected Property New',
RecursiveArrayIterator::CHILD_ARRAYS_ONLY);
?>
===DONE===
<?php exit(0); ?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
