Windows and Intl fixes

Author: nicolas-grekas

Constraints/LengthValidator.php

@@ -40,23 +40,25 @@ public function validate($value, Constraint $constraint)
             $charset = 'UTF-8';
         }
 
-        if (function_exists('iconv_strlen')) {
-            $length = @iconv_strlen($stringValue, $constraint->charset);
-            $invalidCharset = false === $length;
+        if ('UTF-8' === $charset) {
+            if (!preg_match('//u', $stringValue)) {
+                $invalidCharset = true;
+            } elseif (function_exists('utf8_decode')) {
+                $length = strlen(utf8_decode($stringValue));
+            } else {
+                preg_replace('/./u', '', $stringValue, -1, $length);
+            }
         } elseif (function_exists('mb_strlen')) {
-            if (mb_check_encoding($stringValue, $constraint->charset)) {
+            if (@mb_check_encoding($stringValue, $constraint->charset)) {
                 $length = mb_strlen($stringValue, $constraint->charset);
             } else {
                 $invalidCharset = true;
             }
-        } elseif ('UTF-8' !== $charset) {
-            $length = strlen($stringValue);
-        } elseif (!preg_match('//u', $stringValue)) {
-            $invalidCharset = true;
-        } elseif (function_exists('utf8_decode')) {
-            $length = strlen(utf8_decode($stringValue));
+        } elseif (function_exists('iconv_strlen')) {
+            $length = @iconv_strlen($stringValue, $constraint->charset);
+            $invalidCharset = false === $length;
         } else {
-            preg_replace('/./u', '', $stringValue, -1, $length);
+            $length = strlen($stringValue);
         }
 
         if ($invalidCharset) {

Tests/Constraints/ImageValidatorTest.php

@@ -14,6 +14,9 @@
 use Symfony\Component\Validator\Constraints\Image;
 use Symfony\Component\Validator\Constraints\ImageValidator;
 
+/**
+ * @requires extension fileinfo
+ */
 class ImageValidatorTest extends AbstractConstraintValidatorTest
 {
     protected $context;