From c3f17f9624a86c654ed87b9966c4a660bb27af2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Fern=C3=A1ndez?= <david@mundosaparte.com>
Date: Sun, 27 Oct 2024 11:43:03 +0100
Subject: [PATCH 1/3] [PHP 8.4] Add new constants and tokens from the tokenizer

---
 appendices/migration84/constants.xml | 15 +++++++++++++++
 appendices/tokens.xml                | 21 +++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/appendices/migration84/constants.xml b/appendices/migration84/constants.xml
index ca32ecd0ed68..3e888ac18287 100644
--- a/appendices/migration84/constants.xml
+++ b/appendices/migration84/constants.xml
@@ -299,6 +299,21 @@
   </simplelist>
  </sect2>
 
+ <sect2 xml:id="migration84.constants.tokenizer">
+  <title>Tokenizer</title>
+  <simplelist>
+   <member>
+    <constant>T_PUBLIC_SET</constant>
+   </member>
+   <member>
+    <constant>T_PROTECTED_SET</constant>
+   </member>
+   <member>
+    <constant>T_PRIVATE_SET</constant>
+   </member>
+  </simplelist>
+ </sect2>
+
 </sect1>
  <!-- Keep this comment at the end of the file
  Local variables:
diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index 85ca68647377..8812369f16dc 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -729,6 +729,27 @@ defined('T_FN') || define('T_FN', 10001);
       <link linkend="language.oop5">classes and objects</link> (available as of PHP 8.1.0)
      </entry>
     </row>
+    <row xml:id="constant.t-public-set">
+     <entry><constant>T_PUBLIC_SET</constant></entry>
+     <entry>public(set)</entry>
+     <entry>
+      property hooks (available as of PHP 8.4.0)
+     </entry>
+    </row>
+    <row xml:id="constant.t-protected-set">
+     <entry><constant>T_PROTECTED_SET</constant></entry>
+     <entry>protected(set)</entry>
+     <entry>
+      property hooks(available as of PHP 8.4.0)
+     </entry>
+    </row>
+    <row xml:id="constant.t-private-set">
+     <entry><constant>T_PRIVATE_SET</constant></entry>
+     <entry>private(set)</entry>
+     <entry>
+      property hooks (available as of PHP 8.4.0)
+     </entry>
+    </row>
     <row xml:id="constant.t-require">
      <entry><constant>T_REQUIRE</constant></entry>
      <entry>require</entry>

From 3be309bbe07f33c241d4cf8ba784da93444e013b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Fern=C3=A1ndez?= <david@mundosaparte.com>
Date: Tue, 29 Oct 2024 08:27:57 +0100
Subject: [PATCH 2/3] fix - missing space

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

diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index 8812369f16dc..b14232630f77 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -740,7 +740,7 @@ defined('T_FN') || define('T_FN', 10001);
      <entry><constant>T_PROTECTED_SET</constant></entry>
      <entry>protected(set)</entry>
      <entry>
-      property hooks(available as of PHP 8.4.0)
+      property hooks (available as of PHP 8.4.0)
      </entry>
     </row>
     <row xml:id="constant.t-private-set">

From 8838f7258df050db62d661e414a25e70b6ee97ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Fern=C3=A1ndez?= <david@mundosaparte.com>
Date: Tue, 29 Oct 2024 16:15:14 +0100
Subject: [PATCH 3/3] fix - these lists are ordered

---
 appendices/migration84/constants.xml | 26 ++++++++++----------
 appendices/tokens.xml                | 36 ++++++++++++++--------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/appendices/migration84/constants.xml b/appendices/migration84/constants.xml
index 3e888ac18287..a00cd7af282e 100644
--- a/appendices/migration84/constants.xml
+++ b/appendices/migration84/constants.xml
@@ -286,19 +286,6 @@
   </simplelist>
  </sect2>
 
- <sect2 xml:id="migration84.constants.xml">
-  <title>XML</title>
-
-  <simplelist>
-   <member>
-    <constant>XML_OPTION_PARSE_HUGE</constant>
-     which allows parsing large inputs with
-     <function>xml_parse</function> and
-     <function>xml_parse_into_struct</function>.
-   </member>
-  </simplelist>
- </sect2>
-
  <sect2 xml:id="migration84.constants.tokenizer">
   <title>Tokenizer</title>
   <simplelist>
@@ -314,6 +301,19 @@
   </simplelist>
  </sect2>
 
+ <sect2 xml:id="migration84.constants.xml">
+  <title>XML</title>
+
+  <simplelist>
+   <member>
+    <constant>XML_OPTION_PARSE_HUGE</constant>
+     which allows parsing large inputs with
+     <function>xml_parse</function> and
+     <function>xml_parse_into_struct</function>.
+   </member>
+  </simplelist>
+ </sect2>
+
 </sect1>
  <!-- Keep this comment at the end of the file
  Local variables:
diff --git a/appendices/tokens.xml b/appendices/tokens.xml
index b14232630f77..68e4ea02f531 100644
--- a/appendices/tokens.xml
+++ b/appendices/tokens.xml
@@ -708,6 +708,13 @@ defined('T_FN') || define('T_FN', 10001);
       <link linkend="language.oop5">classes and objects</link>
      </entry>
     </row>
+    <row xml:id="constant.t-private-set">
+     <entry><constant>T_PRIVATE_SET</constant></entry>
+     <entry>private(set)</entry>
+     <entry>
+      property hooks (available as of PHP 8.4.0)
+     </entry>
+    </row>
     <row xml:id="constant.t-protected">
      <entry><constant>T_PROTECTED</constant></entry>
      <entry>protected</entry>
@@ -715,6 +722,13 @@ defined('T_FN') || define('T_FN', 10001);
       <link linkend="language.oop5">classes and objects</link>
      </entry>
     </row>
+    <row xml:id="constant.t-protected-set">
+     <entry><constant>T_PROTECTED_SET</constant></entry>
+     <entry>protected(set)</entry>
+     <entry>
+      property hooks (available as of PHP 8.4.0)
+     </entry>
+    </row>
     <row xml:id="constant.t-public">
      <entry><constant>T_PUBLIC</constant></entry>
      <entry>public</entry>
@@ -722,13 +736,6 @@ defined('T_FN') || define('T_FN', 10001);
       <link linkend="language.oop5">classes and objects</link>
      </entry>
     </row>
-    <row xml:id="constant.t-readonly">
-     <entry><constant>T_READONLY</constant></entry>
-     <entry>readonly</entry>
-     <entry>
-      <link linkend="language.oop5">classes and objects</link> (available as of PHP 8.1.0)
-     </entry>
-    </row>
     <row xml:id="constant.t-public-set">
      <entry><constant>T_PUBLIC_SET</constant></entry>
      <entry>public(set)</entry>
@@ -736,18 +743,11 @@ defined('T_FN') || define('T_FN', 10001);
       property hooks (available as of PHP 8.4.0)
      </entry>
     </row>
-    <row xml:id="constant.t-protected-set">
-     <entry><constant>T_PROTECTED_SET</constant></entry>
-     <entry>protected(set)</entry>
-     <entry>
-      property hooks (available as of PHP 8.4.0)
-     </entry>
-    </row>
-    <row xml:id="constant.t-private-set">
-     <entry><constant>T_PRIVATE_SET</constant></entry>
-     <entry>private(set)</entry>
+    <row xml:id="constant.t-readonly">
+     <entry><constant>T_READONLY</constant></entry>
+     <entry>readonly</entry>
      <entry>
-      property hooks (available as of PHP 8.4.0)
+      <link linkend="language.oop5">classes and objects</link> (available as of PHP 8.1.0)
      </entry>
     </row>
     <row xml:id="constant.t-require">