Merge pull request #1666 from specialtactics/compat/formrequest-valid…

…ation-resolution Validate FormRequest when resolved - add to Laravel service provider
dingo · Jun 20, 2019 · e67c722 · e67c722
2 parents 5e5846b + 37744e2
commit e67c722
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Provider/LaravelServiceProvider.php b/src/Provider/LaravelServiceProvider.php
@@ -15,6 +15,7 @@
 use Dingo\Api\Http\Middleware\PrepareController;
 use Illuminate\Http\Request as IlluminateRequest;
 use Dingo\Api\Routing\Adapter\Laravel as LaravelAdapter;
+use Illuminate\Contracts\Validation\ValidatesWhenResolved;
 
 class LaravelServiceProvider extends DingoServiceProvider
 {
@@ -43,6 +44,11 @@ public function boot()
             $this->updateRouterBindings();
         });
 
+        // Validate FormRequest after resolving
+        $this->app->afterResolving(ValidatesWhenResolved::class, function ($resolved) {
+            $resolved->validateResolved();
+        });
+
         $this->app->resolving(FormRequest::class, function (FormRequest $request, Application $app) {
             $this->initializeRequest($request, $app['request']);
 

diff --git a/src/Provider/LumenServiceProvider.php b/src/Provider/LumenServiceProvider.php
@@ -54,6 +54,7 @@ public function boot()
             });
         });
 
+        // Validate FormRequest after resolving
         $this->app->afterResolving(ValidatesWhenResolved::class, function ($resolved) {
             $resolved->validateResolved();
         });