fix exception case

Author: fbourigault

Collector/ProfilePlugin.php

@@ -77,7 +77,17 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
             return $first($request);
         };
 
-        return $this->plugin->handleRequest($request, $wrappedNext, $wrappedFirst)->then(function (ResponseInterface $response) use ($profile, $request, $stack) {
+        try {
+            $promise = $this->plugin->handleRequest($request, $wrappedNext, $wrappedFirst);
+        } catch (Exception $e) {
+            $profile->setFailed(true);
+            $profile->setResponse($this->formatter->formatException($e));
+            $this->collectRequestInformation($request, $stack);
+
+            throw $e;
+        }
+
+        return $promise->then(function (ResponseInterface $response) use ($profile, $request, $stack) {
             $profile->setResponse($this->formatter->formatResponse($response));
             $this->collectRequestInformation($request, $stack);
 
@@ -96,7 +106,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
      * and the cache is hit without re-validation.
      *
      * @param RequestInterface $request
-     * @param Stack|null $stack
+     * @param Stack|null       $stack
      */
     private function collectRequestInformation(RequestInterface $request, Stack $stack = null)
     {

Tests/Unit/Collector/ProfilePluginTest.php

@@ -11,6 +11,8 @@
 use Http\HttplugBundle\Collector\ProfilePlugin;
 use Http\HttplugBundle\Collector\Stack;
 use Http\Promise\FulfilledPromise;
+use Http\Promise\Promise;
+use Http\Promise\RejectedPromise;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
@@ -36,6 +38,11 @@ class ProfilePluginTest extends \PHPUnit_Framework_TestCase
      */
     private $response;
 
+    /**
+     * @var Promise
+     */
+    private $fulfilledPromise;
+
     /**
      * @var Stack
      */
@@ -46,6 +53,11 @@ class ProfilePluginTest extends \PHPUnit_Framework_TestCase
      */
     private $exception;
 
+    /**
+     * @var Promise
+     */
+    private $rejectedPromise;
+
     /**
      * @var Formatter
      */
@@ -62,8 +74,10 @@ public function setUp()
         $this->collector = $this->getMockBuilder(Collector::class)->disableOriginalConstructor()->getMock();
         $this->request = new Request('GET', '/');
         $this->response = new Response();
+        $this->fulfilledPromise = new FulfilledPromise($this->response);
         $this->currentStack = new Stack('default', 'FormattedRequest');
         $this->exception = new TransferException();
+        $this->rejectedPromise = new RejectedPromise($this->exception);
         $this->formatter = $this->getMockBuilder(Formatter::class)->disableOriginalConstructor()->getMock();
 
         $this->collector
@@ -74,9 +88,7 @@ public function setUp()
         $this->plugin
             ->method('handleRequest')
             ->willReturnCallback(function ($request, $next, $first) {
-                $next($request);
-
-                return new FulfilledPromise($this->response);
+                return $next($request);
             })
         ;
 
@@ -115,13 +127,15 @@ public function testCallDecoratedPlugin()
         ;
 
         $this->subject->handleRequest($this->request, function () {
+            return $this->fulfilledPromise;
         }, function () {
         });
     }
 
     public function testProfileIsInitialized()
     {
         $this->subject->handleRequest($this->request, function () {
+            return $this->fulfilledPromise;
         }, function () {
         });
 
@@ -133,6 +147,7 @@ public function testProfileIsInitialized()
     public function testCollectRequestInformations()
     {
         $this->subject->handleRequest($this->request, function () {
+            return $this->fulfilledPromise;
         }, function () {
         });
 
@@ -143,6 +158,7 @@ public function testCollectRequestInformations()
     public function testOnFulfilled()
     {
         $promise = $this->subject->handleRequest($this->request, function () {
+            return $this->fulfilledPromise;
         }, function () {
         });
 
@@ -156,7 +172,7 @@ public function testOnRejected()
         $this->setExpectedException(TransferException::class);
 
         $promise = $this->subject->handleRequest($this->request, function () {
-            throw new TransferException();
+            return $this->rejectedPromise;
         }, function () {
         });