cvs: php-src /ext/spl/examples directorygraphiterator.inc directorytreeiterator.inc
| From: | Marcus Boerger | Date: | Wed, 04 Jan 2006 15:34:26 +0000 |
| Subject: | cvs: php-src /ext/spl/examples directorygraphiterator.inc directorytreeiterator.inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-36387@lists.php.net to get a copy of this message | ||
helly Wed Jan 4 15:34:26 2006 UTC
Modified files:
/php-src/ext/spl/examples directorygraphiterator.inc
directorytreeiterator.inc
Log:
- Update examples
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/directorygraphiterator.inc?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/spl/examples/directorygraphiterator.inc
diff -u php-src/ext/spl/examples/directorygraphiterator.inc:1.9
php-src/ext/spl/examples/directorygraphiterator.inc:1.10
--- php-src/ext/spl/examples/directorygraphiterator.inc:1.9 Sun Sep 18 16:51:24 2005
+++ php-src/ext/spl/examples/directorygraphiterator.inc Wed Jan 4 15:34:26 2006
@@ -12,13 +12,13 @@
/** @ingroup Examples
* @brief A tree iterator that only shows directories.
* @author Marcus Boerger
- * @version 1.0
+ * @version 1.1
*/
class DirectoryGraphIterator extends DirectoryTreeIterator
{
function __construct($path)
{
- RecursiveIteratorIterator::__construct(new RecursiveCachingIterator(new ParentIterator(new
RecursiveDirectoryIterator($path)),
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), 1);
}
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/examples/directorytreeiterator.inc?r1=1.15&r2=1.16&diff_format=u
Index: php-src/ext/spl/examples/directorytreeiterator.inc
diff -u php-src/ext/spl/examples/directorytreeiterator.inc:1.15
php-src/ext/spl/examples/directorytreeiterator.inc:1.16
--- php-src/ext/spl/examples/directorytreeiterator.inc:1.15 Sun Sep 18 16:51:24 2005
+++ php-src/ext/spl/examples/directorytreeiterator.inc Wed Jan 4 15:34:26 2006
@@ -12,7 +12,7 @@
/** @ingroup Examples
* @brief DirectoryIterator to generate ASCII graphic directory trees
* @author Marcus Boerger
- * @version 1.0
+ * @version 1.1
*/
class DirectoryTreeIterator extends RecursiveIteratorIterator
{
@@ -21,7 +21,7 @@
*/
function __construct($path)
{
- parent::__construct(new RecursiveCachingIterator(new RecursiveDirectoryIterator($path),
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), 1);
}
/** @return the current element prefixed with ASCII graphics