- MFH Fix #41109: recursiveiterator.inc says 'implements' Iterator instead of 'extends'

diff --git a/NEWS b/NEWS
index 13b831bd0009883e9545c5cd2be22530121178f1..9ec59c96b9681b7d107e976053f4c6c5ea93b7e5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Apr 2007, PHP 5.2.2RC2
+- Fixed bug #41109 (recursiveiterator.inc says "implements" Iterator instead of
+  "extends"). (Marcus)
 - Fixed bug #41093 (magic_quotes_gpc ignores first arrays keys). (Arpad, Ilia)
 - Fixed bug #41083 (mysql_ping() requires MYSQL_OPT_RECONNECT to be set since 
   MySQL 5.0.13). (xiaojb at gmail dot com, Tony)

diff --git a/ext/spl/internal/recursiveiterator.inc b/ext/spl/internal/recursiveiterator.inc
index 640be25a1340df3cd1fc0c4c2b1244a3043b7947..716f54804b3acc2dd9da1b5ee02b9c0cb778678f 100755 (executable)
--- 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/seekableiterator.inc b/ext/spl/internal/seekableiterator.inc
index c00d264a952766cd76adf37ef1017c4020071f8a..b0a012e54b0cbedf41c887312b1e65d947851edc 100755 (executable)
--- 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/spl.php b/ext/spl/spl.php
index 61261a0091d7e8750e3af48144593fda413786f7..1dd82ca9980649c651cf9e3c0cac7bfcc4623ae2 100755 (executable)
--- a/ext/spl/spl.php
+++ b/ext/spl/spl.php
@@ -32,12 +32,12 @@
  * 
  * SPL offers some advanced iterator algorithms:
  * 
- * - interface RecursiveIterator implements Iterator
+ * - interface RecursiveIterator extends Iterator
  * - interface OuterIterator extends Iterator
  * - class RecursiveIteratorIterator implements OuterIterator
  * - abstract class FilterIterator implements OuterIterator
  * - class ParentIterator extends FilterIterator implements RecursiveIterator
- * - interface SeekableIterator implements Iterator
+ * - interface SeekableIterator extends Iterator
  * - class LimitIterator implements OuterIterator
  * - class CachingIterator implements OuterIterator
  * - class RecursiveCachingIterator extends CachingIterator implements RecursiveIterator