Skip to content

Correct error on paginator promise #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2017
Merged

Correct error on paginator promise #245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Relay/Connection/Paginator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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 = [])
{
Expand All @@ -73,7 +73,7 @@ public function backward($args, $total, array $callableArgs = [])
/**
* @param Argument|array $args
*
* @return Connection
* @return Connection|object A connection or a promise
*/
public function forward($args)
{
Expand Down Expand Up @@ -105,7 +105,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 = [])
{
Expand All @@ -118,14 +118,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;
}
}

/**
Expand Down