[5.6] Fix use of unique() (#23432)

laravel · Mar 7, 2018 · 7bd8c6e · 7bd8c6e
1 parent 46d6afb
commit 7bd8c6e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -310,7 +310,7 @@ public function validate()
 
         return $data->only(collect($this->getRules())->keys()->map(function ($rule) {
             return Str::contains($rule, '.') ? explode('.', $rule)[0] : $rule;
-        }))->unique()->toArray();
+        })->unique())->toArray();
     }
 
     /**

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -3876,12 +3876,15 @@ public function message()
 
     public function testValidateReturnsValidatedData()
     {
-        $post = ['first' => 'john', 'last' => 'doe', 'type' => 'admin'];
+        $post = ['first' => 'john',  'preferred'=>'john', 'last' => 'doe', 'type' => 'admin'];
 
-        $v = new Validator($this->getIlluminateArrayTranslator(), $post, ['first' => 'required']);
+        $v = new Validator($this->getIlluminateArrayTranslator(), $post, ['first' => 'required', 'preferred'=> 'required']);
+        $v->sometimes('type', 'required', function () {
+            return false;
+        });
         $data = $v->validate();
 
-        $this->assertEquals(['first' => 'john'], $data);
+        $this->assertEquals(['first' => 'john', 'preferred' => 'john'], $data);
     }
 
     protected function getTranslator()