From c56c43c023fadbf06bbb82e85d081185f3fc7525 Mon Sep 17 00:00:00 2001
From: lacatoire <la.catoire@gmail.com>
Date: Fri, 6 Feb 2026 14:57:23 +0100
Subject: [PATCH 1/4] Fix 5 class method signatures to match php-src stubs

- PDOStatement::setFetchMode: bool -> true
- Phar::setStub: bool -> true
- PharData::setStub: bool -> true, $len -> $length
- ReflectionClass::getStaticPropertyValue: $def_value -> $default
- IntlBreakIterator::getPartsIterator: param type string -> int
---
 .../intlbreakiterator/getpartsiterator.xml    |  2 +-
 reference/pdo/pdostatement/setfetchmode.xml   | 27 +++++++++++++++----
 reference/phar/Phar/setStub.xml               |  5 ++--
 reference/phar/PharData/setStub.xml           | 25 ++++++++++++++---
 .../getstaticpropertyvalue.xml                |  4 +--
 5 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/reference/intl/intlbreakiterator/getpartsiterator.xml b/reference/intl/intlbreakiterator/getpartsiterator.xml
index bc6cb65480ac..27360b1ba8a7 100644
--- a/reference/intl/intlbreakiterator/getpartsiterator.xml
+++ b/reference/intl/intlbreakiterator/getpartsiterator.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis role="IntlBreakIterator">
    <modifier>public</modifier> <type>IntlPartsIterator</type><methodname>IntlBreakIterator::getPartsIterator</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter><initializer><constant>IntlPartsIterator::KEY_SEQUENTIAL</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>IntlPartsIterator::KEY_SEQUENTIAL</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
 
diff --git a/reference/pdo/pdostatement/setfetchmode.xml b/reference/pdo/pdostatement/setfetchmode.xml
index 9cf0fa78a673..1381cac2d15c 100644
--- a/reference/pdo/pdostatement/setfetchmode.xml
+++ b/reference/pdo/pdostatement/setfetchmode.xml
@@ -11,25 +11,25 @@
   &reftitle.description;
 
   <methodsynopsis role="PDOStatement">
-   <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
+   <modifier>public</modifier> <type>true</type><methodname>PDOStatement::setFetchMode</methodname>
    <methodparam><type>int</type><parameter>mode</parameter></methodparam>
   </methodsynopsis>
 
   <methodsynopsis role="PDOStatement">
-   <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
+   <modifier>public</modifier> <type>true</type><methodname>PDOStatement::setFetchMode</methodname>
    <methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_COLUMN</initializer></methodparam>
    <methodparam><type>int</type><parameter>colno</parameter></methodparam>
   </methodsynopsis>
 
   <methodsynopsis role="PDOStatement">
-   <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
+   <modifier>public</modifier> <type>true</type><methodname>PDOStatement::setFetchMode</methodname>
    <methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_CLASS</initializer></methodparam>
    <methodparam><type>string</type><parameter>class</parameter></methodparam>
    <methodparam><type class="union"><type>array</type><type>null</type></type><parameter>constructorArgs</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
 
   <methodsynopsis role="PDOStatement">
-   <modifier>public</modifier> <type>bool</type><methodname>PDOStatement::setFetchMode</methodname>
+   <modifier>public</modifier> <type>true</type><methodname>PDOStatement::setFetchMode</methodname>
    <methodparam><type>int</type><parameter>mode</parameter><initializer>PDO::FETCH_INTO</initializer></methodparam>
    <methodparam><type>object</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
@@ -88,10 +88,27 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.success;
+   &return.true.always;
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &return.type.true;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/phar/Phar/setStub.xml b/reference/phar/Phar/setStub.xml
index c369e22b4d43..4c3d01399ed1 100644
--- a/reference/phar/Phar/setStub.xml
+++ b/reference/phar/Phar/setStub.xml
@@ -8,7 +8,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="Phar">
-   <modifier>public</modifier> <type>bool</type><methodname>Phar::setStub</methodname>
+   <modifier>public</modifier> <type>true</type><methodname>Phar::setStub</methodname>
    <methodparam><type class="union"><type>resource</type><type>string</type></type><parameter>stub</parameter></methodparam>
    <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
@@ -72,7 +72,7 @@ include 'phar://myphar.phar/somefile.php';
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.success;
+   &return.true.always;
   </para>
  </refsect1>
 
@@ -98,6 +98,7 @@ include 'phar://myphar.phar/somefile.php';
      </row>
     </thead>
     <tbody>
+     &return.type.true;
      <row>
       <entry>8.3.0</entry>
       <entry>
diff --git a/reference/phar/PharData/setStub.xml b/reference/phar/PharData/setStub.xml
index 8f5ffdd5376b..bff2c91596dd 100644
--- a/reference/phar/PharData/setStub.xml
+++ b/reference/phar/PharData/setStub.xml
@@ -8,9 +8,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis role="PharData">
-   <modifier>public</modifier> <type>bool</type><methodname>PharData::setStub</methodname>
+   <modifier>public</modifier> <type>true</type><methodname>PharData::setStub</methodname>
    <methodparam><type>string</type><parameter>stub</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>len</parameter><initializer>-1</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>-1</initializer></methodparam>
   </methodsynopsis>
 
 
@@ -34,7 +34,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>len</parameter></term>
+     <term><parameter>length</parameter></term>
      <listitem>
       <para>
        
@@ -49,7 +49,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   &return.success;
+   &return.true.always;
   </para>
  </refsect1>
 
@@ -60,6 +60,23 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     &return.type.true;
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/reflection/reflectionclass/getstaticpropertyvalue.xml b/reference/reflection/reflectionclass/getstaticpropertyvalue.xml
index e010b312cf7f..243d997e8e15 100644
--- a/reference/reflection/reflectionclass/getstaticpropertyvalue.xml
+++ b/reference/reflection/reflectionclass/getstaticpropertyvalue.xml
@@ -12,7 +12,7 @@
   <methodsynopsis role="ReflectionClass">
    <modifier>public</modifier> <type>mixed</type><methodname>ReflectionClass::getStaticPropertyValue</methodname>
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter role="reference">def_value</parameter></methodparam>
+   <methodparam choice="opt"><type>mixed</type><parameter role="reference">default</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the value of a static property on this class.
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>def_value</parameter></term>
+     <term><parameter>default</parameter></term>
      <listitem>
       <para>
        A default value to return in case the class does not declare a static

From 47736da99f5f0cabbcbac1c92742ed555a020b6b Mon Sep 17 00:00:00 2001
From: lacatoire <la.catoire@gmail.com>
Date: Wed, 22 Apr 2026 15:01:33 +0200
Subject: [PATCH 2/4] Use explicit 8.4.0 changelog rows instead of
 &return.type.true; (which is 8.2.0)

---
 reference/pdo/pdostatement/setfetchmode.xml | 7 ++++++-
 reference/phar/Phar/setStub.xml             | 7 ++++++-
 reference/phar/PharData/setStub.xml         | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/reference/pdo/pdostatement/setfetchmode.xml b/reference/pdo/pdostatement/setfetchmode.xml
index 1381cac2d15c..93fc45aaaa5f 100644
--- a/reference/pdo/pdostatement/setfetchmode.xml
+++ b/reference/pdo/pdostatement/setfetchmode.xml
@@ -103,7 +103,12 @@
      </row>
     </thead>
     <tbody>
-     &return.type.true;
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       The return type is &true; now; previously, it was <type>bool</type>.
+      </entry>
+     </row>
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/phar/Phar/setStub.xml b/reference/phar/Phar/setStub.xml
index 4c3d01399ed1..0b4028b7282b 100644
--- a/reference/phar/Phar/setStub.xml
+++ b/reference/phar/Phar/setStub.xml
@@ -98,7 +98,12 @@ include 'phar://myphar.phar/somefile.php';
      </row>
     </thead>
     <tbody>
-     &return.type.true;
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       The return type is &true; now; previously, it was <type>bool</type>.
+      </entry>
+     </row>
      <row>
       <entry>8.3.0</entry>
       <entry>
diff --git a/reference/phar/PharData/setStub.xml b/reference/phar/PharData/setStub.xml
index bff2c91596dd..4ed7c1cf208a 100644
--- a/reference/phar/PharData/setStub.xml
+++ b/reference/phar/PharData/setStub.xml
@@ -71,7 +71,12 @@
      </row>
     </thead>
     <tbody>
-     &return.type.true;
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       The return type is &true; now; previously, it was <type>bool</type>.
+      </entry>
+     </row>
     </tbody>
    </tgroup>
   </informaltable>

From d00e9e89540d39050ebdb0494e99808cdf6d4564 Mon Sep 17 00:00:00 2001
From: lacatoire <la.catoire@gmail.com>
Date: Mon, 11 May 2026 20:29:50 +0200
Subject: [PATCH 3/4] Address review feedback

- IntlBreakIterator::getPartsIterator: revert param type to string;
  the int change in php-src (master only) is not backported to
  PHP-8.4/8.5, so documented versions must keep string.
- Factor the 8.4.0 "return type true" changelog row into a new
  shared entity return.type.true.84, mirroring return.type.true.
---
 language-snippets.ent                                 | 7 +++++++
 reference/intl/intlbreakiterator/getpartsiterator.xml | 2 +-
 reference/pdo/pdostatement/setfetchmode.xml           | 7 +------
 reference/phar/Phar/setStub.xml                       | 7 +------
 reference/phar/PharData/setStub.xml                   | 7 +------
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/language-snippets.ent b/language-snippets.ent
index 7d4211215ab2..2c3dfc8bbcd0 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -835,6 +835,13 @@ searched for within the <link xmlns="http://docbook.org/ns/docbook" linkend="ini
  </entry>
 </row>'>
 
+<!ENTITY return.type.true.84 '<row xmlns="http://docbook.org/ns/docbook">
+ <entry>8.4.0</entry>
+ <entry>
+  The return type is &true; now; previously, it was <type>bool</type>.
+ </entry>
+</row>'>
+
 <!ENTITY return.falseforfailure ' or &false; on failure'>
 <!ENTITY return.falseforfailure.style.procedural '&style.procedural; returns &false; on failure.'>
 
diff --git a/reference/intl/intlbreakiterator/getpartsiterator.xml b/reference/intl/intlbreakiterator/getpartsiterator.xml
index 27360b1ba8a7..bc6cb65480ac 100644
--- a/reference/intl/intlbreakiterator/getpartsiterator.xml
+++ b/reference/intl/intlbreakiterator/getpartsiterator.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis role="IntlBreakIterator">
    <modifier>public</modifier> <type>IntlPartsIterator</type><methodname>IntlBreakIterator::getPartsIterator</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>IntlPartsIterator::KEY_SEQUENTIAL</constant></initializer></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>type</parameter><initializer><constant>IntlPartsIterator::KEY_SEQUENTIAL</constant></initializer></methodparam>
   </methodsynopsis>
   <para>
 
diff --git a/reference/pdo/pdostatement/setfetchmode.xml b/reference/pdo/pdostatement/setfetchmode.xml
index 93fc45aaaa5f..4b9565c54d87 100644
--- a/reference/pdo/pdostatement/setfetchmode.xml
+++ b/reference/pdo/pdostatement/setfetchmode.xml
@@ -103,12 +103,7 @@
      </row>
     </thead>
     <tbody>
-     <row>
-      <entry>8.4.0</entry>
-      <entry>
-       The return type is &true; now; previously, it was <type>bool</type>.
-      </entry>
-     </row>
+     &return.type.true.84;
     </tbody>
    </tgroup>
   </informaltable>
diff --git a/reference/phar/Phar/setStub.xml b/reference/phar/Phar/setStub.xml
index 0b4028b7282b..10bb3ae19a48 100644
--- a/reference/phar/Phar/setStub.xml
+++ b/reference/phar/Phar/setStub.xml
@@ -98,12 +98,7 @@ include 'phar://myphar.phar/somefile.php';
      </row>
     </thead>
     <tbody>
-     <row>
-      <entry>8.4.0</entry>
-      <entry>
-       The return type is &true; now; previously, it was <type>bool</type>.
-      </entry>
-     </row>
+     &return.type.true.84;
      <row>
       <entry>8.3.0</entry>
       <entry>
diff --git a/reference/phar/PharData/setStub.xml b/reference/phar/PharData/setStub.xml
index 4ed7c1cf208a..7981fd3745af 100644
--- a/reference/phar/PharData/setStub.xml
+++ b/reference/phar/PharData/setStub.xml
@@ -71,12 +71,7 @@
      </row>
     </thead>
     <tbody>
-     <row>
-      <entry>8.4.0</entry>
-      <entry>
-       The return type is &true; now; previously, it was <type>bool</type>.
-      </entry>
-     </row>
+     &return.type.true.84;
     </tbody>
    </tgroup>
   </informaltable>

From eb40a6c85b3965371cf994e575bb97485f507c2a Mon Sep 17 00:00:00 2001
From: lacatoire <la.catoire@gmail.com>
Date: Sat, 23 May 2026 22:59:30 +0200
Subject: [PATCH 4/4] Use simpara for return value paragraphs (style guide)

---
 reference/pdo/pdostatement/setfetchmode.xml | 4 ++--
 reference/phar/Phar/setStub.xml             | 4 ++--
 reference/phar/PharData/setStub.xml         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/reference/pdo/pdostatement/setfetchmode.xml b/reference/pdo/pdostatement/setfetchmode.xml
index 4b9565c54d87..8c7354f4ad1e 100644
--- a/reference/pdo/pdostatement/setfetchmode.xml
+++ b/reference/pdo/pdostatement/setfetchmode.xml
@@ -87,9 +87,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.true.always;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="changelog">
diff --git a/reference/phar/Phar/setStub.xml b/reference/phar/Phar/setStub.xml
index 10bb3ae19a48..240d34dce6e6 100644
--- a/reference/phar/Phar/setStub.xml
+++ b/reference/phar/Phar/setStub.xml
@@ -71,9 +71,9 @@ include 'phar://myphar.phar/somefile.php';
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.true.always;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="errors">
diff --git a/reference/phar/PharData/setStub.xml b/reference/phar/PharData/setStub.xml
index 7981fd3745af..572169f50b43 100644
--- a/reference/phar/PharData/setStub.xml
+++ b/reference/phar/PharData/setStub.xml
@@ -48,9 +48,9 @@
 
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
-  <para>
+  <simpara>
    &return.true.always;
-  </para>
+  </simpara>
  </refsect1>
 
  <refsect1 role="errors">