[10.x] Fix inconsistentcy between report and render methods (#47201)

* Move mapException to top * Add missing test to mapException
laravel · May 24, 2023 · c95df92 · c95df92
1 parent 9475aac
commit c95df92
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -373,6 +373,8 @@ protected function context()
      */
     public function render($request, Throwable $e)
     {
+        $e = $this->prepareException($this->mapException($e));
+
         if (method_exists($e, 'render') && $response = $e->render($request)) {
             return Router::toResponse($request, $response);
         }
@@ -381,8 +383,6 @@ public function render($request, Throwable $e)
             return $e->toResponse($request);
         }
 
-        $e = $this->prepareException($this->mapException($e));
-
         if ($response = $this->renderViaCallbacks($request, $e)) {
             return $response;
         }

diff --git a/tests/Foundation/FoundationExceptionsHandlerTest.php b/tests/Foundation/FoundationExceptionsHandlerTest.php
@@ -195,6 +195,17 @@ public function testReturnsCustomResponseWhenExceptionImplementsResponsable()
         $this->assertSame('{"response":"My responsable exception response"}', $response);
     }
 
+    public function testReturnsCustomResponseFromMappedException()
+    {
+        $this->handler->map(function (RuntimeException $e) {
+            return new ResponsableException();
+        });
+
+        $response = $this->handler->render($this->request, new RuntimeException)->getContent();
+
+        $this->assertSame('{"response":"My responsable exception response"}', $response);
+    }
+
     public function testReturnsJsonWithoutStackTraceWhenAjaxRequestAndDebugFalseAndExceptionMessageIsMasked()
     {
         $this->config->shouldReceive('get')->with('app.debug', null)->once()->andReturn(false);