Create the request from the aliased contract instance to allow customization.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

src/Contract/Http/Request.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Dingo\Api\Contract\Http;
+
+use Illuminate\Http\Request as IlluminateRequest;
+
+interface Request
+{
+    /**
+     * Create a new Dingo request instance from an Illuminate request instance.
+     *
+     * @param \Illuminate\Http\Request $old
+     *
+     * @return \Dingo\Api\Http\Request
+     */
+    public function createFromIlluminate(IlluminateRequest $old);
+}

src/Http/Middleware/Request.php

@@ -68,7 +68,7 @@ public function __construct(Application $app, Router $router, RequestValidator $
     public function handle($request, Closure $next)
     {
         if ($this->validator->validateRequest($request)) {
-            $request = HttpRequest::createFromExisting($request);
+            $request = $this->app->make('Dingo\Api\Contract\Http\Request')->createFromIlluminate($request);
 
             return $this->sendRequestThroughRouter($request);
         }

src/Http/Request.php

@@ -3,15 +3,18 @@
 namespace Dingo\Api\Http;
 
 use Illuminate\Http\Request as IlluminateRequest;
+use Dingo\Api\Contract\Http\Request as RequestInterface;
 
-class Request extends IlluminateRequest
+class Request extends IlluminateRequest implements RequestInterface
 {
     /**
+     * Create a new Dingo request instance from an Illuminate request instance.
+     *
      * @param \Illuminate\Http\Request $old
      *
-     * @return static
+     * @return \Dingo\Api\Http\Request
      */
-    public static function createFromExisting(IlluminateRequest $old)
+    public function createFromIlluminate(IlluminateRequest $old)
     {
         $new = new static(
             $old->query->all(), $old->request->all(), $old->attributes->all(),

src/Provider/ApiServiceProvider.php

@@ -91,17 +91,24 @@ protected function setupConfig()
      */
     protected function setupClassAliases()
     {
-        $this->app->alias('request', 'Dingo\Api\Http\Request');
-        $this->app->alias('api.dispatcher', 'Dingo\Api\Dispatcher');
-        $this->app->alias('api.http.validator', 'Dingo\Api\Http\RequestValidator');
-        $this->app->alias('api.http.response', 'Dingo\Api\Http\Response\Factory');
-        $this->app->alias('api.router', 'Dingo\Api\Routing\Router');
-        $this->app->alias('api.router.adapter', 'Dingo\Api\Routing\Adapter\AdapterInterface');
-        $this->app->alias('api.auth', 'Dingo\Api\Auth\Auth');
-        $this->app->alias('api.limiting', 'Dingo\Api\Http\RateLimit\Handler');
-        $this->app->alias('api.transformer', 'Dingo\Api\Transformer\Factory');
-        $this->app->alias('api.url', 'Dingo\Api\Routing\UrlGenerator');
-        $this->app->alias('api.exception', 'Dingo\Api\Exception\Handler');
+        $this->app->alias('Dingo\Api\Http\Request', 'Dingo\Api\Contract\Http\Request');
+
+        $aliases = [
+            'api.dispatcher'     => 'Dingo\Api\Dispatcher',
+            'api.http.validator' => 'Dingo\Api\Http\RequestValidator',
+            'api.http.response'  => 'Dingo\Api\Http\Response\Factory',
+            'api.router'         => 'Dingo\Api\Routing\Router',
+            'api.router.adapter' => 'Dingo\Api\Contract\Routing\Adapter',
+            'api.auth'           => 'Dingo\Api\Auth\Auth',
+            'api.limiting'       => 'Dingo\Api\Contract\Http\RateLimit\Adapter',
+            'api.transformer'    => 'Dingo\Api\Transformer\Factory',
+            'api.url'            => 'Dingo\Api\Routing\UrlGenerator',
+            'api.exception'      => 'Dingo\Api\Exception\Handler'
+        ];
+
+        foreach ($aliases as $key => $alias) {
+            $this->app->alias($key, $alias);
+        }
     }
 
     /**