Merge pull request #3558 from creocoder/range-validator-js-enh

framework/assets/yii.validation.js

@@ -91,10 +91,24 @@ yii.validation = (function ($) {
             if (options.skipOnEmpty && pub.isEmpty(value)) {
                 return;
             }
-            var valid = !options.not && $.inArray(value, options.range) > -1
-                || options.not && $.inArray(value, options.range) == -1;
 
-            if (!valid) {
+            if (!options.allowArray && $.isArray(value)) {
+                pub.addMessage(messages, options.message, value);
+                return;
+            }
+
+            var inArray = true;
+
+            $.each($.isArray(value) ? value : [value], function(i, v) {
+                if ($.inArray(v, options.range) == -1) {
+                    inArray = false;
+                    return false;
+                } else {
+                    return true;
+                }
+            });
+
+            if (options.not !== inArray) {
                 pub.addMessage(messages, options.message, value);
             }
         },

framework/validators/RangeValidator.php

@@ -72,7 +72,7 @@ class RangeValidator extends Validator
             }
         }
 
-        return ($this->not xor $in) ? null : [$this->message, []];
+        return $this->not !== $in ? null : [$this->message, []];
     }
 
     /**
@@ -94,6 +94,9 @@ class RangeValidator extends Validator
         if ($this->skipOnEmpty) {
             $options['skipOnEmpty'] = 1;
         }
+        if ($this->allowArray) {
+            $options['allowArray'] = 1;
+        }
 
         ValidationAsset::register($view);