Merge pull request laravel#817 from jgrossi/fix-issue-667

Change Request instance for responses implementing Responsable interface

src/Concerns/RoutesRequests.php

@@ -425,7 +425,7 @@ protected function sendThroughPipeline(array $middleware, Closure $then)
     public function prepareResponse($response)
     {
         if ($response instanceof Responsable) {
-            $response = $response->toResponse(Request::capture());
+            $response = $response->toResponse(app(Request::class));
         }
 
         if ($response instanceof PsrResponseInterface) {

tests/FullApplicationTest.php

@@ -257,6 +257,21 @@ public function testMethodNotAllowedResponse()
         $this->assertEquals(405, $response->getStatusCode());
     }
 
+    public function testResponsableInterface()
+    {
+        $app = new Application;
+
+        $app->router->get('/foo/{foo}', function () {
+            return new ResponsableResponse;
+        });
+
+        $request = Request::create('/foo/999', 'GET');
+        $response = $app->handle($request);
+
+        $this->assertEquals(999, $request->route('foo'));
+        $this->assertEquals(999, $response->original);
+    }
+
     public function testUncaughtExceptionResponse()
     {
         $app = new Application;
@@ -771,3 +786,11 @@ public function terminate($request, Illuminate\Http\Response $response)
         $response->setContent('TERMINATED');
     }
 }
+
+class ResponsableResponse implements \Illuminate\Contracts\Support\Responsable
+{
+    public function toResponse($request)
+    {
+        return $request->route('foo');
+    }
+}