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

helly Thu Mar 30 21:57:28 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/spl/examples directorygraphiterator.inc directorytreeiterator.inc Log: - Make readable http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/directorygraphiterator.inc?r1=1.7.2.3&r2=1.7.2.4&diff_format=u Index: php-src/ext/spl/examples/directorygraphiterator.inc diff -u php-src/ext/spl/examples/directorygraphiterator.inc:1.7.2.3 php-src/ext/spl/examples/directorygraphiterator.inc:1.7.2.4 --- php-src/ext/spl/examples/directorygraphiterator.inc:1.7.2.3 Wed Jan 4 15:34:39 2006 +++ php-src/ext/spl/examples/directorygraphiterator.inc Thu Mar 30 21:57:28 2006 @@ -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.13.2.3&r2=1.13.2.4&diff_format=u Index: php-src/ext/spl/examples/directorytreeiterator.inc diff -u php-src/ext/spl/examples/directorytreeiterator.inc:1.13.2.3 php-src/ext/spl/examples/directorytreeiterator.inc:1.13.2.4 --- php-src/ext/spl/examples/directorytreeiterator.inc:1.13.2.3 Wed Jan 4 15:34:39 2006 +++ php-src/ext/spl/examples/directorytreeiterator.inc Thu Mar 30 21:57:28 2006 @@ -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