From 888cf7026eade79675a8290e5d9518ff2c8b7fde Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Wed, 23 Oct 2024 22:58:23 +0100
Subject: [PATCH 1/6] Some fixes to the 8.4 migration guide

---
 appendices/migration84/incompatible.xml  | 16 ++++-----
 appendices/migration84/other-changes.xml | 43 +++++++++++++++---------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/appendices/migration84/incompatible.xml b/appendices/migration84/incompatible.xml
index 5eda276ae96e..d1485e19a2db 100644
--- a/appendices/migration84/incompatible.xml
+++ b/appendices/migration84/incompatible.xml
@@ -459,9 +459,9 @@
 
   <simpara>
    Some DOM methods previously returned &false; or a
-   <constant>PHP_ERR</constant> <exceptionname>DOMException</exceptionname>
+   <constant>DOM_PHP_ERR</constant> <exceptionname>DOMException</exceptionname>
    if a new node could not be allocated.
-   They now consistently throw an <constant>INVALID_STATE_ERR</constant>
+   They now consistently throw an <constant>DOM_INVALID_STATE_ERR</constant>
    <exceptionname>DOMException</exceptionname>.
    This situation is extremely unlikely and the probability of being affected
    is low.
@@ -626,8 +626,8 @@
   <title>PDO_DBLIB</title>
 
   <simpara>
-   The <constant>DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER</constant> and
-   <constant>DBLIB_ATTR_DATETIME_CONVERT</constant> attributes now act as
+   The <constant>Pdo\Dblib::ATTR_STRINGIFY_UNIQUEIDENTIFIER</constant> and
+   <constant>Pdo\Dblib::ATTR_DATETIME_CONVERT</constant> attributes now act as
    boolean attributes instead of integer attributes.
    Thus setting the attribute via <methodname>PDO::setAttribute</methodname>
    and retrieving it via <methodname>PDO::getAttribute</methodname> expects
@@ -639,7 +639,7 @@
   <title>PDO_FIREBIRD</title>
 
   <simpara>
-   The <constant>ATTR_AUTOCOMMIT</constant> attribute now act as
+   The <constant>PDO::ATTR_AUTOCOMMIT</constant> attribute now act as
    boolean attributes instead of integer attributes.
    Thus setting the attribute via <methodname>PDO::setAttribute</methodname>
    and retrieving it via <methodname>PDO::getAttribute</methodname> expects
@@ -657,9 +657,9 @@
   <title>PDO_MYSQL</title>
 
   <simpara>
-   The <constant>ATTR_AUTOCOMMIT</constant>,
-   <constant>ATTR_EMULATE_PREPARES</constant>, and
-   <constant>MYSQL_ATTR_DIRECT_QUERY</constant> attributes now act as
+   The <constant>PDO::ATTR_AUTOCOMMIT</constant>,
+   <constant>PDO::ATTR_EMULATE_PREPARES</constant>, and
+   <constant>PDO::MYSQL_ATTR_DIRECT_QUERY</constant> attributes now act as
    boolean attributes instead of integer attributes.
    Thus setting the attribute via <methodname>PDO::setAttribute</methodname>
    and retrieving it via <methodname>PDO::getAttribute</methodname> expects
diff --git a/appendices/migration84/other-changes.xml b/appendices/migration84/other-changes.xml
index 9427ad276457..7798f9e0b258 100644
--- a/appendices/migration84/other-changes.xml
+++ b/appendices/migration84/other-changes.xml
@@ -371,7 +371,7 @@
 
    <simpara>
     The <parameter>backlog</parameter> parameter of
-    <function>socket_create_listen(</function> now has a default value of
+    <function>socket_create_listen</function> now has a default value of
     <constant>SOMAXCONN</constant>.
     Previously, it was <literal>128</literal>.
    </simpara>
@@ -446,14 +446,23 @@
     <title>Rounding with <function>round</function></title>
 
     <simpara>
-     The $mode parameter of the round() function has been widened to RoundingMode|int,
-     accepting instances of a new RoundingMode enum.
+     The <parameter>mode</parameter> parameter of the
+     <function>round</function> function has been widened to
+     <!-- TODO Proper union type -->
+     <literal>RoundingMode|int</literal>,
+     <!-- TODO should be <enumname> ? -->
+     accepting instances of a new <classname>RoundingMode</classname> enum.
      <!-- RFC: https://wiki.php.net/rfc/correctly_name_the_rounding_mode_and_make_it_an_enum -->
     </simpara>
 
     <simpara>
-     Four new modes have been added to the round() function: RoundingMode::PositiveInfinity,
-     RoundingMode::NegativeInfinity, RoundingMode::TowardsZero, RoundingMode::AwayFromZero.
+     Four new modes have been added to the <function>round</function> function:
+     <simplelist type="inline">
+      <member><enumidentifier>RoundingMode::PositiveInfinity</enumidentifier></member>
+      <member><enumidentifier>RoundingMode::NegativeInfinity</enumidentifier></member>
+      <member><enumidentifier>RoundingMode::TowardsZero</enumidentifier></member>
+      <member><enumidentifier>RoundingMode::AwayFromZero</enumidentifier></member>
+     </simplelist>
      <!-- RFC: https://wiki.php.net/rfc/new_rounding_modes_to_round_function -->
     </simpara>
 
@@ -461,24 +470,26 @@
      The internal implementation for rounding to integers has been rewritten
      to be easier to verify for correctness and to be easier to maintain.
      Some rounding bugs have been fixed as a result of the rewrite.
-     For example previously rounding 0.49999999999999994 to the nearest integer
-     would have resulted in 1.0 instead of the correct result 0.0.
+     For example previously rounding <literal>0.49999999999999994</literal>
+     to the nearest integer would have resulted in <literal>1.0</literal>
+     instead of the correct result <literal>0.0</literal>.
      Additional inputs might also be affected and result in different outputs
      compared to earlier PHP versions.
     </simpara>
 
     <simpara>
-     Fixed a bug caused by "pre-rounding" of the round() function.
-     Previously, using "pre-rounding" to treat a value like 0.285
-     (actually 0.28499999999999998) as a decimal number and round it to 0.29.
+     Fixed a bug caused by "pre-rounding" of the <function>round</function> function.
+     Previously, using "pre-rounding" to treat a value like <literal>0.285</literal>
+     (actually <literal>0.28499999999999998</literal>) as a decimal number
+     and round it to <literal>0.29</literal>.
      However, "pre-rounding" incorrectly rounds certain numbers,
      so this fix removes "pre-rounding" and changes the way numbers are compared,
      so that the values are correctly rounded as decimal numbers.
     </simpara>
 
     <simpara>
-     The maximum precision that can be handled by round() has been extended
-     by one digit.
+     The maximum precision that can be handled by <function>round</function>
+     has been extended by one digit.
      For example, <code>round(4503599627370495.5)</code> returned in
      <literal>4503599627370495.5</literal>,
      but now returns <literal>4503599627370496</literal>.
@@ -617,9 +628,9 @@
    <simpara>
     Improved the performance of floating point number parsing and formatting in
     ZTS builds under highly concurrent loads.
-    This affects the <function>printf()</function> family of functions as well
+    This affects the <function>printf</function> family of functions as well
     as serialization functions such as <function>json_encode</function>,
-    or <function>serialize()</function>.
+    or <function>serialize</function>.
    </simpara>
 
    <simpara>
@@ -642,7 +653,7 @@
    <title>DOM</title>
 
    <simpara>
-    The performance of <methodname>DOMNode::C14N()</methodname> is greatly
+    The performance of <methodname>DOMNode::C14N</methodname> is greatly
     improved for the case without an xpath query.
     This can give a time improvement of easily two order of
     magnitude for documents with tens of thousands of nodes.
@@ -717,7 +728,7 @@
     Improved the performance of <classname>\Random\Randomizer</classname>,
     with a specific focus on the
     <methodname>\Random\Randomizer::getBytes</methodname>,
-    and <methodname>getBytesFromString()</methodname> methods.
+    and <methodname>\Random\Randomizer::getBytesFromString</methodname> methods.
    </simpara>
   </sect3>
 

From 61073e33b0b1bca8df66459100d09a3e219d728c Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Wed, 23 Oct 2024 23:23:31 +0100
Subject: [PATCH 2/6] Fixup

---
 appendices/migration84/other-changes.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appendices/migration84/other-changes.xml b/appendices/migration84/other-changes.xml
index 7798f9e0b258..373f149a4949 100644
--- a/appendices/migration84/other-changes.xml
+++ b/appendices/migration84/other-changes.xml
@@ -455,7 +455,7 @@
      <!-- RFC: https://wiki.php.net/rfc/correctly_name_the_rounding_mode_and_make_it_an_enum -->
     </simpara>
 
-    <simpara>
+    <para>
      Four new modes have been added to the <function>round</function> function:
      <simplelist type="inline">
       <member><enumidentifier>RoundingMode::PositiveInfinity</enumidentifier></member>
@@ -464,7 +464,7 @@
       <member><enumidentifier>RoundingMode::AwayFromZero</enumidentifier></member>
      </simplelist>
      <!-- RFC: https://wiki.php.net/rfc/new_rounding_modes_to_round_function -->
-    </simpara>
+    </para>
 
     <simpara>
      The internal implementation for rounding to integers has been rewritten

From a1b79176ee43c32fc00006f745129c069e7c8868 Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Wed, 23 Oct 2024 23:32:50 +0100
Subject: [PATCH 3/6] Drop enum case handling

---
 appendices/migration84/other-changes.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appendices/migration84/other-changes.xml b/appendices/migration84/other-changes.xml
index 373f149a4949..d36c8c3653dc 100644
--- a/appendices/migration84/other-changes.xml
+++ b/appendices/migration84/other-changes.xml
@@ -458,10 +458,10 @@
     <para>
      Four new modes have been added to the <function>round</function> function:
      <simplelist type="inline">
-      <member><enumidentifier>RoundingMode::PositiveInfinity</enumidentifier></member>
-      <member><enumidentifier>RoundingMode::NegativeInfinity</enumidentifier></member>
-      <member><enumidentifier>RoundingMode::TowardsZero</enumidentifier></member>
-      <member><enumidentifier>RoundingMode::AwayFromZero</enumidentifier></member>
+      <member><!-- <enumidentifier> -->RoundingMode::PositiveInfinity<!-- </enumidentifier> --></member>
+      <member><!-- <enumidentifier> -->RoundingMode::NegativeInfinity<!-- </enumidentifier> --></member>
+      <member><!-- <enumidentifier> -->RoundingMode::TowardsZero<!-- </enumidentifier> --></member>
+      <member><!-- <enumidentifier> -->RoundingMode::AwayFromZero<!-- </enumidentifier> --></member>
      </simplelist>
      <!-- RFC: https://wiki.php.net/rfc/new_rounding_modes_to_round_function -->
     </para>

From 7c8e187f511c9fcd36eb35c77c1ba56065b867ed Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Thu, 24 Oct 2024 14:10:52 +0100
Subject: [PATCH 4/6] Fix leading backslash

---
 appendices/migration84/deprecated.xml    | 2 +-
 appendices/migration84/other-changes.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/appendices/migration84/deprecated.xml b/appendices/migration84/deprecated.xml
index b814148a037c..47391c66392b 100644
--- a/appendices/migration84/deprecated.xml
+++ b/appendices/migration84/deprecated.xml
@@ -337,7 +337,7 @@ class _MyClass {}
   <simpara>
    <function>lcg_value</function> is now deprecated,
    as the function is broken in multiple ways.
-   Use <methodname>\Random\Randomizer::getFloat</methodname> instead.
+   Use <methodname>Random\Randomizer::getFloat</methodname> instead.
   </simpara>
  </sect2>
 
diff --git a/appendices/migration84/other-changes.xml b/appendices/migration84/other-changes.xml
index d36c8c3653dc..2d9e67192dac 100644
--- a/appendices/migration84/other-changes.xml
+++ b/appendices/migration84/other-changes.xml
@@ -725,10 +725,10 @@
    <title>Random</title>
 
    <simpara>
-    Improved the performance of <classname>\Random\Randomizer</classname>,
+    Improved the performance of <classname>Random\Randomizer</classname>,
     with a specific focus on the
-    <methodname>\Random\Randomizer::getBytes</methodname>,
-    and <methodname>\Random\Randomizer::getBytesFromString</methodname> methods.
+    <methodname>Random\Randomizer::getBytes</methodname>,
+    and <methodname>Random\Randomizer::getBytesFromString</methodname> methods.
    </simpara>
   </sect3>
 

From 54a7727c29fff15e0a8e138a90a1604e52f14b9e Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Thu, 24 Oct 2024 14:13:00 +0100
Subject: [PATCH 5/6] Reprhase DOM error

---
 appendices/migration84/incompatible.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appendices/migration84/incompatible.xml b/appendices/migration84/incompatible.xml
index d1485e19a2db..6e500f2484ee 100644
--- a/appendices/migration84/incompatible.xml
+++ b/appendices/migration84/incompatible.xml
@@ -459,10 +459,10 @@
 
   <simpara>
    Some DOM methods previously returned &false; or a
-   <constant>DOM_PHP_ERR</constant> <exceptionname>DOMException</exceptionname>
-   if a new node could not be allocated.
-   They now consistently throw an <constant>DOM_INVALID_STATE_ERR</constant>
-   <exceptionname>DOMException</exceptionname>.
+   <exceptionname>DOMException</exceptionname> with code
+   <constant>DOM_PHP_ERR</constant> if a new node could not be allocated.
+   They now consistently throw a <exceptionname>DOMException</exceptionname>
+   with code <constant>DOM_INVALID_STATE_ERR</constant>.
    This situation is extremely unlikely and the probability of being affected
    is low.
    As a result <methodname>DOMImplementation::createDocument</methodname>

From fa276626226d978e20cb258949187edccb0d263c Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Thu, 24 Oct 2024 14:13:20 +0100
Subject: [PATCH 6/6] Add missing word

---
 appendices/migration84/deprecated.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appendices/migration84/deprecated.xml b/appendices/migration84/deprecated.xml
index 47391c66392b..c4c8229ae0e6 100644
--- a/appendices/migration84/deprecated.xml
+++ b/appendices/migration84/deprecated.xml
@@ -91,7 +91,7 @@ function foo(T1 $a, ?T2 $b, T3 $c) {}
 
    <simpara>
     This affects the exponentiation operator <literal>**</literal>
-    and the <function>pow</function>.
+    and the <function>pow</function> function.
    </simpara>
 
    <simpara>