@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Revert "Fix PHP 8.3 "Usage of ldap_connect with two arguments is deprecated" exception"
Summary:
Revert commit 700090917af6dd2e27c9fd82269797b6ec5def59 per T15963.
Fixes T15963
Opens T15724
Test Plan: N/A.
Reviewers: O1 Blessed Committers, valerio.bozzolan
Reviewed By: O1 Blessed Committers, valerio.bozzolan
Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno
Maniphest Tasks: T15963, T15724
Differential Revision: https://we.phorge.it/D25842
+2
-7
+2
-7
src/applications/auth/adapter/PhutilLDAPAuthAdapter.php
+2
-7
src/applications/auth/adapter/PhutilLDAPAuthAdapter.php
···
305
305
'port' => $this->port,
306
306
));
307
307
308
-
if ($this->ldapStartTLS) {
309
-
$ldap_server_uri = 'ldaps://'.$host.':'.$this->port;
310
-
} else {
311
-
$ldap_server_uri = 'ldap://'.$host.':'.$this->port;
312
-
}
313
-
$conn = @ldap_connect($ldap_server_uri);
308
+
$conn = @ldap_connect($host, $this->port);
314
309
315
310
$profiler->endServiceCall(
316
311
$call_id,
···
320
315
321
316
if (!$conn) {
322
317
throw new Exception(
323
-
pht('Unable to connect to LDAP server (%s).', $ldap_server_uri));
318
+
pht('Unable to connect to LDAP server (%s:%d).', $host, $port));
324
319
}
325
320
326
321
$options = array(