From 2a5791712404a296f8b998372c78df0db048d082 Mon Sep 17 00:00:00 2001
From: Ayesh Karunaratne <ayesh@aye.sh>
Date: Sat, 16 Nov 2024 13:58:21 +0700
Subject: [PATCH 1/3] [PHP 8.4] PCRE: Add `/r` modifier

---
 reference/pcre/pattern.modifiers.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/reference/pcre/pattern.modifiers.xml b/reference/pcre/pattern.modifiers.xml
index d26ab6fb1c9f..b80c7f3683b7 100644
--- a/reference/pcre/pattern.modifiers.xml
+++ b/reference/pcre/pattern.modifiers.xml
@@ -187,6 +187,22 @@
        </simpara>
       </listitem>
      </varlistentry>
+     <varlistentry>
+      <term><emphasis>r</emphasis> (<literal>PCRE2_EXTRA_CASELESS_RESTRICT</literal>)</term>
+      <listitem>
+       <simpara>
+        When <emphasis>u</emphasis> (<literal>PCRE_UTF8</literal>) and <emphasis>i</emphasis> (<literal>PCRE_CASELESS</literal>)
+        are in effect, this modifier prevents matching across ASCII and non-ASCII characters.
+       </simpara>
+       <simpara>
+        For example, <code>preg_match('/\x{212A}/iu', "K")</code> matches the Kelvin sign <literal>K</literal> (U+212A).
+        When <emphasis>u</emphasis> is used (<code>preg_match('/\x{212A}/iur', "K")</code>), it does not match.
+       </simpara>
+       <simpara>
+        Available as of PHP 8.4.0.
+       </simpara>
+      </listitem>
+     </varlistentry>
     </variablelist>
    </blockquote>
   </para>

From 8d3c7b01550d38390cea28c31f082b8fa77a1b62 Mon Sep 17 00:00:00 2001
From: Ayesh Karunaratne <ayesh@aye.sh>
Date: Sat, 16 Nov 2024 13:58:48 +0700
Subject: [PATCH 2/3] [PHP 8.4] PCRE: Add PCRE2-v10.44 quantifier changes

---
 reference/pcre/pattern.syntax.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/reference/pcre/pattern.syntax.xml b/reference/pcre/pattern.syntax.xml
index 7182b0e5c020..757b11d7368c 100644
--- a/reference/pcre/pattern.syntax.xml
+++ b/reference/pcre/pattern.syntax.xml
@@ -1573,11 +1573,22 @@
 
    <literal>\d{8}</literal>
 
-   matches exactly 8 digits. An opening curly bracket that
+   matches exactly 8 digits.
+
+  </para>
+  <para>
+   Prior to PHP 8.4.0, an opening curly bracket that
    appears in a position where a quantifier is not allowed, or
    one that does not match the syntax of a quantifier, is taken
-   as a literal character. For example, {,6} is not a quantifier,
-   but a literal string of four characters.
+   as a literal character. For example, <literal>{,6}</literal>
+   is not a quantifier, but a literal string of four characters.
+
+   As of PHP 8.4.0, the PCRE extension is bundled with PCRE2 version 10.44,
+   which allows patterns such as <literal>\d{,8}</literal> and they are
+   interpreted as <literal>\d{0,8}</literal>.
+
+   Further, as of PHP 8.4.0, space characters around quantifiers such as
+   <literal>\d{0 , 8}</literal> and <literal>\d{ 0 , 8 }</literal> are allowed.
   </para>
   <para>
    The quantifier {0} is permitted, causing the expression to

From bc9f56bdbe3aa878d4b5d2db92bebf5fc8a5fc19 Mon Sep 17 00:00:00 2001
From: Gina Peter Banyard <girgias@php.net>
Date: Wed, 20 Nov 2024 16:56:58 +0000
Subject: [PATCH 3/3] simpara

---
 reference/pcre/pattern.syntax.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/pcre/pattern.syntax.xml b/reference/pcre/pattern.syntax.xml
index 757b11d7368c..6dbc6c753226 100644
--- a/reference/pcre/pattern.syntax.xml
+++ b/reference/pcre/pattern.syntax.xml
@@ -1576,7 +1576,7 @@
    matches exactly 8 digits.
 
   </para>
-  <para>
+  <simpara>
    Prior to PHP 8.4.0, an opening curly bracket that
    appears in a position where a quantifier is not allowed, or
    one that does not match the syntax of a quantifier, is taken
@@ -1589,7 +1589,7 @@
 
    Further, as of PHP 8.4.0, space characters around quantifiers such as
    <literal>\d{0 , 8}</literal> and <literal>\d{ 0 , 8 }</literal> are allowed.
-  </para>
+  </simpara>
   <para>
    The quantifier {0} is permitted, causing the expression to
    behave as if the previous item and the quantifier were not