Skip to content

Commit 5132197

Browse files
committed
deprecate ldap_connect_wallet()
1 parent 13cca38 commit 5132197

File tree

3 files changed

+49
-8
lines changed

3 files changed

+49
-8
lines changed

ext/ldap/ldap.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -973,8 +973,7 @@ PHP_FUNCTION(ldap_connect)
973973
LDAP *ldap = NULL;
974974

975975
if (ZEND_NUM_ARGS() > 2) {
976-
zend_error(E_DEPRECATED, "Calling ldap_connect() with Oracle-specific arguments is deprecated, "
977-
"use ldap_connect_wallet() instead");
976+
zend_error(E_DEPRECATED, "Calling ldap_connect() with Oracle-specific arguments is deprecated");
978977
} else if (ZEND_NUM_ARGS() == 2) {
979978
zend_error(E_DEPRECATED, "Usage of ldap_connect with two arguments is deprecated");
980979
}

ext/ldap/ldap.stub.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,16 +208,19 @@
208208
* @var int
209209
* @cvalue GSLC_SSL_NO_AUTH
210210
*/
211+
#[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
211212
const GSLC_SSL_NO_AUTH = UNKNOWN;
212213
/**
213214
* @var int
214215
* @cvalue GSLC_SSL_ONEWAY_AUTH
215216
*/
217+
#[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
216218
const GSLC_SSL_ONEWAY_AUTH = UNKNOWN;
217219
/**
218220
* @var int
219221
* @cvalue GSLC_SSL_TWOWAY_AUTH
220222
*/
223+
#[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
221224
const GSLC_SSL_TWOWAY_AUTH = UNKNOWN;
222225
#endif
223226

@@ -624,8 +627,10 @@
624627
#endif
625628

626629
#ifdef HAVE_ORALDAP
630+
#[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
627631
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 {}
628632
#ifdef LDAP_API_FEATURE_X_OPENLDAP
633+
#[\Deprecated(since: "8.5", message: "as it is broken since PHP 8.0")]
629634
function ldap_connect_wallet(?string $uri = null, string $wallet, #[\SensitiveParameter] string $password, int $auth_mode = GSLC_SSL_NO_AUTH): LDAP\Connection|false {}
630635
#endif
631636
#else

ext/ldap/ldap_arginfo.h

Lines changed: 43 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)