Merge pull request dingo#1692 from zhwei/exception-handler

Exception Handler: set exception to $response->exception

Author: specialtactics

src/Exception/Handler.php

@@ -2,17 +2,17 @@
 
 namespace Dingo\Api\Exception;
 
-use Exception;
-use ReflectionFunction;
-use Illuminate\Support\Str;
-use Illuminate\Http\Response;
 use Dingo\Api\Contract\Debug\ExceptionHandler;
 use Dingo\Api\Contract\Debug\MessageBagErrors;
+use Exception;
+use Illuminate\Contracts\Debug\ExceptionHandler as IlluminateExceptionHandler;
+use Illuminate\Http\Response;
+use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
+use ReflectionFunction;
 use Symfony\Component\HttpFoundation\Response as BaseResponse;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-use Illuminate\Contracts\Debug\ExceptionHandler as IlluminateExceptionHandler;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class Handler implements ExceptionHandler, IlluminateExceptionHandler
 {
@@ -157,11 +157,11 @@ public function handle(Exception $exception)
                     $response = new Response($response, $this->getExceptionStatusCode($exception));
                 }
 
-                return $response;
+                return $response->withException($exception);
             }
         }
 
-        return $this->genericResponse($exception);
+        return $this->genericResponse($exception)->withException($exception);
     }
 
     /**

tests/Exception/HandlerTest.php

@@ -2,15 +2,15 @@
 
 namespace Dingo\Api\Tests\Exception;
 
-use Mockery as m;
-use RuntimeException;
-use Illuminate\Http\Response;
-use PHPUnit\Framework\TestCase;
 use Dingo\Api\Exception\Handler;
+use Dingo\Api\Exception\ResourceException;
+use Dingo\Api\Http\Request as ApiRequest;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
-use Dingo\Api\Http\Request as ApiRequest;
-use Dingo\Api\Exception\ResourceException;
+use Illuminate\Http\Response;
+use Mockery as m;
+use PHPUnit\Framework\TestCase;
+use RuntimeException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class HandlerTest extends TestCase
@@ -55,6 +55,7 @@ public function testExceptionHandlerHandlesException()
 
         $this->assertSame('foo', $response->getContent());
         $this->assertSame(404, $response->getStatusCode());
+        $this->assertSame($exception, $response->exception);
     }
 
     public function testExceptionHandlerHandlesExceptionAndCreatesNewResponse()
@@ -142,6 +143,7 @@ public function testRegularExceptionsAreHandledByGenericHandler()
 
         $this->assertSame('{"message":"Uh oh","status_code":500}', $response->getContent());
         $this->assertSame(500, $response->getStatusCode());
+        $this->assertSame($exception, $response->exception);
     }
 
     public function testResourceExceptionErrorsAreIncludedInResponse()