Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 9e203bf

Browse filesBrowse files
committed
Merge branch '6.4' into 7.1
* 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
2 parents 8fcccc7 + ca09d98 commit 9e203bf
Copy full SHA for 9e203bf

File tree

Expand file treeCollapse file tree

1 file changed

+1
-6
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-6
lines changed

‎Tests/LdapTestCase.php

Copy file name to clipboardExpand all lines: Tests/LdapTestCase.php
+1-6Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ class LdapTestCase extends TestCase
1717
{
1818
protected function getLdapConfig()
1919
{
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'));
2621
@ldap_set_option($h, \LDAP_OPT_PROTOCOL_VERSION, 3);
2722

2823
if (!$h || !@ldap_bind($h)) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.