ext/ldap: [RFC] Deprecate build with Oracle Instance Client version. (php#19809)

Author: devnexen

UPGRADING

@@ -438,6 +438,17 @@ PHP 8.5 UPGRADE NOTES
     by using the intl.use_exceptions INI setting.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_intlerror_level_ini_setting
 
+- LDAP:
+  - Specific Oracle Instant Client calls and constants have been deprecated.
+    List of affected calls:
+        ldap_connect with wallet support()
+        ldap_connect_wallet()
+    List of affected constants:
+        GSLC_SSL_NO_UATH
+        GSLC_SSL_ONEWAY_UATH
+        GSLC_SSL_TWOWAY_UATH
+    https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_building_ext_ldap_against_oracle_ldap
+
 - MySQLi:
   . The mysqli_execute() alias function has been deprecated.
     Use mysqli_stmt_execute() instead.

ext/ldap/config.m4

@@ -91,14 +91,17 @@ if test "$PHP_LDAP" != "no"; then
     elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then
       PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
       AC_DEFINE([HAVE_ORALDAP], [1])
+      AC_MSG_WARN([Build with Oracle Instant Client is deprecated as of PHP 8.5])
 
     elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
       PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
       AC_DEFINE([HAVE_ORALDAP], [1])
+      AC_MSG_WARN([Build with Oracle Instant Client is deprecated as of PHP 8.5])
 
     elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then
-       PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
-       AC_DEFINE([HAVE_ORALDAP], [1])
+      PHP_ADD_LIBRARY_WITH_PATH([clntsh], [$LDAP_LIBDIR], [LDAP_SHARED_LIBADD])
+      AC_DEFINE([HAVE_ORALDAP], [1])
+      AC_MSG_WARN([Build with Oracle Instant Client is deprecated as of PHP 8.5])
 
     else
       AC_MSG_ERROR([Cannot find ldap libraries in $LDAP_LIBDIR.])

ext/ldap/ldap.c

@@ -973,8 +973,7 @@ PHP_FUNCTION(ldap_connect)
 	LDAP *ldap = NULL;
 
 	if (ZEND_NUM_ARGS() > 2) {
-	    zend_error(E_DEPRECATED, "Calling ldap_connect() with Oracle-specific arguments is deprecated, "
-			"use ldap_connect_wallet() instead");
+	    zend_error(E_DEPRECATED, "Calling ldap_connect() with Oracle-specific arguments is deprecated");
 	} else if (ZEND_NUM_ARGS() == 2) {
 		zend_error(E_DEPRECATED, "Usage of ldap_connect with two arguments is deprecated");
 	}

ext/ldap/ldap.stub.php

@@ -208,16 +208,19 @@
      * @var int
      * @cvalue GSLC_SSL_NO_AUTH
      */
+    #[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
     const GSLC_SSL_NO_AUTH = UNKNOWN;
     /**
      * @var int
      * @cvalue GSLC_SSL_ONEWAY_AUTH
      */
+    #[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
     const GSLC_SSL_ONEWAY_AUTH = UNKNOWN;
     /**
      * @var int
      * @cvalue GSLC_SSL_TWOWAY_AUTH
      */
+    #[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
     const GSLC_SSL_TWOWAY_AUTH = UNKNOWN;
 #endif
 
@@ -624,8 +627,10 @@
 #endif
 
 #ifdef HAVE_ORALDAP
+    #[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
     function ldap_connect(?string $uri = null, int $port = 389, string $wallet = UNKNOWN, #[\SensitiveParameter] string $password = UNKNOWN, int $auth_mode = GSLC_SSL_NO_AUTH): LDAP\Connection|false {}
 #ifdef LDAP_API_FEATURE_X_OPENLDAP
+    #[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
     function ldap_connect_wallet(?string $uri = null, string $wallet, #[\SensitiveParameter] string $password, int $auth_mode = GSLC_SSL_NO_AUTH): LDAP\Connection|false {}
 #endif
 #else