cvs: php-src /ext/spl/examples directorygraphiterator.inc directorytreeiterator.inc

helly Thu Mar 30 22:03:02 2006 UTC Modified files: /php-src/ext/spl/examples directorygraphiterator.inc directorytreeiterator.inc Log: - MFB Make readable http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/directorygraphiterator.inc?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/spl/examples/directorygraphiterator.inc diff -u php-src/ext/spl/examples/directorygraphiterator.inc:1.11 php-src/ext/spl/examples/directorygraphiterator.inc:1.12 --- php-src/ext/spl/examples/directorygraphiterator.inc:1.11 Tue Feb 21 23:21:53 2006 +++ php-src/ext/spl/examples/directorygraphiterator.inc Thu Mar 30 22:03:02 2006 @@ -4,7 +4,7 @@ * @ingroup Examples * @brief class DirectoryGraphIterator * @author Marcus Boerger - * @date 2003 - 2006 + * @date 2003 - 2005 * * SPL - Standard PHP Library */ @@ -18,7 +18,16 @@ { function __construct($path) { - RecursiveIteratorIterator::__construct(new RecursiveCachingIterator(new ParentIterator(new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_FILENAME)), CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD), 1); + RecursiveIteratorIterator::__construct( + new RecursiveCachingIterator( + new ParentIterator( + new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_FILENAME + ) + ), + CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD + ), + parent::SELF_FIRST + ); } } http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/directorytreeiterator.inc?r1=1.17&r2=1.18&diff_format=u Index: php-src/ext/spl/examples/directorytreeiterator.inc diff -u php-src/ext/spl/examples/directorytreeiterator.inc:1.17 php-src/ext/spl/examples/directorytreeiterator.inc:1.18 --- php-src/ext/spl/examples/directorytreeiterator.inc:1.17 Tue Feb 21 23:21:53 2006 +++ php-src/ext/spl/examples/directorytreeiterator.inc Thu Mar 30 22:03:02 2006 @@ -4,7 +4,7 @@ * @ingroup Examples * @brief class DirectoryTreeIterator * @author Marcus Boerger - * @date 2003 - 2006 + * @date 2003 - 2005 * * SPL - Standard PHP Library */ @@ -21,7 +21,14 @@ */ function __construct($path) { - parent::__construct(new RecursiveCachingIterator(new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_FILENAME), CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD), 1); + parent::__construct( + new RecursiveCachingIterator( + new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_FILENAME + ), + CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD + ), + parent::SELF_FIRST + ); } /** @return the current element prefixed with ASCII graphics