Skip to content

Commit 76b3007

Browse files
committed
More name fixes (more thanks to george)
1 parent 69b7bb2 commit 76b3007

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

ext/spl/spl.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
* The only thing a class has to do is
1515
*/
16-
interface iterator {
16+
interface spl_iterator {
1717

1818
/*! \brief Create a new iterator
1919
*
@@ -29,7 +29,7 @@ function new_iterator();
2929
* can be used as a parameter to be iterated (normally an array).
3030
*
3131
* \code
32-
class c implements spl_foreach, spl_forward {
32+
class c implements spl_iterator, spl_forward {
3333
private $num = 0;
3434
function new_iterator() {
3535
$this->num = 0;
@@ -62,7 +62,7 @@ function has_more() {
6262
* If you need this you must split the two parts.
6363
*
6464
* \code
65-
class c implements spl_foreach {
65+
class c implements spl_iterator {
6666
public $max = 3;
6767
function new_iterator() {
6868
return new c_iter($this);
@@ -97,7 +97,7 @@ function has_more() {
9797
* You can also use this interface with the for() construct.
9898
*
9999
* \code
100-
class c implements spl_foreach {
100+
class c implements spl_iterator {
101101
public $max = 3;
102102
function new_iterator() {
103103
return new c_iter($this);
@@ -127,7 +127,7 @@ function has_more() {
127127
}
128128
\endcode
129129
*/
130-
interface forward {
130+
interface spl_forward {
131131

132132
/*! \brief Retrieve the current currentent
133133
*
@@ -155,7 +155,7 @@ function has_more();
155155
* \note If you use sequence in foreach then rewind() will be called
156156
* first.
157157
*/
158-
interface sequence extends forward {
158+
interface spl_sequence extends spl_forward {
159159

160160
/*! Restart the sequence by positioning it to the first element.
161161
*/
@@ -167,7 +167,7 @@ function rewind();
167167
* This interface allows to implement associative iterators
168168
* and containers.
169169
*/
170-
interface assoc {
170+
interface spl_assoc {
171171

172172
/*! \brief Retrieve the current elements key
173173
*
@@ -185,17 +185,17 @@ function key();
185185
foreach($t as $key => $elem).
186186
\endcode
187187
*/
188-
interface assoc_forward extends forward implements assoc {
188+
interface spl_assoc_forward implements spl_forward, spl_assoc {
189189
}
190190

191191
/*! \brief associative sequence
192192
*/
193-
interface assoc_sequence extends sequence implements assoc {
193+
interface spl_assoc_sequence implements spl_sequence, spl_assoc {
194194
}
195195

196196
/*! \brief array read only access for objects
197197
*/
198-
interface array_read {
198+
interface spl_array_read {
199199

200200
/*! Check whether or not the given index exists.
201201
* The returned value is interpreted as converted to bool.
@@ -226,7 +226,7 @@ function set($index, $value) {
226226
}
227227
\endcode
228228
*/
229-
interface array_access extends array_read {
229+
interface spl_array_access extends spl_array_read {
230230

231231
/*! Set the value identified by $index to $value.
232232
*/
@@ -254,7 +254,7 @@ function new_writer($index) {
254254
}
255255
\endcode
256256
*/
257-
interface array_access_ex extends array_access {
257+
interface spl_array_access_ex extends spl_array_access {
258258

259259
/*! Create an array_writer interface for the specified index.
260260
*
@@ -294,7 +294,7 @@ function set($value) {
294294
*
295295
* See array_access for more.
296296
*/
297-
interface array_writer {
297+
interface spl_array_writer {
298298

299299
/*! Set the corresponding value to $value.
300300
*/

0 commit comments

Comments
 (0)