Pass the request to the renderable callback (#34200)

laravel · Sep 8, 2020 · 4026844 · 4026844
1 parent d9b312c
commit 4026844
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -314,7 +314,7 @@ public function render($request, Throwable $e)
 
         foreach ($this->renderCallbacks as $renderCallback) {
             if (is_a($e, $this->firstClosureParameterType($renderCallback))) {
-                $response = $renderCallback($e);
+                $response = $renderCallback($e, $request);
 
                 if (! is_null($response)) {
                     return $response;

diff --git a/tests/Foundation/FoundationExceptionsHandlerTest.php b/tests/Foundation/FoundationExceptionsHandlerTest.php
@@ -111,13 +111,26 @@ public function testReturnsJsonWithStackTraceWhenAjaxRequestAndDebugTrue()
         $this->assertStringContainsString('"trace":', $response);
     }
 
-    public function testReturnsCustomResponseWhenExceptionImplementsResponsable()
+    public function testReturnsCustomResponseFromRenderableCallback()
     {
+        $this->handler->renderable(function (CustomException $e, $request) {
+            $this->assertSame($this->request, $request);
+
+            return response()->json(['response' => 'My custom exception response']);
+        });
+
         $response = $this->handler->render($this->request, new CustomException)->getContent();
 
         $this->assertSame('{"response":"My custom exception response"}', $response);
     }
 
+    public function testReturnsCustomResponseWhenExceptionImplementsResponsable()
+    {
+        $response = $this->handler->render($this->request, new ResponsableException)->getContent();
+
+        $this->assertSame('{"response":"My responsable exception response"}', $response);
+    }
+
     public function testReturnsJsonWithoutStackTraceWhenAjaxRequestAndDebugFalseAndExceptionMessageIsMasked()
     {
         $this->config->shouldReceive('get')->with('app.debug', null)->once()->andReturn(false);
@@ -224,11 +237,15 @@ public function testSuspiciousOperationReturns404WithoutReporting()
     }
 }
 
-class CustomException extends Exception implements Responsable
+class CustomException extends Exception
+{
+}
+
+class ResponsableException extends Exception implements Responsable
 {
     public function toResponse($request)
     {
-        return response()->json(['response' => 'My custom exception response']);
+        return response()->json(['response' => 'My responsable exception response']);
     }
 }