reference/spl/functions/iterator-to-array.xml
70ac605e66b5ce0c03a345df92297f3e03f088ca
70ac605e66b5ce0c03a345df92297f3e03f088ca
...
...
@@ -10,8 +10,8 @@
10
10
&reftitle.description;
11
11
<methodsynopsis>
12
12
<type>array</type><methodname>iterator_to_array</methodname>
13
-
<methodparam><type>Traversable</type><parameter>iterator</parameter></methodparam>
14
-
<methodparam choice="opt"><type>bool</type><parameter>use_keys</parameter><initializer>&true;</initializer></methodparam>
13
+
<methodparam><type class="union"><type>Traversable</type><type>array</type></type><parameter>iterator</parameter></methodparam>
14
+
<methodparam choice="opt"><type>bool</type><parameter>preserve_keys</parameter><initializer>&true;</initializer></methodparam>
15
15
</methodsynopsis>
16
16
<para>
17
17
Copy the elements of an iterator into an array.
...
...
@@ -31,25 +31,25 @@
31
31
</listitem>
32
32
</varlistentry>
33
33
<varlistentry>
34
-
<term><parameter>use_keys</parameter></term>
34
+
<term><parameter>preserve_keys</parameter></term>
35
35
<listitem>
36
36
<para>
37
37
Whether to use the iterator element keys as index.
38
38
</para>
39
39
<para>
40
-
In PHP 5.5 and later, if a key is an <type>array</type> or
40
+
If a key is an <type>array</type> or
41
41
<type>object</type>, a warning will be generated. &null; keys will be
42
42
converted to an empty string, <type>float</type> keys will be
43
-
truncated to their <type>integer</type> counterpart,
43
+
truncated to their <type>int</type> counterpart,
44
44
<type>resource</type> keys will generate a warning and be converted to
45
-
their resource ID, and <type>boolean</type> keys will be converted to
45
+
their resource ID, and <type>bool</type> keys will be converted to
46
46
integers.
47
47
</para>
48
48
<note>
49
49
<para>
50
50
If this parameter is not set or set to &true;, duplicate keys will be
51
51
overwritten. The last value with a given key will be in the returned
52
-
<type>array</type>. Set this paramater to &false; to get all the values
52
+
<type>array</type>. Set this parameter to &false; to get all the values
53
53
in any case.
54
54
</para>
55
55
</note>
...
...
@@ -68,34 +68,26 @@
68
68
69
69
<refsect1 role="changelog">
70
70
&reftitle.changelog;
71
-
<para>
72
-
<informaltable>
73
-
<tgroup cols="2">
74
-
<thead>
75
-
<row>
76
-
<entry>&Version;</entry>
77
-
<entry>&Description;</entry>
78
-
</row>
79
-
</thead>
80
-
<tbody>
81
-
<row>
82
-
<entry>5.5.0</entry>
83
-
<entry>
84
-
<function>iterator_to_array</function> gained support for key types
85
-
other than <type>integer</type> and <type>string</type> when the
86
-
<parameter>use_keys</parameter> parameter is enabled.
87
-
</entry>
88
-
</row>
89
-
<row>
90
-
<entry>5.2.1</entry>
91
-
<entry>
92
-
The <parameter>use_keys</parameter> parameter was added.
93
-
</entry>
94
-
</row>
95
-
</tbody>
96
-
</tgroup>
97
-
</informaltable>
98
-
</para>
71
+
<informaltable>
72
+
<tgroup cols="2">
73
+
<thead>
74
+
<row>
75
+
<entry>&Version;</entry>
76
+
<entry>&Description;</entry>
77
+
</row>
78
+
</thead>
79
+
<tbody>
80
+
<row>
81
+
<entry>8.2.0</entry>
82
+
<entry>
83
+
The type of <parameter>iterator</parameter> has been widened from
84
+
<type>Traversable</type> to
85
+
<type class="union"><type>Traversable</type><type>array</type></type>.
86
+
</entry>
87
+
</row>
88
+
</tbody>
89
+
</tgroup>
90
+
</informaltable>
99
91
</refsect1>
100
92
101
93
<refsect1 role="examples">
...
...
@@ -142,7 +134,6 @@ array(4) {
142
134
</refsect1>
143
135
144
136
</refentry>
145
-
146
137
<!-- Keep this comment at the end of the file
147
138
Local variables:
148
139
mode: sgml
149
140