[BC\Break] Remove Filter subcomponent

Now use symfony/polyfill-php56 for compatibility with PHP <5.6
Maks3w · Feb 12, 2016 · cf97250 · cf97250
1 parent 653faa9
commit cf97250
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 250 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,9 +9,8 @@ Ldap driver:
   See [Create a custom hydrator](Resources/doc/cookbook/custom_hydrator.md) for more details.
 - [BC Break] This bundle is now PSR-3 (Logger) compliant. Typehints has been updated in favor of `Psr\Log\LoggerInterface`.
 - [BC Break] Remove `FR3D\LdapBundle\Ldap\Converter`
-- [BC Break] Remove `escapeValue()` and `unescapeValue()` methods from `LdapManagerInterface` and `LdapManager`.
-- [Feature] `FR3D\LdapBundle\Ldap\Filter\FilterValue` has been added for to provide the same functionality as PHP 5.6
-             [ldap_escape()](http://php.net/manual/function.ldap-escape.php)
+- [BC Break] Remove `escapeValue()` and `unescapeValue()` methods from `LdapManagerInterface` and `LdapManager`. Now use
+  PHP 5.6 [ldap_escape()](http://php.net/manual/function.ldap-escape.php) polyfill.
 
 Config:
 - [BC Break] Added `fr3d_ldap.user.usernameAttribute` for indicate the attribute which holds the username.

diff --git a/Ldap/Filter/FilterInterface.php b/Ldap/Filter/FilterInterface.php
diff --git a/Ldap/Filter/FilterValue.php b/Ldap/Filter/FilterValue.php
diff --git a/Ldap/Filter/ldap_escape.php b/Ldap/Filter/ldap_escape.php
diff --git a/Ldap/LdapManager.php b/Ldap/LdapManager.php
@@ -62,9 +62,8 @@ protected function buildFilter(array $criteria, $condition = '&')
     {
         $filters = [];
         $filters[] = $this->params['filter'];
-        $filter = new Filter\FilterValue();
         foreach ($criteria as $key => $value) {
-            $value = $filter->filter($value);
+            $value = ldap_escape($value, '', LDAP_ESCAPE_FILTER);
             $filters[] = sprintf('(%s=%s)', $key, $value);
         }
 

diff --git a/Tests/Ldap/Filter/FilterInterfaceTestTrait.php b/Tests/Ldap/Filter/FilterInterfaceTestTrait.php
diff --git a/Tests/Ldap/Filter/FilterValueTest.php b/Tests/Ldap/Filter/FilterValueTest.php
diff --git a/composer.json b/composer.json
@@ -19,6 +19,7 @@
         "psr/log": "~1.0",
         "symfony/config": "~2.1",
         "symfony/dependency-injection": "~2.1",
+        "symfony/polyfill-php56": "^1.1",
         "symfony/security": "~2.1",
         "symfony/security-bundle": "~2.1",
         "zendframework/zend-ldap": "~2"