helly Sun Mar 4 12:06:55 2007 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
/php-src/ext/spl/internal parentiterator.inc
Log:
- Match docu with implementation
- RecursiveFilterIterator::accept() needs to be abstract
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.159&r2=1.160&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.159
php-src/ext/spl/spl_iterators.c:1.160
--- php-src/ext/spl/spl_iterators.c:1.159 Sun Mar 4 12:02:16 2007
+++ php-src/ext/spl/spl_iterators.c Sun Mar 4 12:06:55 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.159 2007/03/04 12:02:16 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.160 2007/03/04 12:06:55 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1657,7 +1657,6 @@
static zend_function_entry spl_funcs_RecursiveFilterIterator[] = {
SPL_ME(RecursiveFilterIterator, __construct,
arginfo_parent_it___construct, ZEND_ACC_PUBLIC)
- SPL_MA(ParentIterator, accept, RecursiveFilterIterator, hasChildren,
NULL, ZEND_ACC_PUBLIC)
SPL_ME(RecursiveFilterIterator, hasChildren, NULL,
ZEND_ACC_PUBLIC)
SPL_ME(RecursiveFilterIterator, getChildren, NULL,
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/internal/parentiterator.inc?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/spl/internal/parentiterator.inc
diff -u php-src/ext/spl/internal/parentiterator.inc:1.8
php-src/ext/spl/internal/parentiterator.inc:1.9
--- php-src/ext/spl/internal/parentiterator.inc:1.8 Tue Feb 21 23:21:53 2006
+++ php-src/ext/spl/internal/parentiterator.inc Sun Mar 4 12:06:55 2007
@@ -21,26 +21,12 @@
*/
class ParentIterator extends RecursiveFilterIterator
{
- /** @param $it the RecursiveIterator to filter
- */
- function __construct(RecursiveIterator $it)
- {
- parent::__construct($it);
- }
-
/** @return whetehr the current element has children
*/
function accept()
{
return $this->it->hasChildren();
}
-
- /** @return the ParentIterator for the current elements children
- */
- function getChildren()
- {
- return new ParentIterator($this->it->getChildren());
- }
}
?>
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
