Rely on iconv and symfony/polyfill-*

Author: nicolas-grekas

LdapClient.php

@@ -97,11 +97,7 @@ public function find($dn, $query, $filter = '*')
      */
     public function escape($subject, $ignore = '', $flags = 0)
     {
-        if (function_exists('ldap_escape')) {
-            return ldap_escape($subject, $ignore, $flags);
-        }
-
-        return $this->doEscape($subject, $ignore, $flags);
+        return ldap_escape($subject, $ignore, $flags);
     }
 
     private function connect()
@@ -132,98 +128,4 @@ private function disconnect()
 
         $this->connection = null;
     }
-
-    /**
-     * Stub implementation of the {@link ldap_escape()} function of the ldap
-     * extension.
-     *
-     * Escape strings for safe use in LDAP filters and DNs.
-     *
-     * @author Chris Wright <ldapi@daverandom.com>
-     *
-     * @param string $subject
-     * @param string $ignore
-     * @param int    $flags
-     *
-     * @return string
-     *
-     * @see http://stackoverflow.com/a/8561604
-     */
-    private function doEscape($subject, $ignore = '', $flags = 0)
-    {
-        $charMaps = $this->getCharmaps();
-
-        // Create the base char map to escape
-        $flags = (int) $flags;
-        $charMap = array();
-
-        if ($flags & self::LDAP_ESCAPE_FILTER) {
-            $charMap += $charMaps[self::LDAP_ESCAPE_FILTER];
-        }
-
-        if ($flags & self::LDAP_ESCAPE_DN) {
-            $charMap += $charMaps[self::LDAP_ESCAPE_DN];
-        }
-
-        if (!$charMap) {
-            $charMap = $charMaps[0];
-        }
-
-        // Remove any chars to ignore from the list
-        $ignore = (string) $ignore;
-
-        for ($i = 0, $l = strlen($ignore); $i < $l; ++$i) {
-            unset($charMap[$ignore[$i]]);
-        }
-
-        // Do the main replacement
-        $result = strtr($subject, $charMap);
-
-        // Encode leading/trailing spaces if LDAP_ESCAPE_DN is passed
-        if ($flags & self::LDAP_ESCAPE_DN) {
-            if ($result[0] === ' ') {
-                $result = '\\20'.substr($result, 1);
-            }
-
-            if ($result[strlen($result) - 1] === ' ') {
-                $result = substr($result, 0, -1).'\\20';
-            }
-        }
-
-        return $result;
-    }
-
-    private function getCharmaps()
-    {
-        if (null !== $this->charmaps) {
-            return $this->charmaps;
-        }
-
-        $charMaps = array(
-            self::LDAP_ESCAPE_FILTER => array('\\', '*', '(', ')', "\x00"),
-            self::LDAP_ESCAPE_DN => array('\\', ',', '=', '+', '<', '>', ';', '"', '#'),
-        );
-
-        $charMaps[0] = array();
-
-        for ($i = 0; $i < 256; ++$i) {
-            $charMaps[0][chr($i)] = sprintf('\\%02x', $i);
-        }
-
-        for ($i = 0, $l = count($charMaps[self::LDAP_ESCAPE_FILTER]); $i < $l; ++$i) {
-            $chr = $charMaps[self::LDAP_ESCAPE_FILTER][$i];
-            unset($charMaps[self::LDAP_ESCAPE_FILTER][$i]);
-            $charMaps[self::LDAP_ESCAPE_FILTER][$chr] = $charMaps[0][$chr];
-        }
-
-        for ($i = 0, $l = count($charMaps[self::LDAP_ESCAPE_DN]); $i < $l; ++$i) {
-            $chr = $charMaps[self::LDAP_ESCAPE_DN][$i];
-            unset($charMaps[self::LDAP_ESCAPE_DN][$i]);
-            $charMaps[self::LDAP_ESCAPE_DN][$chr] = $charMaps[0][$chr];
-        }
-
-        $this->charmaps = $charMaps;
-
-        return $this->charmaps;
-    }
 }

Tests/LdapClientTest.php

@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
+        "symfony/polyfill-php56": "~1.0",
         "ext-ldap": "*"
     },
     "autoload": {