Skip to content

Commit

Permalink
Merge pull request #51 from acelaya-forks/feature/shlink-3.7
Browse files Browse the repository at this point in the history
Feature/shlink 3.7
  • Loading branch information
acelaya authored Feb 4, 2024
2 parents 92ce1bf + 235d782 commit e27672c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
php-version: ['8.2', '8.3']
shlink-version: ['3.6', '3.5.4', '3.4.0', '3.3.2', '3.2.1', '3.1.2', '3.0.3']
shlink-version: ['3.7', '3.6', '3.5.4', '3.4.0', '3.3.2', '3.2.1', '3.1.2', '3.0.3']
shlink-api-version: ['2', '3']
exclude:
- shlink-version: '3.0.3'
Expand Down
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).

## [Unreleased]
## [1.4.0] - 2024-02-04
### Added
* Add support for PHP 8.3

### Changed
* *Nothing*
* Add Shlink 3.7 to integration test matrix
* Update dependencies

### Deprecated
* Deprecated support for openswoole.
* *Nothing*

### Removed
* Drop support for PHP 8.1
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
"require-dev": {
"devster/ubench": "^2.1",
"guzzlehttp/guzzle": "^7.7",
"infection/infection": "^0.27.7",
"guzzlehttp/guzzle": "^7.8",
"infection/infection": "^0.27.9",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-phpunit": "^1.3",
"phpunit/phpunit": "^10.4",
"phpunit/phpunit": "^10.5",
"roave/security-advisories": "dev-master",
"shlinkio/php-coding-standard": "~2.3.0",
"symfony/var-dumper": "^6.3"
"symfony/var-dumper": "^7.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Model/ListEndpointIterator.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ private function getFullList(): iterable

$isLastPage = $currentPage < 0 || $currentPage === $this->currentPagination['pagesCount'];
if (! $isLastPage) {
$this->loadPage(($currentPage ?? -1) + 1);
$this->loadPage($currentPage + 1);
yield from $this->getFullList();
}
}
Expand Down

0 comments on commit e27672c

Please sign in to comment.