Promise->then's $onFulfilled is no longer required to return the response

Author: Samuel Nogueira

src/Promise.php

@@ -81,7 +81,9 @@ public function then(callable $onFulfilled = null, callable $onRejected = null)
 
         $this->onFulfilled = function (ResponseInterface $response) use ($onFulfilled, $newPromise) {
             try {
-                $newPromise->resolve($onFulfilled($response));
+                $return = $onFulfilled($response);
+
+                $newPromise->resolve(null !== $return ? $return : $response);
             } catch (Exception $exception) {
                 $newPromise->reject($exception);
             }

tests/PromiseTest.php

@@ -6,6 +6,7 @@
 use Http\Adapter\React\Promise;
 use Http\Adapter\React\ReactFactory;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\ResponseInterface;
 
 class PromiseTest extends TestCase
 {
@@ -31,4 +32,25 @@ public function testChain()
         self::assertEquals(200, $response->getStatusCode());
         self::assertEquals(300, $updatedResponse->getStatusCode());
     }
+
+    public function testOnFulfilledOptionalReturn()
+    {
+        $promise = new Promise($this->loop);
+        $response = new Response(200);
+
+        // create a random mock so we can assert $onFulfilled is called with the correct response
+        /** @var \SplObjectStorage|\PHPUnit_Framework_MockObject_MockObject $mock */
+        $mock = $this->getMockBuilder(\SplObjectStorage::class)->getMock();
+        $mock->expects(self::once())->method('attach')->with($response);
+
+        $lastPromise = $promise->then(function (ResponseInterface $response) use ($mock) {
+            $mock->attach($response);
+        });
+
+        $promise->resolve($response);
+        $lastResponse = $lastPromise->wait();
+
+        // even though our $onFulfilled doesn't return a value, we expect the promise to unwrap the original response
+        self::assertSame($response, $lastResponse);
+    }
 }