Merge branch '6.4' into 7.1

xabbuh · xabbuh · commit 9e203bf36392 · 2024-09-15T08:48:17.000+02:00
* 6.4:
  fix merge
  [Intl] Update ICU data from 74.1 to 75.1
  use DeprecatedCallableInfo for Twig callables if possible
  [Filesystem] Add a warning about `chown()` and `chgrp()` on Windows
  [String] Update wcswidth data with Unicode 16
  PhpSubprocess: Add flag PREG_OFFSET_CAPTURE to preg_match to identify the offset
  Work around parse_url() bug
  [Ldap] Clean `ldap_connect()` call in `LdapTestCase`
  [HttpFoundation] Update links for X-Accel-Redirect and fail properly when X-Accel-Mapping is missing
diff --git a/Tests/LdapTestCase.php b/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)) {`