[8.x] Use Fluent instead of array on Rule::when()

Signed-off-by: Mior Muhammad Zaki <[email protected]>
laravel · Aug 16, 2021 · 9d02a85 · 9d02a85
1 parent f95f3af
commit 9d02a85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Illuminate/Validation/ConditionalRules.php b/src/Illuminate/Validation/ConditionalRules.php
@@ -2,6 +2,8 @@
 
 namespace Illuminate\Validation;
 
+use Illuminate\Support\Fluent;
+
 class ConditionalRules
 {
     /**
@@ -40,7 +42,7 @@ public function __construct($condition, $rules)
     public function passes(array $data = [])
     {
         return is_callable($this->condition)
-                    ? call_user_func($this->condition, $data)
+                    ? call_user_func($this->condition, new Fluent($data))
                     : $this->condition;
     }
 

diff --git a/tests/Validation/ValidationRuleParserTest.php b/tests/Validation/ValidationRuleParserTest.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Tests\Validation;
 
+use Illuminate\Support\Fluent;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationRuleParser;
 use PHPUnit\Framework\TestCase;
@@ -16,7 +17,7 @@ public function test_conditional_rules_are_properly_expanded_and_filtered()
             'password' => Rule::when(true, 'required|min:2'),
             'username' => ['required', Rule::when(true, ['min:2'])],
             'address' => ['required', Rule::when(false, ['min:2'])],
-            'city' => ['required', Rule::when(function (array $input) {
+            'city' => ['required', Rule::when(function (Fluent $input) {
                 return true;
             }, ['min:2'])],
         ]);