diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Validator] added support for grapheme_strlen when mbstring is not installed but intl is installed

Browse Source
This commit is contained in:
Fabien Potencier 2011-09-29 16:15:57 +02:00
parent d429594afb
commit 600b8ef5af
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Validator/Constraints/MaxLengthValidator.php
View File

@ -42,7 +42,13 @@ class MaxLengthValidator extends ConstraintValidator
$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(

8
src/Symfony/Component/Validator/Constraints/MinLengthValidator.php
View File

@ -42,7 +42,13 @@ class MinLengthValidator extends ConstraintValidator
$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(