From 4b8bbc5769151e7d663950ee146cc3c4dc7dcc88 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Fri, 4 Nov 2022 12:30:46 +0000
Subject: [PATCH 1/2] iterator_to_array() and iterator_count() now accepts
 arrays

---
 reference/spl/functions/iterator-count.xml    | 27 +++++++++++++++++--
 reference/spl/functions/iterator-to-array.xml | 26 +++++++++++++++++-
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/reference/spl/functions/iterator-count.xml b/reference/spl/functions/iterator-count.xml
index d2b117416a42..6ee213eb9eed 100644
--- a/reference/spl/functions/iterator-count.xml
+++ b/reference/spl/functions/iterator-count.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>iterator_count</methodname>
-   <methodparam><type>Traversable</type><parameter>iterator</parameter></methodparam>
+   <methodparam><type class="union"><type>Traversable</type><type>array</type></type><parameter>iterator</parameter></methodparam>
   </methodsynopsis>
   <para>
    Count the elements in an iterator.
@@ -42,6 +42,30 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.2.0</entry>
+      <entry>
+       The type of <parameter>iterator</parameter> has been widened from
+       <type>Traversable</type> to
+       <type class="union"><type>Traversable</type><type>array</type></type>
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -105,7 +129,6 @@ foreach ($iterator as $key => $value) {
  </refsect1>
 
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/spl/functions/iterator-to-array.xml b/reference/spl/functions/iterator-to-array.xml
index d79693731e21..dc43eb3e92b9 100644
--- a/reference/spl/functions/iterator-to-array.xml
+++ b/reference/spl/functions/iterator-to-array.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>iterator_to_array</methodname>
-   <methodparam><type>Traversable</type><parameter>iterator</parameter></methodparam>
+   <methodparam><type class="union"><type>Traversable</type><type>array</type></type><parameter>iterator</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>preserve_keys</parameter><initializer>&true;</initializer></methodparam>
   </methodsynopsis>
   <para>
@@ -66,6 +66,30 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.2.0</entry>
+      <entry>
+       The type of <parameter>iterator</parameter> has been widened from
+       <type>Traversable</type> to
+       <type class="union"><type>Traversable</type><type>array</type></type>
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>

From af16b3fbb8f5f0ec82fde4b5a0db6280b091a639 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Fri, 4 Nov 2022 12:53:36 +0000
Subject: [PATCH 2/2] Nit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Tim Düsterhus <timwolla@googlemail.com>
---
 reference/spl/functions/iterator-count.xml    | 2 +-
 reference/spl/functions/iterator-to-array.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/spl/functions/iterator-count.xml b/reference/spl/functions/iterator-count.xml
index 6ee213eb9eed..574b4f025a69 100644
--- a/reference/spl/functions/iterator-count.xml
+++ b/reference/spl/functions/iterator-count.xml
@@ -58,7 +58,7 @@
       <entry>
        The type of <parameter>iterator</parameter> has been widened from
        <type>Traversable</type> to
-       <type class="union"><type>Traversable</type><type>array</type></type>
+       <type class="union"><type>Traversable</type><type>array</type></type>.
       </entry>
      </row>
     </tbody>
diff --git a/reference/spl/functions/iterator-to-array.xml b/reference/spl/functions/iterator-to-array.xml
index dc43eb3e92b9..61de30edd487 100644
--- a/reference/spl/functions/iterator-to-array.xml
+++ b/reference/spl/functions/iterator-to-array.xml
@@ -82,7 +82,7 @@
       <entry>
        The type of <parameter>iterator</parameter> has been widened from
        <type>Traversable</type> to
-       <type class="union"><type>Traversable</type><type>array</type></type>
+       <type class="union"><type>Traversable</type><type>array</type></type>.
       </entry>
      </row>
     </tbody>