From fae84ddf986cd8253a2e70db163b8e1f0dc9736e Mon Sep 17 00:00:00 2001
From: GabrielCordeiroBarrosoTeles <gabrielpikachuoficial@gmail.com>
Date: Sun, 8 Mar 2026 22:54:08 -0300
Subject: [PATCH 1/2] Fix GH-1132: Document mb_strlen invalid encoding behavior
 change in PHP 8.0

---
 reference/mbstring/functions/mb-strlen.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/reference/mbstring/functions/mb-strlen.xml b/reference/mbstring/functions/mb-strlen.xml
index 45ffabd45f0b..f13311d84675 100644
--- a/reference/mbstring/functions/mb-strlen.xml
+++ b/reference/mbstring/functions/mb-strlen.xml
@@ -70,6 +70,14 @@
     </thead>
     <tbody>
      &mbstring.changelog.encoding-nullable;
+     <row>
+      <entry>8.0.0</entry>
+      <entry>
+       Passing an invalid encoding now throws a
+       <classname>ValueError</classname>. Previously, the return value was
+       undefined (could return &false;).
+      </entry>
+     </row>
     </tbody>
    </tgroup>
   </informaltable>

From b8c28b82b3a859d42f98494044e34c991db7fd00 Mon Sep 17 00:00:00 2001
From: GabrielCordeiroBarrosoTeles <gabrielpikachuoficial@gmail.com>
Date: Mon, 9 Mar 2026 17:52:45 -0300
Subject: [PATCH 2/2] Address review: use exceptionname, clarify false return
 before 8.0

---
 reference/mbstring/functions/mb-strlen.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reference/mbstring/functions/mb-strlen.xml b/reference/mbstring/functions/mb-strlen.xml
index f13311d84675..91fcf1a587af 100644
--- a/reference/mbstring/functions/mb-strlen.xml
+++ b/reference/mbstring/functions/mb-strlen.xml
@@ -74,8 +74,8 @@
       <entry>8.0.0</entry>
       <entry>
        Passing an invalid encoding now throws a
-       <classname>ValueError</classname>. Previously, the return value was
-       undefined (could return &false;).
+       <exceptionname>ValueError</exceptionname>. Previously, &false; was
+       returned.
       </entry>
      </row>
     </tbody>