bug #58143 [Ldap] Fix extension deprecation (alexandre-daubois)

fabpot · fabpot · commit 73ca0b7eefe6 · 2024-09-06T08:07:40.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Ldap] Fix extension deprecation | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT Two arguments constructor is deprecated since PHP 8.3: https://www.php.net/manual/en/function.ldap-connect.php Commits ------- 8026481 [Ldap] Fix extension deprecation
diff --git a/src/Symfony/Component/Ldap/Tests/LdapTestCase.php b/src/Symfony/Component/Ldap/Tests/LdapTestCase.php
@@ -17,7 +17,12 @@ class LdapTestCase extends TestCase
 {
     protected function getLdapConfig()
     {
-        $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));
+        if (\PHP_VERSION_ID < 80300) {
+            $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));
+        } else {
+            $h = @ldap_connect('ldap://'.getenv('LDAP_HOST').':'.getenv('LDAP_PORT'));
+        }
+
         @ldap_set_option($h, \LDAP_OPT_PROTOCOL_VERSION, 3);
 
         if (!$h || !@ldap_bind($h)) {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,12 @@ class LdapTestCase extends TestCase`
`17`	`17`	`{`
`18`	`18`	`protected function getLdapConfig()`
`19`	`19`	`{`
`20`		`- $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));`
	`20`	`+ if (\PHP_VERSION_ID < 80300) {`
	`21`	`+ $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));`
	`22`	`+ } else {`
	`23`	`+ $h = @ldap_connect('ldap://'.getenv('LDAP_HOST').':'.getenv('LDAP_PORT'));`
	`24`	`+ }`
	`25`	`+`
`21`	`26`	`@ldap_set_option($h, \LDAP_OPT_PROTOCOL_VERSION, 3);`
`22`	`27`
`23`	`28`	`if (!$h \|\| !@ldap_bind($h)) {`