From 4dff41f2e3f0e747d48e2e7a60faa747ead4d469 Mon Sep 17 00:00:00 2001
From: Louis-Arnaud <la.catoire@gmail.com>
Date: Fri, 28 Aug 2026 08:06:35 +0200
Subject: [PATCH] ext/ldap: document PHP 8.5 changes

- Deprecate Oracle Instant Client constants (GSLC_SSL_NO_AUTH,
  GSLC_SSL_ONEWAY_AUTH, GSLC_SSL_TWOWAY_AUTH) and ldap_connect_wallet()
- ldap_connect() with Oracle wallet arguments is deprecated
- ldap_get_option() and ldap_set_option() now throw ValueError for
  invalid option values
---
 reference/ldap/constants.xml                  | 15 +++++-------
 .../ldap/functions/ldap-connect-wallet.xml    | 24 +++++++++++++++++++
 reference/ldap/functions/ldap-connect.xml     |  8 +++++++
 reference/ldap/functions/ldap-get-option.xml  |  2 ++
 reference/ldap/functions/ldap-set-option.xml  |  7 ++++++
 5 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/reference/ldap/constants.xml b/reference/ldap/constants.xml
index 40b5680ed884..31a0cc52e660 100644
--- a/reference/ldap/constants.xml
+++ b/reference/ldap/constants.xml
@@ -419,9 +419,8 @@
     (<type>int</type>)
    </term>
    <listitem>
-    <simpara>
-     SSL Authentication Mode - No authentication required. (Only for Oracle LDAP)
-    </simpara>
+    <simpara>SSL Authentication Mode - No authentication required. (Only for Oracle LDAP)</simpara>
+    <warning><simpara>Deprecated as of PHP 8.5.0.</simpara></warning>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.gslc-ssl-oneway-auth">
@@ -430,9 +429,8 @@
     (<type>int</type>)
    </term>
    <listitem>
-    <simpara>
-     SSL Authentication Mode - Only server authentication required. (Only for Oracle LDAP)
-    </simpara>
+    <simpara>SSL Authentication Mode - Only server authentication required. (Only for Oracle LDAP)</simpara>
+    <warning><simpara>Deprecated as of PHP 8.5.0.</simpara></warning>
    </listitem>
   </varlistentry>
   <varlistentry xml:id="constant.gslc-ssl-twoway-auth">
@@ -441,9 +439,8 @@
     (<type>int</type>)
    </term>
    <listitem>
-    <simpara>
-     SSL Authentication Mode - Both server and client authentication required. (Only for Oracle LDAP)
-    </simpara>
+    <simpara>SSL Authentication Mode - Both server and client authentication required. (Only for Oracle LDAP)</simpara>
+    <warning><simpara>Deprecated as of PHP 8.5.0.</simpara></warning>
    </listitem>
   </varlistentry>
 
diff --git a/reference/ldap/functions/ldap-connect-wallet.xml b/reference/ldap/functions/ldap-connect-wallet.xml
index a9ce8a2de017..6fc4db3e581e 100644
--- a/reference/ldap/functions/ldap-connect-wallet.xml
+++ b/reference/ldap/functions/ldap-connect-wallet.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
 <refentry xml:id="function.ldap-connect-wallet" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ldap_connect_wallet</refname>
@@ -72,6 +73,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.5.0</entry>
+      <entry>
+       This function has been deprecated. Oracle LDAP (Oracle Instant Client)
+       support is deprecated in PHP 8.5.0.
+      </entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </informaltable>
+ </refsect1>
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/ldap/functions/ldap-connect.xml b/reference/ldap/functions/ldap-connect.xml
index 03db3ea857d2..0e8dad191aff 100644
--- a/reference/ldap/functions/ldap-connect.xml
+++ b/reference/ldap/functions/ldap-connect.xml
@@ -115,6 +115,14 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.5.0</entry>
+      <entry>
+       Calling <function>ldap_connect</function> with Oracle wallet arguments
+       is deprecated. Oracle LDAP (Oracle Instant Client) support is deprecated
+       as of PHP 8.5.0.
+      </entry>
+     </row>
      <row>
       <entry>8.4.0</entry>
       <entry>
diff --git a/reference/ldap/functions/ldap-get-option.xml b/reference/ldap/functions/ldap-get-option.xml
index 591a59f8a739..d1cefb5b2e17 100644
--- a/reference/ldap/functions/ldap-get-option.xml
+++ b/reference/ldap/functions/ldap-get-option.xml
@@ -253,6 +253,8 @@
       <entry>8.5.0</entry>
       <entry>
        <parameter>ldap</parameter> is now nullable.
+       A <exceptionname>ValueError</exceptionname> is now thrown when passing an
+       invalid <parameter>option</parameter>.
       </entry>
      </row>
      &ldap.changelog.ldap-object;
diff --git a/reference/ldap/functions/ldap-set-option.xml b/reference/ldap/functions/ldap-set-option.xml
index eb7aade30a9d..26157bbd2666 100644
--- a/reference/ldap/functions/ldap-set-option.xml
+++ b/reference/ldap/functions/ldap-set-option.xml
@@ -261,6 +261,13 @@
      </row>
     </thead>
     <tbody>
+     <row>
+      <entry>8.5.0</entry>
+      <entry>
+       A <exceptionname>ValueError</exceptionname> is now thrown when passing an
+       invalid <parameter>option</parameter>.
+      </entry>
+     </row>
      &ldap.changelog.ldap-object;
     </tbody>
    </tgroup>