summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Sarrazin <charles@sarraz.in>2015-11-28 23:09:12 +0100
committerCharles Sarrazin <charles@sarraz.in>2015-11-28 23:36:49 +0100
commite7f58bf8385ecbec91149d711942a182746adeda (patch)
tree7f26285ba946c2d428d98957aab679c6f851dfa3
parent3bc433a9e00e6f9d12e144fd47403357bdd2fdae (diff)
downloadsymfony-security-e7f58bf8385ecbec91149d711942a182746adeda.zip
symfony-security-e7f58bf8385ecbec91149d711942a182746adeda.tar.gz
symfony-security-e7f58bf8385ecbec91149d711942a182746adeda.tar.bz2
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) {