diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:27 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:27 -0400 |
| commit | 2d4e5b09576bb4f0ba716cc82cdf29ea04d9184b (patch) | |
| tree | 41ccc042009cba53e4ce43e727fcba4c1cfbf7f3 /ext/spl/internal | |
| parent | d29a4fd2dd3b5d4cf6e80b602544d7b71d794e76 (diff) | |
| download | php-upstream/5.2.2.tar.gz | |
Imported Upstream version 5.2.2upstream/5.2.2
Diffstat (limited to 'ext/spl/internal')
| -rwxr-xr-x | ext/spl/internal/parentiterator.inc | 16 | ||||
| -rwxr-xr-x | ext/spl/internal/recursiveiterator.inc | 2 | ||||
| -rwxr-xr-x | ext/spl/internal/recursiveiteratoriterator.inc | 6 | ||||
| -rwxr-xr-x | ext/spl/internal/seekableiterator.inc | 2 | ||||
| -rwxr-xr-x | ext/spl/internal/splfileobject.inc | 8 |
5 files changed, 7 insertions, 27 deletions
diff --git a/ext/spl/internal/parentiterator.inc b/ext/spl/internal/parentiterator.inc index 9e0ebfa25..84c760d62 100755 --- a/ext/spl/internal/parentiterator.inc +++ b/ext/spl/internal/parentiterator.inc @@ -4,7 +4,7 @@ * @ingroup SPL * @brief class FilterIterator * @author Marcus Boerger - * @date 2003 - 2005 + * @date 2003 - 2006 * * SPL - Standard PHP Library */ @@ -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 diff --git a/ext/spl/internal/recursiveiterator.inc b/ext/spl/internal/recursiveiterator.inc index 063fc905c..07ffad7d1 100755 --- a/ext/spl/internal/recursiveiterator.inc +++ b/ext/spl/internal/recursiveiterator.inc @@ -15,7 +15,7 @@ * @version 1.0
* @since PHP 5.0
*/
-interface RecursiveIterator implements Iterator
+interface RecursiveIterator extends Iterator
{
/** @return whether the current element has children
*/
diff --git a/ext/spl/internal/recursiveiteratoriterator.inc b/ext/spl/internal/recursiveiteratoriterator.inc index ba32e4ee9..8bb657317 100755 --- a/ext/spl/internal/recursiveiteratoriterator.inc +++ b/ext/spl/internal/recursiveiteratoriterator.inc @@ -217,7 +217,7 @@ class RecursiveIteratorIterator implements OuterIterator if ($after_move)
{
if (($this->mode == self::SELF_FIRST && $this->callHasChildren())
- $this->mode == self::LEAVES_ONLY)
+ || $this->mode == self::LEAVES_ONLY)
$this->nextElement();
}
else
@@ -229,7 +229,9 @@ class RecursiveIteratorIterator implements OuterIterator /** Called when the next element is available
*/
- function nextElement();
+ function nextElement()
+ {
+ }
}
?>
\ No newline at end of file diff --git a/ext/spl/internal/seekableiterator.inc b/ext/spl/internal/seekableiterator.inc index af66c60c3..5ab6b9b4d 100755 --- a/ext/spl/internal/seekableiterator.inc +++ b/ext/spl/internal/seekableiterator.inc @@ -18,7 +18,7 @@ * to seek on an iterator LimitIterator can use this to efficiently rewind
* to offset.
*/
-interface SeekableIterator implements Iterator
+interface SeekableIterator extends Iterator
{
/** Seek to an absolute position
*
diff --git a/ext/spl/internal/splfileobject.inc b/ext/spl/internal/splfileobject.inc index 5f746ea2d..b78c71889 100755 --- a/ext/spl/internal/splfileobject.inc +++ b/ext/spl/internal/splfileobject.inc @@ -50,14 +50,6 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt }
/**
- * @return the filename as specified in the constructor
- */
- function getFilename()
- {
- return $this->fname;
- }
-
- /**
* @return whether the end of the stream is reached
*/
function eof()
|