language/predefined/iterator.xml
9eb4a46bba05da229be4c8f7a3cb64702e1a2f95
...
...
@@ -1,6 +1,5 @@
1
1
<?xml version="1.0" encoding="utf-8"?>
2
2
<!-- $Revision$ -->
3
-

4
3
<phpdoc:classref xml:id="class.iterator" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
5
4

6
5
<title>The Iterator interface</title>
...
...
@@ -22,24 +21,20 @@
22
21
&reftitle.interfacesynopsis;
23
22

24
23
<!-- {{{ Synopsis -->
25
-
<classsynopsis>
26
-
<ooclass><classname>Iterator</classname></ooclass>
27
-

28
-
<!-- {{{ Class synopsis -->
29
-
<classsynopsisinfo>
30
-
<ooclass>
31
-
<classname>Iterator</classname>
32
-
</ooclass>
33
-
34
-
<ooclass>
35
-
<modifier>extends</modifier>
36
-
<classname>Traversable</classname>
37
-
</ooclass>
38
-
</classsynopsisinfo>
39
-
<!-- }}} -->
24
+
<classsynopsis class="interface">
25
+
<oointerface>
26
+
<interfacename>Iterator</interfacename>
27
+
</oointerface>
28
+

29
+
<oointerface>
30
+
<modifier>extends</modifier>
31
+
<interfacename>Traversable</interfacename>
32
+
</oointerface>
40
33

41
34
<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
42
-
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.iterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
35
+
<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.iterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Iterator'])">
36
+
<xi:fallback/>
37
+
</xi:include>
43
38
</classsynopsis>
44
39
<!-- }}} -->
45
40

...
...
@@ -76,27 +71,29 @@ class myIterator implements Iterator {
76
71
$this->position = 0;
77
72
}
78
73

79
-
function rewind() {
74
+
public function rewind(): void {
80
75
var_dump(__METHOD__);
81
76
$this->position = 0;
82
77
}
83
78

84
-
function current() {
79
+
#[\ReturnTypeWillChange]
80
+
public function current() {
85
81
var_dump(__METHOD__);
86
82
return $this->array[$this->position];
87
83
}
88
84

89
-
function key() {
85
+
#[\ReturnTypeWillChange]
86
+
public function key() {
90
87
var_dump(__METHOD__);
91
88
return $this->position;
92
89
}
93
90

94
-
function next() {
91
+
public function next(): void {
95
92
var_dump(__METHOD__);
96
93
++$this->position;
97
94
}
98
95

99
-
function valid() {
96
+
public function valid(): bool {
100
97
var_dump(__METHOD__);
101
98
return isset($this->array[$this->position]);
102
99
}
...
...
@@ -142,6 +139,10 @@ string(17) "myIterator::valid"
142
139
</example><!-- }}} -->
143
140
</section>
144
141

142
+
<section xml:id="iterator.seealso">
143
+
&reftitle.seealso;
144
+
<para>See also <link linkend="language.oop5.iterations">object iteration</link>.</para>
145
+
</section>
145
146

146
147
</partintro>
147
148

...
...
@@ -152,7 +153,6 @@ string(17) "myIterator::valid"
152
153
&language.predefined.iterator.valid;
153
154

154
155
</phpdoc:classref>
155
-

156
156
<!-- Keep this comment at the end of the file
157
157
Local variables:
158
158
mode: sgml
...
...
@@ -173,4 +173,3 @@ vim600: syn=xml fen fdm=syntax fdl=2 si
173
173
vim: et tw=78 syn=sgml
174
174
vi: ts=1 sw=1
175
175
-->
176
-

177
176