Merge branch '6.4' into 7.1

derrabus · derrabus · commit 8fcccc7c9f80 · 2024-09-08T14:32:26.000+02:00
* 6.4:
  Mitigate PHPUnit deprecations
  [TwigBundle] Add support for resetting globals between HTTP requests
  Mitigate PHPUnit deprecations
  [Cache] Fix compatibility with Redis 6.1.0 pre-releases
  [Validator] Add Catalan and Spanish translation for `Week` constraint
  Don't use is_resource() on non-streams
  [Ldap] Fix extension deprecation
diff --git a/Tests/LdapTestCase.php b/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)) {`