move validated request input extraction into its own method

laravel · Sep 14, 2017 · d87a199 · d87a199
1 parent 38bca2e
commit d87a199
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/Illuminate/Foundation/Validation/ValidatesRequests.php b/src/Illuminate/Foundation/Validation/ValidatesRequests.php
@@ -25,9 +25,7 @@ public function validateWith($validator, Request $request = null)
 
         $validator->validate();
 
-        return $request->only(collect($validator->getRules())->keys()->map(function ($rule) {
-            return str_contains($rule, '.') ? explode('.', $rule)[0] : $rule;
-        })->unique()->toArray());
+        return $this->extractInputFromRules($request, $validator->getRules());
     }
 
     /**
@@ -46,6 +44,18 @@ public function validate(Request $request, array $rules,
              ->make($request->all(), $rules, $messages, $customAttributes)
              ->validate();
 
+        return $this->extractInputFromRules($request, $rules);
+    }
+
+    /**
+     * Get request inputs using validator rules.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  array  $rules
+     * @return array
+     */
+    protected function extractInputFromRules(Request $request, $rules)
+    {
         return $request->only(collect($rules)->keys()->map(function ($rule) {
             return str_contains($rule, '.') ? explode('.', $rule)[0] : $rule;
         })->unique()->toArray());