Merge branch '0.9'

Author: Jeremiah VALERIE

Relay/Connection/Paginator.php

@@ -35,7 +35,7 @@ public function __construct(callable $fetcher, $promise = self::MODE_REGULAR)
      * @param int|callable $total
      * @param array        $callableArgs
      *
-     * @return Connection
+     * @return Connection|object A connection or a promise
      */
     public function backward($args, $total, array $callableArgs = [])
     {
@@ -58,7 +58,7 @@ public function backward($args, $total, array $callableArgs = [])
     /**
      * @param Argument $args
      *
-     * @return Connection
+     * @return Connection|object A connection or a promise
      */
     public function forward($args)
     {
@@ -90,7 +90,7 @@ public function forward($args)
      * @param int|callable $total
      * @param array        $callableArgs
      *
-     * @return Connection
+     * @return Connection|object A connection or a promise
      */
     public function auto($args, $total, $callableArgs = [])
     {
@@ -103,14 +103,16 @@ public function auto($args, $total, $callableArgs = [])
         }
 
         if ($this->promise) {
-            $connection->then(function (Connection $connection) use ($total, $callableArgs) {
+            return $connection->then(function (Connection $connection) use ($total, $callableArgs) {
                 $connection->totalCount = $this->computeTotalCount($total, $callableArgs);
+
+                return $connection;
             });
         } else {
             $connection->totalCount = $this->computeTotalCount($total, $callableArgs);
-        }
 
-        return $connection;
+            return $connection;
+        }
     }
 
     /**