minor symfony#58211 [Ldap] Clean ldap_connect() call in LdapTestCase (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit 91ce18c532fd · 2024-09-11T09:04:38.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Ldap] Clean `ldap_connect()` call in `LdapTestCase` | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT After symfony#58143 (comment), follow-up for symfony#58143 Commits ------- b15cd3d [Ldap] Clean `ldap_connect()` call in `LdapTestCase`
diff --git a/src/Symfony/Component/Ldap/Tests/LdapTestCase.php b/src/Symfony/Component/Ldap/Tests/LdapTestCase.php
@@ -17,12 +17,7 @@ class LdapTestCase extends TestCase
 {
     protected function getLdapConfig()
     {
-        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'));
-        }
-
+        $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,12 +17,7 @@ class LdapTestCase extends TestCase`
`17`	`17`	`{`
`18`	`18`	`protected function getLdapConfig()`
`19`	`19`	`{`
`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`		`-`
	`20`	`+ $h = @ldap_connect('ldap://'.getenv('LDAP_HOST').':'.getenv('LDAP_PORT'));`
`26`	`21`	`@ldap_set_option($h, \LDAP_OPT_PROTOCOL_VERSION, 3);`
`27`	`22`
`28`	`23`	`if (!$h \|\| !@ldap_bind($h)) {`