From c5e4ca3b49d1d7bcf9509009ff34c72c5de5362d Mon Sep 17 00:00:00 2001
From: Jim Winstead <jimw@trainedmonkey.com>
Date: Tue, 29 Oct 2024 16:54:31 -0700
Subject: [PATCH 1/2] `php_uname()` now throws `ValueError` (fixes #3968)

---
 reference/info/functions/php-uname.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/reference/info/functions/php-uname.xml b/reference/info/functions/php-uname.xml
index 204aceaf7b2f..ce4eab41889e 100644
--- a/reference/info/functions/php-uname.xml
+++ b/reference/info/functions/php-uname.xml
@@ -89,6 +89,29 @@
   </para>
  </refsect1>
 
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <informaltable>
+   <tgroup cols="2">
+    <thead>
+     <row>
+      <entry>&Version;</entry>
+      <entry>&Description;</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>8.4.0</entry>
+      <entry>
+       Throws a <classname>ValueError</classname> when an invalid
+       <parameter>mode</parameter> is specified.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <para>

From 60d73d3b05ede5dc2711d132b692444bdae915e6 Mon Sep 17 00:00:00 2001
From: Jim Winstead <jimw@trainedmonkey.com>
Date: Tue, 29 Oct 2024 17:19:39 -0700
Subject: [PATCH 2/2] Be even more explicit about what 'a' means

---
 reference/info/functions/php-uname.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/reference/info/functions/php-uname.xml b/reference/info/functions/php-uname.xml
index ce4eab41889e..88f39d0bd207 100644
--- a/reference/info/functions/php-uname.xml
+++ b/reference/info/functions/php-uname.xml
@@ -40,10 +40,18 @@
        information is returned:
        <itemizedlist>
         <listitem>
-         <simpara>
-          <literal>'a'</literal>: This is the default. Contains all modes in
-          the sequence <literal>"s n r v m"</literal>.
-         </simpara>
+         <para>
+          <literal>'a'</literal>: This is the default. Returns the same
+          information as the individual modes
+          <simplelist type="inline">
+           <member><literal>'s'</literal></member>
+           <member><literal>'n'</literal></member>
+           <member><literal>'r'</literal></member>
+           <member><literal>'v'</literal></member>
+           <member><literal>'m'</literal></member>
+          </simplelist>
+          separated by spaces.
+         </para>
         </listitem>
         <listitem>
          <simpara>