From 9a883ae8d1da9ddb4f93ebec53c69d1925ec54f5 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Sun, 6 Jun 2021 17:49:54 +0100
Subject: [PATCH] Fix lone section order issues in various extensions

Part of #658
---
 reference/apcu/functions/apcu-fetch.xml       | 44 ++++++++--------
 reference/array/functions/array-unique.xml    | 20 ++++----
 reference/bc/functions/bcpowmod.xml           | 24 ++++-----
 reference/com/functions/com-create-guid.xml   |  6 +++
 .../cubridmysql/cubrid-unbuffered-query.xml   | 24 ++++-----
 reference/dba/functions/dba-list.xml          |  7 ++-
 reference/exec/functions/proc-nice.xml        | 36 ++++++-------
 reference/exif/functions/exif-thumbnail.xml   | 51 ++++++++++---------
 reference/filter/functions/filter-list.xml    |  6 +++
 .../fpm/functions/fastcgi-finish-request.xml  |  5 ++
 .../geoip/functions/geoip-db-get-all-info.xml |  6 +++
 reference/inotify/functions/inotify-init.xml  |  5 ++
 reference/lzf/functions/lzf-optimized-for.xml |  7 ++-
 .../functions/mailparse-msg-create.xml        |  5 ++
 reference/mhash/functions/mhash-count.xml     |  5 ++
 .../mysql/functions/mysql-get-client-info.xml |  5 ++
 .../functions/opcache-get-configuration.xml   |  5 ++
 .../functions/openssl-error-string.xml        |  5 ++
 reference/pdo_pgsql/PDO/pgsqlGetPid.xml       |  6 ++-
 .../rar/rarexception/setusingexceptions.xml   |  7 +++
 .../functions/sodium-crypto-pwhash-str.xml    | 23 +++++----
 .../swoole/functions/swoole-async-set.xml     |  7 +++
 reference/tokenizer/functions/token-name.xml  |  9 +---
 23 files changed, 200 insertions(+), 118 deletions(-)

diff --git a/reference/apcu/functions/apcu-fetch.xml b/reference/apcu/functions/apcu-fetch.xml
index 562a032094f6..a35e061357bb 100644
--- a/reference/apcu/functions/apcu-fetch.xml
+++ b/reference/apcu/functions/apcu-fetch.xml
@@ -50,6 +50,28 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>PECL apcu 3.0.17</entry>
+      <entry>
+       The <parameter>success</parameter> parameter was added.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -74,28 +96,6 @@ string(3) "BAR"
   </para>
  </refsect1>
 
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL apcu 3.0.17</entry>
-      <entry>
-       The <parameter>success</parameter> parameter was added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/array/functions/array-unique.xml b/reference/array/functions/array-unique.xml
index 2d55489811d9..d44bcb98646e 100644
--- a/reference/array/functions/array-unique.xml
+++ b/reference/array/functions/array-unique.xml
@@ -162,26 +162,26 @@ array(2) {
    </example>
   </para>
  </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>array_count_values</function></member>
-   </simplelist>
-  </para>
- </refsect1>
 
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
    <simpara>
-    Note that <function>array_unique</function> is not intended to 
+    Note that <function>array_unique</function> is not intended to
     work on multi dimensional arrays.
    </simpara>
   </note>
  </refsect1>
 
+ <refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>array_count_values</function></member>
+   </simplelist>
+  </para>
+ </refsect1>
+
 </refentry>
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/bc/functions/bcpowmod.xml b/reference/bc/functions/bcpowmod.xml
index 3af13bebf432..0d173eb0fdff 100644
--- a/reference/bc/functions/bcpowmod.xml
+++ b/reference/bc/functions/bcpowmod.xml
@@ -63,17 +63,7 @@
    is <literal>0</literal> or <parameter>exponent</parameter> is negative.
   </para>
  </refsect1>
- 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Because this method uses the modulus operation, numbers which are not
-    positive integers may give unexpected results.
-   </para>
-  </note>
- </refsect1>
- 
+
  <refsect1 role="changelog">
   &reftitle.changelog;
   <informaltable>
@@ -118,7 +108,17 @@ $b = bcmod(bcpow($x, $y), $mod);
    </informalexample>
   </para>
  </refsect1>
- 
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    Because this method uses the modulus operation, numbers which are not
+    positive integers may give unexpected results.
+   </para>
+  </note>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/com/functions/com-create-guid.xml b/reference/com/functions/com-create-guid.xml
index fed10db6170f..dcee44dc0c40 100644
--- a/reference/com/functions/com-create-guid.xml
+++ b/reference/com/functions/com-create-guid.xml
@@ -19,6 +19,12 @@
    Microsoft convention is to enclose a GUID in curly braces.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml b/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml
index 140464c70771..88bb745f833f 100644
--- a/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml
+++ b/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml
@@ -49,18 +49,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    The benefits of <function>cubrid_unbuffered_query</function> come
-    at a cost: you cannot use <function>cubrid_num_rows</function> and
-    <function>cubrid_data_seek</function> on a result set returned from
-    <function>cubrid_unbuffered_query</function>. 
-   </para>
-  </note>
- </refsect1>
-
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
@@ -89,6 +77,18 @@
   </example>
  </refsect1>
 
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    The benefits of <function>cubrid_unbuffered_query</function> come
+    at a cost: you cannot use <function>cubrid_num_rows</function> and
+    <function>cubrid_data_seek</function> on a result set returned from
+    <function>cubrid_unbuffered_query</function>.
+   </para>
+  </note>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/dba/functions/dba-list.xml b/reference/dba/functions/dba-list.xml
index db5344baeee1..fa35dc69b280 100644
--- a/reference/dba/functions/dba-list.xml
+++ b/reference/dba/functions/dba-list.xml
@@ -15,6 +15,12 @@
    <function>dba_list</function> list all open database files.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -22,7 +28,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/exec/functions/proc-nice.xml b/reference/exec/functions/proc-nice.xml
index b80c97161368..d4a7d8975bbc 100644
--- a/reference/exec/functions/proc-nice.xml
+++ b/reference/exec/functions/proc-nice.xml
@@ -101,24 +101,6 @@
   </para>
  </refsect1>
 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>proc_nice</function> to set the process priority to high</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Highest priority
-proc_nice(-20);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-
- </refsect1>
-
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -143,6 +125,24 @@ proc_nice(-20);
   </para>
  </refsect1>
 
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title>Using <function>proc_nice</function> to set the process priority to high</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+// Highest priority
+proc_nice(-20);
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/exif/functions/exif-thumbnail.xml b/reference/exif/functions/exif-thumbnail.xml
index d7cfa151c0a7..42f7a028561f 100644
--- a/reference/exif/functions/exif-thumbnail.xml
+++ b/reference/exif/functions/exif-thumbnail.xml
@@ -77,30 +77,7 @@
    thumbnail.
   </para>
  </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>exif_thumbnail</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$image = exif_thumbnail('/path/to/image.jpg', $width, $height, $type);
 
-if ($image!==false) {
-    header('Content-type: ' .image_type_to_mime_type($type));
-    echo $image;
-    exit;
-} else {
-    // no thumbnail available, handle the error here
-    echo 'No thumbnail available';
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
  <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
@@ -116,7 +93,7 @@ if ($image!==false) {
       <row>
        <entry>7.2.0</entry>
        <entry>
-        The <parameter>file</parameter> parameter now supports both local files 
+        The <parameter>file</parameter> parameter now supports both local files
         and stream resources.
        </entry>
       </row>
@@ -125,6 +102,32 @@ if ($image!==false) {
    </informaltable>
   </para>
  </refsect1>
+
+ <refsect1 role="examples">
+  &reftitle.examples;
+  <para>
+   <example>
+    <title><function>exif_thumbnail</function> example</title>
+    <programlisting role="php">
+<![CDATA[
+<?php
+$image = exif_thumbnail('/path/to/image.jpg', $width, $height, $type);
+
+if ($image!==false) {
+    header('Content-type: ' .image_type_to_mime_type($type));
+    echo $image;
+    exit;
+} else {
+    // no thumbnail available, handle the error here
+    echo 'No thumbnail available';
+}
+?>
+]]>
+    </programlisting>
+   </example>
+  </para>
+ </refsect1>
+
  <refsect1 role="notes">
   &reftitle.notes;
   <note>
diff --git a/reference/filter/functions/filter-list.xml b/reference/filter/functions/filter-list.xml
index 0345c35da6e7..a6561efa3982 100644
--- a/reference/filter/functions/filter-list.xml
+++ b/reference/filter/functions/filter-list.xml
@@ -14,6 +14,12 @@
   </methodsynopsis>
 
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/fpm/functions/fastcgi-finish-request.xml b/reference/fpm/functions/fastcgi-finish-request.xml
index 683b4167eade..04e9c3815365 100644
--- a/reference/fpm/functions/fastcgi-finish-request.xml
+++ b/reference/fpm/functions/fastcgi-finish-request.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml
index ea7c3594bdcf..4144e61bae7f 100644
--- a/reference/geoip/functions/geoip-db-get-all-info.xml
+++ b/reference/geoip/functions/geoip-db-get-all-info.xml
@@ -47,6 +47,12 @@
   </para>
 
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/inotify/functions/inotify-init.xml b/reference/inotify/functions/inotify-init.xml
index 3acbf2f76859..e3f566c568f5 100644
--- a/reference/inotify/functions/inotify-init.xml
+++ b/reference/inotify/functions/inotify-init.xml
@@ -18,6 +18,11 @@
    <function>inotify_add_watch</function>
   </para>
  </refsect1><!-- }}} -->
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
  
  <refsect1 role="returnvalues"><!-- {{{ -->
   &reftitle.returnvalues;
diff --git a/reference/lzf/functions/lzf-optimized-for.xml b/reference/lzf/functions/lzf-optimized-for.xml
index 0a2758e01f86..ac3debe64f98 100644
--- a/reference/lzf/functions/lzf-optimized-for.xml
+++ b/reference/lzf/functions/lzf-optimized-for.xml
@@ -18,6 +18,12 @@
    Determines what was LZF extension optimized for during compilation.
   </para>
  </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -25,7 +31,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/mailparse/functions/mailparse-msg-create.xml b/reference/mailparse/functions/mailparse-msg-create.xml
index 4b8629049cb1..f20964653b21 100644
--- a/reference/mailparse/functions/mailparse-msg-create.xml
+++ b/reference/mailparse/functions/mailparse-msg-create.xml
@@ -16,6 +16,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/mhash/functions/mhash-count.xml b/reference/mhash/functions/mhash-count.xml
index 5e301fc1095f..cd9aa011dffd 100644
--- a/reference/mhash/functions/mhash-count.xml
+++ b/reference/mhash/functions/mhash-count.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/mysql/functions/mysql-get-client-info.xml b/reference/mysql/functions/mysql-get-client-info.xml
index c97b099995c7..acae754c1b85 100644
--- a/reference/mysql/functions/mysql-get-client-info.xml
+++ b/reference/mysql/functions/mysql-get-client-info.xml
@@ -28,6 +28,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/opcache/functions/opcache-get-configuration.xml b/reference/opcache/functions/opcache-get-configuration.xml
index 6556dc9c5626..85313313f69f 100644
--- a/reference/opcache/functions/opcache-get-configuration.xml
+++ b/reference/opcache/functions/opcache-get-configuration.xml
@@ -17,6 +17,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/openssl/functions/openssl-error-string.xml b/reference/openssl/functions/openssl-error-string.xml
index 9a1b2386add6..b64b3de14666 100644
--- a/reference/openssl/functions/openssl-error-string.xml
+++ b/reference/openssl/functions/openssl-error-string.xml
@@ -20,6 +20,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
diff --git a/reference/pdo_pgsql/PDO/pgsqlGetPid.xml b/reference/pdo_pgsql/PDO/pgsqlGetPid.xml
index 3e6daba6fc7e..8d002356aa17 100644
--- a/reference/pdo_pgsql/PDO/pgsqlGetPid.xml
+++ b/reference/pdo_pgsql/PDO/pgsqlGetPid.xml
@@ -16,6 +16,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  &no.function.parameters;
+ </refsect1>
+
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
@@ -23,7 +28,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/rar/rarexception/setusingexceptions.xml b/reference/rar/rarexception/setusingexceptions.xml
index 73718ec55539..e99025587bf7 100644
--- a/reference/rar/rarexception/setusingexceptions.xml
+++ b/reference/rar/rarexception/setusingexceptions.xml
@@ -51,6 +51,13 @@
   </para>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/sodium/functions/sodium-crypto-pwhash-str.xml b/reference/sodium/functions/sodium-crypto-pwhash-str.xml
index 13d29e037dec..3b237b7a5d83 100644
--- a/reference/sodium/functions/sodium-crypto-pwhash-str.xml
+++ b/reference/sodium/functions/sodium-crypto-pwhash-str.xml
@@ -62,15 +62,6 @@ Uses a CPU- and memory-hard hash algorithm along with a randomly-generated salt,
   </para>
  </refsect1>
 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Hashes are calculated using the Argon2ID algorithm, providing resistance to both GPU and side-channel attacks. In contrast to the <function>password_hash</function> function, there is no salt parameter (a salt is generated automatically), and the <parameter>opslimit</parameter> and <parameter>memlimit</parameter> parameters are not optional.
-   </para>
-  </note>
- </refsect1>
-
   <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -96,6 +87,20 @@ $argon2id$v=19$m=65536,t=2,p=1$oWIfdaXwWwhVmovOBc2NAQ$EbsZ+JnZyyavkafS0hoc4HdaOB
    </example>
   </para> 
  </refsect1>
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    Hashes are calculated using the Argon2ID algorithm,
+    providing resistance to both GPU and side-channel attacks.
+    In contrast to the <function>password_hash</function> function,
+    there is no salt parameter (a salt is generated automatically),
+    and the <parameter>opslimit</parameter> and
+    <parameter>memlimit</parameter> parameters are not optional.
+   </para>
+  </note>
+ </refsect1>
  
  <refsect1 role="seealso">
   &reftitle.seealso;
diff --git a/reference/swoole/functions/swoole-async-set.xml b/reference/swoole/functions/swoole-async-set.xml
index e635cb6c4053..6b7f22b6b9d7 100644
--- a/reference/swoole/functions/swoole-async-set.xml
+++ b/reference/swoole/functions/swoole-async-set.xml
@@ -33,6 +33,13 @@
   </variablelist>
  </refsect1>
 
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   &return.void;
+  </para>
+ </refsect1>
+
 </refentry>
 
 <!-- Keep this comment at the end of the file
diff --git a/reference/tokenizer/functions/token-name.xml b/reference/tokenizer/functions/token-name.xml
index 82e8aa7e18b9..5e4bb8b67042 100644
--- a/reference/tokenizer/functions/token-name.xml
+++ b/reference/tokenizer/functions/token-name.xml
@@ -56,18 +56,11 @@ echo token_name(T_FUNCTION); // -> "T_FUNCTION"
    </example>
   </para>
  </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link linkend="tokens">List of Parser Tokens</link></member>
-   </simplelist>
-  </para>
- </refsect1>
 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
+   <member><link linkend="tokens">List of Parser Tokens</link></member>
    <member><function>PhpToken::getTokenName</function></member>
   </simplelist>
  </refsect1>