Fix laravel form request validaton (dingo#1542)

* Fix FormRequests missing class error

* Fix styleCI

* Fix Style ci

* Fix style ci

* Add missing use statements

* Fix dingo/laravel form requests

Lumen/laravel does not have a Redirector crontract, so I can only hint the type in the docs.

* Fix FormRequests missing class error

* Fix styleCI

* Fix Style ci

* Fix style ci

* Add missing use statements

* Fix dingo/laravel form requests

Lumen/laravel does not have a Redirector crontract, so I can only hint the type in the docs.

Author: gazben

src/Http/FormRequest.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
-use Laravel\Lumen\Http\Redirector;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Validation\Validator;
 use Dingo\Api\Exception\ValidationHttpException;
@@ -254,11 +253,11 @@ public function attributes()
     /**
      * Set the Redirector instance.
      *
-     * @param Redirector $redirector
+     * @param \Laravel\Lumen\Http\Redirector|\Illuminate\Routing\Redirector $redirector
      *
      * @return $this
      */
-    public function setRedirector(Redirector $redirector)
+    public function setRedirector($redirector)
     {
         $this->redirector = $redirector;
 

src/Provider/LaravelServiceProvider.php

@@ -3,13 +3,17 @@
 namespace Dingo\Api\Provider;
 
 use ReflectionClass;
+use Dingo\Api\Http\FormRequest;
+use Illuminate\Routing\Redirector;
 use Dingo\Api\Http\Middleware\Auth;
 use Illuminate\Contracts\Http\Kernel;
 use Dingo\Api\Event\RequestWasMatched;
 use Dingo\Api\Http\Middleware\Request;
+use Illuminate\Foundation\Application;
 use Dingo\Api\Http\Middleware\RateLimit;
 use Illuminate\Routing\ControllerDispatcher;
 use Dingo\Api\Http\Middleware\PrepareController;
+use Illuminate\Http\Request as IlluminateRequest;
 use Dingo\Api\Routing\Adapter\Laravel as LaravelAdapter;
 
 class LaravelServiceProvider extends DingoServiceProvider
@@ -39,6 +43,12 @@ public function boot()
             $this->updateRouterBindings();
         });
 
+        $this->app->resolving(FormRequest::class, function (FormRequest $request, Application $app) {
+            $this->initializeRequest($request, $app['request']);
+
+            $request->setContainer($app)->setRedirector($app->make(Redirector::class));
+        });
+
         $this->addMiddlewareAlias('api.auth', Auth::class);
         $this->addMiddlewareAlias('api.throttle', RateLimit::class);
         $this->addMiddlewareAlias('api.controllers', PrepareController::class);
@@ -154,4 +164,39 @@ protected function gatherAppMiddleware(Kernel $kernel)
 
         return $property->getValue($kernel);
     }
+
+    /**
+     * Initialize the form request with data from the given request.
+     *
+     * @param FormRequest $form
+     * @param IlluminateRequest $current
+     *
+     * @return void
+     */
+    protected function initializeRequest(FormRequest $form, IlluminateRequest $current)
+    {
+        $files = $current->files->all();
+
+        $files = is_array($files) ? array_filter($files) : $files;
+
+        $form->initialize(
+            $current->query->all(),
+            $current->request->all(),
+            $current->attributes->all(),
+            $current->cookies->all(),
+            $files,
+            $current->server->all(),
+            $current->getContent()
+        );
+
+        $form->setJson($current->json());
+
+        if ($session = $current->getSession()) {
+            $form->setLaravelSession($session);
+        }
+
+        $form->setUserResolver($current->getUserResolver());
+
+        $form->setRouteResolver($current->getRouteResolver());
+    }
 }