Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions UPGRADING
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,16 @@ 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

- MySQLi:
. The mysqli_execute() alias function has been deprecated.
Use mysqli_stmt_execute() instead.
Expand Down
7 changes: 5 additions & 2 deletions ext/ldap/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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])

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])

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])

else
AC_MSG_ERROR([Cannot find ldap libraries in $LDAP_LIBDIR.])
Expand Down
3 changes: 1 addition & 2 deletions ext/ldap/ldap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
5 changes: 5 additions & 0 deletions ext/ldap/ldap.stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
49 changes: 43 additions & 6 deletions ext/ldap/ldap_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading