summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2007-04-17 06:33:50 +0000
committerMarcus Boerger <helly@php.net>2007-04-17 06:33:50 +0000
commit170af7e86174f13ed3142a7d2b0758ab6254ff37 (patch)
treed09927ac862eb817a2a16ae5d683b335391316aa
parentc60eee70463252a6aa03fdd93b5d0e282409ead9 (diff)
downloadphp-git-170af7e86174f13ed3142a7d2b0758ab6254ff37.tar.gz
- MFH Fix #41109: recursiveiterator.inc says 'implements' Iterator instead of 'extends'
-rw-r--r--NEWS2
-rwxr-xr-xext/spl/internal/recursiveiterator.inc2
-rwxr-xr-xext/spl/internal/seekableiterator.inc2
-rwxr-xr-xext/spl/spl.php4
4 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 13b831bd00..9ec59c96b9 100644
--- 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 640be25a13..716f54804b 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/seekableiterator.inc b/ext/spl/internal/seekableiterator.inc
index c00d264a95..b0a012e54b 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/spl.php b/ext/spl/spl.php
index 61261a0091..1dd82ca998 100755
--- 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