diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:35:13 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:35:13 -0400 |
| commit | 0a36161e13484a99ccf69bb38f206462d27cc6d6 (patch) | |
| tree | d5107db4b7369603ac7c753829e8972ee74949f7 /ext/spl/examples | |
| parent | ce7edc9b3c7370f32fec0bc7a8ec3e29ed9a5f61 (diff) | |
| download | php-upstream/5.1.2.tar.gz | |
Imported Upstream version 5.1.2upstream/5.1.2
Diffstat (limited to 'ext/spl/examples')
| -rw-r--r-- | ext/spl/examples/directorygraphiterator.inc | 4 | ||||
| -rw-r--r-- | ext/spl/examples/directorytreeiterator.inc | 4 | ||||
| -rwxr-xr-x | ext/spl/examples/nocvsdir.php | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ext/spl/examples/directorygraphiterator.inc b/ext/spl/examples/directorygraphiterator.inc index a875352f4..89f3de66b 100644 --- a/ext/spl/examples/directorygraphiterator.inc +++ b/ext/spl/examples/directorygraphiterator.inc @@ -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);
}
}
diff --git a/ext/spl/examples/directorytreeiterator.inc b/ext/spl/examples/directorytreeiterator.inc index 654be428f..3036a23a4 100644 --- a/ext/spl/examples/directorytreeiterator.inc +++ b/ext/spl/examples/directorytreeiterator.inc @@ -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 @@ class DirectoryTreeIterator extends RecursiveIteratorIterator */
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
diff --git a/ext/spl/examples/nocvsdir.php b/ext/spl/examples/nocvsdir.php index 121731416..e14ad74f4 100755 --- a/ext/spl/examples/nocvsdir.php +++ b/ext/spl/examples/nocvsdir.php @@ -4,7 +4,8 @@ * @brief Program Dir without CVS subdirs
* @ingroup Examples
* @author Marcus Boerger
- * @date 2003 - 2005
+ * @date 2003 - 2006
+ * @version 1.1
*
* Usage: php nocvsdir.php \<path\>
*
@@ -37,10 +38,10 @@ class NoCvsDirectory extends RecursiveFilterIterator {
return $this->getInnerIterator()->getFilename() != 'CVS';
}
-
+
function getChildren()
{
- return new NoCvsDirectory($this->current()->getPathName());
+ return new NoCvsDirectory($this->key());
}
}
|