From 25de58a9f2f4e08c6a5f5c076d4e0eb033064308 Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Tue, 8 Oct 2024 00:15:31 +0100
Subject: [PATCH 1/2] Deprecated mysqli_ping()

---
 reference/mysqli/mysqli/ping.xml      | 25 +++++++++++++++++++++++++
 reference/mysqli/mysqli/thread-id.xml |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/reference/mysqli/mysqli/ping.xml b/reference/mysqli/mysqli/ping.xml
index ae94281a3de0..8cb456b90d94 100644
--- a/reference/mysqli/mysqli/ping.xml
+++ b/reference/mysqli/mysqli/ping.xml
@@ -58,6 +58,31 @@
   &mysqli.conditionalexception;
  </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>
+       Both <methodname>mysqli::ping</methodname> and
+       <function>mysqli_ping</function> are now deprecated.
+       The <literal>reconnect</literal> feature has not been available
+       since PHP 8.2.0 making this function obsolete.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="examples">
   &reftitle.examples;
   <example>
diff --git a/reference/mysqli/mysqli/thread-id.xml b/reference/mysqli/mysqli/thread-id.xml
index 8fbaa0704dc7..cf65594d713e 100644
--- a/reference/mysqli/mysqli/thread-id.xml
+++ b/reference/mysqli/mysqli/thread-id.xml
@@ -21,7 +21,7 @@
    ID for the current connection which can then be killed using the
    <function>mysqli_kill</function> function. If the connection is lost
    and you reconnect with <function>mysqli_ping</function>, the thread ID
-   will be other. Therefore you should get the thread ID only when you need it.
+   will be different. Therefore you should get the thread ID only when you need it.
   </para>
   <note>
    <para>

From 769096e055965c6c0a230c01dc38a1fc28d1fbbc Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Tue, 8 Oct 2024 13:28:54 +0200
Subject: [PATCH 2/2] Update reference/mysqli/mysqli/ping.xml

Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
---
 reference/mysqli/mysqli/ping.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reference/mysqli/mysqli/ping.xml b/reference/mysqli/mysqli/ping.xml
index 8cb456b90d94..3260e6728d34 100644
--- a/reference/mysqli/mysqli/ping.xml
+++ b/reference/mysqli/mysqli/ping.xml
@@ -75,7 +75,7 @@
        Both <methodname>mysqli::ping</methodname> and
        <function>mysqli_ping</function> are now deprecated.
        The <literal>reconnect</literal> feature has not been available
-       since PHP 8.2.0 making this function obsolete.
+       as of PHP 8.2.0, making this function obsolete.
       </entry>
      </row>
     </tbody>