Skip to content

Commit f84d8af

Browse files
Merge branch '2.8'
* 2.8: [Bridge\PhpUnit] Add extra clock-mocked namespaces in phpunit.xml.dist [DependencyInjection] Autowing: exclude abstract definitons [DependencyInjection] Autowiring: support parent/decorators [FrameworkBundle] Autowiring support for debug:container Fixing bad type-hint auto-wiring bug [Yaml] deprecate unquoted indicator characters added a micro kernel Re-adding the ability to add a resource to the RouteCollectionBuilder [DependencyInjection] Add autowiring support to dumpers ldap_set_option should be called with a valid link identifier [FrameworkBundle][Form] Better exception message for private form tagged services Conflicts: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
2 parents 8034468 + 2ffbdae commit f84d8af

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

LdapClient.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ private function connect()
109109
$host = 'ldaps://'.$host;
110110
}
111111

112+
$this->connection = ldap_connect($host, $this->port);
113+
112114
ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, $this->version);
113115
ldap_set_option($this->connection, LDAP_OPT_REFERRALS, $this->optReferrals);
114116

115-
$this->connection = ldap_connect($host, $this->port);
116-
117117
if ($this->useStartTls) {
118118
ldap_start_tls($this->connection);
119119
}

0 commit comments

Comments
 (0)