Merge pull request #3 from laravel/5.7

Merge

Author: jensdenies

src/Concerns/RoutesRequests.php

@@ -11,6 +11,7 @@
 use Illuminate\Http\Response;
 use Laravel\Lumen\Routing\Pipeline;
 use Illuminate\Contracts\Support\Responsable;
+use Laravel\Lumen\Http\Request as LumenRequest;
 use Laravel\Lumen\Routing\Closure as RoutingClosure;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Laravel\Lumen\Routing\Controller as LumenController;
@@ -182,7 +183,7 @@ public function dispatch($request = null)
     protected function parseIncomingRequest($request)
     {
         if (! $request) {
-            $request = Request::capture();
+            $request = LumenRequest::capture();
         }
 
         $this->instance(Request::class, $this->prepareRequest($request));

src/Http/Request.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Laravel\Lumen\Http;
+
+use Illuminate\Support\Arr;
+use Illuminate\Http\Request as BaseRequest;
+
+class Request extends BaseRequest
+{
+    /**
+     * Get the route handling the request.
+     *
+     * @param  string|null  $param
+     * @param  mixed  $default
+     *
+     * @return array|string
+     */
+    public function route($param = null, $default = null)
+    {
+        $route = call_user_func($this->getRouteResolver());
+
+        if (is_null($route) || is_null($param)) {
+            return $route;
+        }
+
+        return Arr::get($route[2], $param, $default);
+    }
+}

tests/FullApplicationTest.php

@@ -1,8 +1,8 @@
 <?php
 
 use Mockery as m;
-use Illuminate\Http\Request;
 use Laravel\Lumen\Application;
+use Laravel\Lumen\Http\Request;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
@@ -21,10 +21,12 @@ public function testBasicRequest()
             return response('Hello World');
         });
 
-        $response = $app->handle(Request::create('/', 'GET'));
+        $response = $app->handle($request = Request::create('/', 'GET'));
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEquals('Hello World', $response->getContent());
+
+        $this->assertInstanceOf('Illuminate\Http\Request', $request);
     }
 
     public function testBasicSymfonyRequest()
@@ -66,10 +68,13 @@ public function testRequestWithParameters()
             return response($bar.$baz);
         });
 
-        $response = $app->handle(Request::create('/foo/1/2', 'GET'));
+        $response = $app->handle($request = Request::create('/foo/1/2', 'GET'));
 
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertEquals('12', $response->getContent());
+
+        $this->assertEquals(1, $request->route('bar'));
+        $this->assertEquals(2, $request->route('baz'));
     }
 
     public function testCallbackRouteWithDefaultParameter()