summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2015-11-29 11:47:37 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2015-11-29 11:47:37 +0100
commit7527b6d29bb915497f5bd37e390420231b836fc3 (patch)
tree902703e9e3bcb4ee3d62d522a6a35641b1fdfcaf
parent490d8f077ab8cfa465e6f2ab93a557a78b4d4635 (diff)
parente7f58bf8385ecbec91149d711942a182746adeda (diff)
downloadsymfony-security-7527b6d29bb915497f5bd37e390420231b836fc3.zip
symfony-security-7527b6d29bb915497f5bd37e390420231b836fc3.tar.gz
symfony-security-7527b6d29bb915497f5bd37e390420231b836fc3.tar.bz2
feature #16735 [WIP] [Ldap] Marked the Ldap component as internal (csarrazi)
This PR was merged into the 2.8 branch. Discussion ---------- [WIP] [Ldap] Marked the Ldap component as internal | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | no | Fixed tickets | no | License | MIT | Doc PR | not yet As mentioned earlier, the LDAP component suffers from a few problems, addressed in PR #15994 However, as raised by @Tobion, the component does not yet have tests (they can be added at a later time, though), and is not considered stable yet. Commits ------- 3f89b2c Marked the Ldap component as internal and removed Ldap constants polyfill
-rw-r--r--Core/Authentication/Provider/LdapBindAuthenticationProvider.php2
-rw-r--r--Core/User/LdapUserProvider.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/Core/Authentication/Provider/LdapBindAuthenticationProvider.php b/Core/Authentication/Provider/LdapBindAuthenticationProvider.php
index fab7d80..adc42ef 100644
--- a/Core/Authentication/Provider/LdapBindAuthenticationProvider.php
+++ b/Core/Authentication/Provider/LdapBindAuthenticationProvider.php
@@ -74,7 +74,7 @@ class LdapBindAuthenticationProvider extends UserAuthenticationProvider
$password = $token->getCredentials();
try {
- $username = $this->ldap->escape($username, '', LdapClientInterface::LDAP_ESCAPE_DN);
+ $username = $this->ldap->escape($username, '', LDAP_ESCAPE_DN);
$dn = str_replace('{username}', $username, $this->dnString);
$this->ldap->bind($dn, $password);
diff --git a/Core/User/LdapUserProvider.php b/Core/User/LdapUserProvider.php
index ec699fc..988a595 100644
--- a/Core/User/LdapUserProvider.php
+++ b/Core/User/LdapUserProvider.php
@@ -57,7 +57,7 @@ class LdapUserProvider implements UserProviderInterface
{
try {
$this->ldap->bind($this->searchDn, $this->searchPassword);
- $username = $this->ldap->escape($username, '', LdapClientInterface::LDAP_ESCAPE_FILTER);
+ $username = $this->ldap->escape($username, '', LDAP_ESCAPE_FILTER);
$query = str_replace('{username}', $username, $this->defaultSearch);
$search = $this->ldap->find($this->baseDn, $query);
} catch (ConnectionException $e) {