[Validator] drop grapheme_strlen in LengthValidator

symfony · Jan 26, 2015 · 915fcd8 · 915fcd8
1 parent 975b8a8
commit 915fcd8
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Symfony/Component/Validator/Constraints/LengthValidator.php b/src/Symfony/Component/Validator/Constraints/LengthValidator.php
@@ -35,12 +35,20 @@ public function validate($value, Constraint $constraint)
 
         $stringValue = (string) $value;
 
-        if (function_exists('grapheme_strlen') && 'UTF-8' === $constraint->charset) {
-            $length = grapheme_strlen($stringValue);
+        if ('UTF8' === $charset = strtoupper($constraint->charset)) {
+            $charset = 'UTF-8';
+        }
+
+        if (function_exists('iconv_strlen')) {
+            $length = iconv_strlen($stringValue, $constraint->charset);
         } elseif (function_exists('mb_strlen')) {
             $length = mb_strlen($stringValue, $constraint->charset);
-        } else {
+        } elseif ('UTF-8' !== $charset) {
             $length = strlen($stringValue);
+        } elseif (function_exists('utf8_decode')) {
+            $length = strlen(utf8_decode($stringValue));
+        } else {
+            preg_replace('/./u', '', $stringValue, -1, $length);
         }
 
         if ($constraint->min == $constraint->max && $length != $constraint->min) {