diff --git a/CHANGELOG.md b/CHANGELOG.md index 9120101f..a640aa80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,23 @@ 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 +* [#2573](https://github.com/shlinkio/shlink/issues/2573) Update to PHPUnit 13 + +### Deprecated +* *Nothing* + +### Removed +* *Nothing* + +### Fixed +* *Nothing* + + ## [5.0.0] - 2026-01-09 ### Added * [#2431](https://github.com/shlinkio/shlink/issues/2431) Add new date-based conditions for the dynamic rules redirections system, that allow to perform redirections based on an ISO-8601 date value. diff --git a/composer.json b/composer.json index e21a021f..f30d6e58 100644 --- a/composer.json +++ b/composer.json @@ -41,12 +41,12 @@ "pagerfanta/core": "^3.8", "ramsey/uuid": "^4.7", "shlinkio/doctrine-specification": "^2.2", - "shlinkio/shlink-common": "dev-main#d4ae052 as 8.0.0", - "shlinkio/shlink-config": "dev-main#fb186e4 as 4.1.0", - "shlinkio/shlink-event-dispatcher": "dev-main#54d4701 as 4.4.0", - "shlinkio/shlink-importer": "dev-main#63753cf as 5.7.0", - "shlinkio/shlink-installer": "dev-develop#a225b16 as 10.0.0", - "shlinkio/shlink-ip-geolocation": "dev-main#e0c45b2 as 5.0.0", + "shlinkio/shlink-common": "^8.0.0", + "shlinkio/shlink-config": "^4.1.0", + "shlinkio/shlink-event-dispatcher": "^4.4.0", + "shlinkio/shlink-importer": "^5.7.0", + "shlinkio/shlink-installer": "^10.0.0", + "shlinkio/shlink-ip-geolocation": "^5.0.0", "shlinkio/shlink-json": "^1.3", "spiral/roadrunner": "^2025.1", "spiral/roadrunner-cli": "^2.7", @@ -65,17 +65,14 @@ "phpstan/phpstan-doctrine": "^2.0", "phpstan/phpstan-phpunit": "^2.0.5", "phpstan/phpstan-symfony": "^2.0", - "phpunit/php-code-coverage": "^12.0", - "phpunit/phpcov": "^11.0", - "phpunit/phpunit": "^12.0.10", + "phpunit/php-code-coverage": "^13.0", + "phpunit/phpcov": "^12.0", + "phpunit/phpunit": "^13.0", "shlinkio/php-coding-standard": "~2.5.0", - "shlinkio/shlink-test-utils": "^4.4", + "shlinkio/shlink-test-utils": "^4.5", "symfony/var-dumper": "^8.0", "veewee/composer-run-parallel": "^1.4" }, - "conflict": { - "symfony/var-exporter": ">=6.3.9,<=6.4.0" - }, "autoload": { "psr-4": { "Shlinkio\\Shlink\\CLI\\": "module/CLI/src", diff --git a/phpunit-api.xml b/phpunit-api.xml index dc682322..7b9eee65 100644 --- a/phpunit-api.xml +++ b/phpunit-api.xml @@ -7,6 +7,8 @@ cacheDirectory="build/.phpunit/api-tests.cache" displayDetailsOnTestsThatTriggerWarnings="true" displayDetailsOnTestsThatTriggerDeprecations="true" + displayDetailsOnPhpunitNotices="true" + displayDetailsOnTestsThatTriggerNotices="true" > diff --git a/phpunit-cli.xml b/phpunit-cli.xml index 186a9511..f16b5ad3 100644 --- a/phpunit-cli.xml +++ b/phpunit-cli.xml @@ -7,6 +7,8 @@ cacheDirectory="build/.phpunit/cli-tests.cache" displayDetailsOnTestsThatTriggerWarnings="true" displayDetailsOnTestsThatTriggerDeprecations="true" + displayDetailsOnPhpunitNotices="true" + displayDetailsOnTestsThatTriggerNotices="true" > diff --git a/phpunit-db.xml b/phpunit-db.xml index f63a2d7e..32d19d4b 100644 --- a/phpunit-db.xml +++ b/phpunit-db.xml @@ -7,6 +7,8 @@ cacheDirectory="build/.phpunit/db-tests.cache" displayDetailsOnTestsThatTriggerWarnings="true" displayDetailsOnTestsThatTriggerDeprecations="true" + displayDetailsOnPhpunitNotices="true" + displayDetailsOnTestsThatTriggerNotices="true" >