Skip to content

Commit

Permalink
Merge pull request #8 from Jeroeny/update
Browse files Browse the repository at this point in the history
composer update
  • Loading branch information
Jeroeny authored Jan 9, 2020
2 parents 5adaae0 + 9991582 commit 44cf552
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ language: php
php:
- 7.2
- 7.3
- 7.4snapshot
- 7.4

install:
- composer install --no-progress

script:
- composer normalize --dry-run
- ./vendor/bin/phpcs
- ./vendor/bin/phpstan analyse -c phpstan.neon
- ./vendor/bin/phpunit --coverage-clover=coverage.xml
Expand Down
21 changes: 11 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "jeroeny/gitlab-api",
"type": "library",
"description": "GitLab API client",
"homepage": "https://github.com/jeroeny/gitlab-api",
"keywords": [
"gitlab",
"api"
],
"homepage": "https://github.com/jeroeny/gitlab-api",
"license": "MIT",
"authors": [
{
Expand Down Expand Up @@ -36,20 +36,24 @@
"php-http/httplug": "^2.0",
"php-http/message": "^1.8",
"php-http/multipart-stream-builder": "^1.1",
"symfony/options-resolver": "^4.3|^5.0"
"symfony/options-resolver": "^4.4 || ^5.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5",
"doctrine/coding-standard": "^6.0",
"doctrine/coding-standard": "^6.0 || ^7.0",
"ergebnis/composer-normalize": "^2.2",
"guzzlehttp/psr7": "^1.6",
"laminas/laminas-diactoros": "2.2",
"moxio/php-codesniffer-sniffs": "^2.3",
"php-http/guzzle6-adapter": "^2.0",
"php-http/mock-client": "^1.3",
"phpstan/phpstan": "^0.11",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^8.4",
"slevomat/coding-standard": "^5.0",
"squizlabs/php_codesniffer": "^3.5",
"zendframework/zend-diactoros": "^2.1"
"slevomat/coding-standard": "^5.0 || ^6.0",
"squizlabs/php_codesniffer": "^3.5"
},
"config": {
"sort-packages": true
},
"autoload": {
"psr-4": {
Expand All @@ -60,8 +64,5 @@
"psr-4": {
"Gitlab\\Tests\\": "tests/unit"
}
},
"config": {
"sort-packages": true
}
}
2 changes: 1 addition & 1 deletion src/SimpleResultPager.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected function get($key)
return [];
}

$pagination = ResponseMediator::getPagination($this->client->getResponseHistory()->getLastResponse());
$pagination = ResponseMediator::getPagination($this->client->getResponseHistory()->getLastResponse()) ?? [];

return ResponseMediator::getContent($this->client->getHttpClient()->get($pagination[$key]));
}
Expand Down

0 comments on commit 44cf552

Please sign in to comment.