浏览代码

Support injecting deps in FormRequest rules()

Shalvah 1 年之前
父节点
当前提交
84078358ce
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      src/Extracting/Strategies/GetFromFormRequestBase.php
  2. 1 1
      tests/Fixtures/TestRequestQueryParams.php

+ 2 - 2
src/Extracting/Strategies/GetFromFormRequestBase.php

@@ -68,10 +68,10 @@ class GetFromFormRequestBase extends Strategy
         if (method_exists($formRequest, 'validator')) {
             $validationFactory = app(ValidationFactory::class);
 
-            return call_user_func_array([$formRequest, 'validator'], [$validationFactory])
+            return app()->call([$formRequest, 'validator'], [$validationFactory])
                 ->getRules();
         } elseif (method_exists($formRequest, 'rules')) {
-            return call_user_func_array([$formRequest, 'rules'], []);
+            return app()->call([$formRequest, 'rules']);
         }
 
         return [];

+ 1 - 1
tests/Fixtures/TestRequestQueryParams.php

@@ -6,7 +6,7 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class TestRequestQueryParams extends FormRequest
 {
-    public function rules()
+    public function rules(\stdClass $injectedDep)
     {
         return [
             'q_param' => 'int|required',