diff --git a/CHANGELOG.md b/CHANGELOG.md index ee4a64c6..bd39ed58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,25 @@ 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] +### Added +* *Nothing* + +### Changed +* *Nothing* + +### Deprecated +* *Nothing* + +### Removed +* [#1275](https://github.com/shlinkio/shlink/issues/1275) Removed everything that was deprecated. + + See [UPGRADE](UPGRADE.md#from-v2x-to-v3x) doc in order to get details on how to migrate to this version. + +### Fixed +* *Nothing* + + ## [2.10.0] - 2021-12-12 ### Added * [#1163](https://github.com/shlinkio/shlink/issues/1163) Allowed setting not-found redirects for default domain in the same way it's done for any other domain. @@ -852,7 +871,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this * Preview generation feature completely removed. * Authentication against REST API using JWT is no longer supported. - See [UPGRADE](UPGRADE.md) doc in order to get details on how to migrate to this version. + See [UPGRADE](UPGRADE.md#from-v1x-to-v2x) doc in order to get details on how to migrate to this version. ### Fixed * [#600](https://github.com/shlinkio/shlink/issues/600) Fixed health action so that it works with and without version in the path. diff --git a/module/Core/test-db/Repository/ShortUrlRepositoryTest.php b/module/Core/test-db/Repository/ShortUrlRepositoryTest.php index d4ff42b8..cff341b3 100644 --- a/module/Core/test-db/Repository/ShortUrlRepositoryTest.php +++ b/module/Core/test-db/Repository/ShortUrlRepositoryTest.php @@ -128,7 +128,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase self::assertCount(1, $this->repo->findList(2, 2)); $result = $this->repo->findList(null, null, null, [], ShortUrlsOrdering::fromRawData([ - 'orderBy' => ['visits' => 'DESC'], + 'orderBy' => 'visits-DESC', ])); self::assertCount(3, $result); self::assertSame($bar, $result[0]); @@ -156,7 +156,7 @@ class ShortUrlRepositoryTest extends DatabaseTestCase $this->getEntityManager()->flush(); $result = $this->repo->findList(null, null, null, [], ShortUrlsOrdering::fromRawData([ - 'orderBy' => ['longUrl' => 'ASC'], + 'orderBy' => 'longUrl-ASC', ])); self::assertCount(count($urls), $result); diff --git a/module/Rest/test-api/Middleware/CorsTest.php b/module/Rest/test-api/Middleware/CorsTest.php index a51d6a7b..3efbeacb 100644 --- a/module/Rest/test-api/Middleware/CorsTest.php +++ b/module/Rest/test-api/Middleware/CorsTest.php @@ -73,7 +73,7 @@ class CorsTest extends ApiTestCase { yield 'invalid route' => ['/foo/bar', 'GET,POST,PUT,PATCH,DELETE']; yield 'short URLs route' => ['/short-urls', 'GET,POST']; - yield 'tags route' => ['/tags', 'GET,POST,PUT,DELETE']; + yield 'tags route' => ['/tags', 'GET,PUT,DELETE']; yield 'health route' => ['/health', 'GET']; } }