allow to pass collection to in/notIn rules (#23875)

laravel · Apr 17, 2018 · e3d958b · e3d958b
1 parent 00e92dd
commit e3d958b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/Illuminate/Validation/Rule.php b/src/Illuminate/Validation/Rule.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Validation;
 
+use Illuminate\Support\Collection;
 use Illuminate\Support\Traits\Macroable;
 
 class Rule
@@ -34,22 +35,30 @@ public static function exists($table, $column = 'NULL')
     /**
      * Get an in constraint builder instance.
      *
-     * @param  array|string  $values
+     * @param  array|string|\Illuminate\Support\Collection  $values
      * @return \Illuminate\Validation\Rules\In
      */
     public static function in($values)
     {
+        if ($values instanceof Collection) {
+            $values = $values->toArray();
+        }
+
         return new Rules\In(is_array($values) ? $values : func_get_args());
     }
 
     /**
      * Get a not_in constraint builder instance.
      *
-     * @param  array|string  $values
+     * @param  array|string|\Illuminate\Support\Collection  $values
      * @return \Illuminate\Validation\Rules\NotIn
      */
     public static function notIn($values)
     {
+        if ($values instanceof Collection) {
+            $values = $values->toArray();
+        }
+
         return new Rules\NotIn(is_array($values) ? $values : func_get_args());
     }
 

diff --git a/tests/Validation/ValidationInRuleTest.php b/tests/Validation/ValidationInRuleTest.php
@@ -26,6 +26,10 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
 
         $this->assertEquals('in:"1","2","3","4"', (string) $rule);
 
+        $rule = Rule::in(collect([1, 2, 3, 4]));
+
+        $this->assertEquals('in:"1","2","3","4"', (string) $rule);
+
         $rule = Rule::in('1', '2', '3', '4');
 
         $this->assertEquals('in:"1","2","3","4"', (string) $rule);

diff --git a/tests/Validation/ValidationNotInRuleTest.php b/tests/Validation/ValidationNotInRuleTest.php
@@ -18,6 +18,10 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
 
         $this->assertEquals('not_in:"1","2","3","4"', (string) $rule);
 
+        $rule = Rule::notIn(collect([1, 2, 3, 4]));
+
+        $this->assertEquals('not_in:"1","2","3","4"', (string) $rule);
+
         $rule = Rule::notIn('1', '2', '3', '4');
 
         $this->assertEquals('not_in:"1","2","3","4"', (string) $rule);