[Validator] added support for grapheme_strlen when mbstring is not in…

…stalled but intl is installed
symfony · Sep 29, 2011 · 962d74d · 962d74d
1 parent 3b4a6f5
commit 962d74d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Constraints/MaxLengthValidator.php b/Constraints/MaxLengthValidator.php
@@ -42,7 +42,13 @@ public function isValid($value, Constraint $constraint)
 
         $value = (string) $value;
 
-        $length = function_exists('mb_strlen') ? mb_strlen($value, $constraint->charset) : strlen($value);
+        if (function_exists('grapheme_strlen') && 'UTF-8' === $constraint->charset) {
+            $length = grapheme_strlen($value);
+        } elseif (function_exists('mb_strlen')) {
+            $length = mb_strlen($value, $constraint->charset);
+        } else {
+            $length = strlen($value);
+        }
 
         if ($length > $constraint->limit) {
             $this->setMessage($constraint->message, array(

diff --git a/Constraints/MinLengthValidator.php b/Constraints/MinLengthValidator.php
@@ -42,7 +42,13 @@ public function isValid($value, Constraint $constraint)
 
         $value = (string) $value;
 
-        $length = function_exists('mb_strlen') ? mb_strlen($value, $constraint->charset) : strlen($value);
+        if (function_exists('grapheme_strlen') && 'UTF-8' === $constraint->charset) {
+            $length = grapheme_strlen($value);
+        } elseif (function_exists('mb_strlen')) {
+            $length = mb_strlen($value, $constraint->charset);
+        } else {
+            $length = strlen($value);
+        }
 
         if ($length < $constraint->limit) {
             $this->setMessage($constraint->message, array(