cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Laravel version update

Browse Source 
Laravel version update
This commit is contained in:
Manish Verma
2018-08-06 18:48:58 +05:30
parent d143048413
commit 126fbb0255
13678 changed files with 1031482 additions and 778530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/aws/aws-sdk-php/src/ResultPaginator.php vendored
View File

@@ -143,7 +143,7 @@ class ResultPaginator implements \Iterator
private function createNextCommand(array $args, array $nextToken = null)
{
return $this->client->getCommand($this->operation, $args + ($nextToken ?: []));
return $this->client->getCommand($this->operation, array_merge($args, ($nextToken ?: [])));
}
private function determineNextToken(Result $result)