From 80bdeb280afdea9453541d7b51c719c8668fc875 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Wed, 3 Jul 2024 10:09:00 +0200 Subject: [PATCH 1/2] Update to RoadRunner 2024 --- CHANGELOG.md | 2 +- composer.json | 6 +++--- docker-compose.ci.yml | 2 -- docker-compose.override.yml.dist | 2 -- docker-compose.yml | 2 -- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70d3930a..c70ff102 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this * [#2018](https://github.com/shlinkio/shlink/issues/2018) Add option to allow all short URLs to be unconditionally crawlable in robots.txt, via `ROBOTS_ALLOW_ALL_SHORT_URLS=true` env var, or config options. ### Changed -* *Nothing* +* [#2096](https://github.com/shlinkio/shlink/issues/2096) Update to RoadRunner 2024. ### Deprecated * *Nothing* diff --git a/composer.json b/composer.json index c94cbdfa..87b1c1d2 100644 --- a/composer.json +++ b/composer.json @@ -51,10 +51,10 @@ "shlinkio/shlink-installer": "dev-develop#11e66d8 as 9.2", "shlinkio/shlink-ip-geolocation": "^4.0", "shlinkio/shlink-json": "^1.1", - "spiral/roadrunner": "^2023.3", + "spiral/roadrunner": "^2024.1", "spiral/roadrunner-cli": "^2.6", - "spiral/roadrunner-http": "^3.3", - "spiral/roadrunner-jobs": "^4.3", + "spiral/roadrunner-http": "^3.5", + "spiral/roadrunner-jobs": "^4.5", "symfony/console": "^7.0", "symfony/filesystem": "^7.0", "symfony/lock": "^7.0", diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index f4235dcb..6bc053c3 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -1,5 +1,3 @@ -version: '3' - services: shlink_db_mysql: environment: diff --git a/docker-compose.override.yml.dist b/docker-compose.override.yml.dist index a3af3546..85e58554 100644 --- a/docker-compose.override.yml.dist +++ b/docker-compose.override.yml.dist @@ -1,5 +1,3 @@ -version: '3' - services: shlink_php: user: 1000:1000 diff --git a/docker-compose.yml b/docker-compose.yml index 918be7ca..d1673b51 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: shlink_nginx: container_name: shlink_nginx From c4f8da5f023fa2367afbe8e4cfbe1e962b33bb08 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Wed, 3 Jul 2024 19:53:26 +0200 Subject: [PATCH 2/2] Fix phpstan error definition --- phpstan.neon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpstan.neon b/phpstan.neon index 9ebaec6e..691b951a 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -11,6 +11,6 @@ parameters: objectManagerLoader: 'config/entity-manager.php' ignoreErrors: - '#should return int<0, max> but returns int#' - - '#expects -1|int<1, max>, int given#' + - '#expects -1\|int<1, max>, int given#' - identifier: missingType.generics - identifier: missingType.iterableValue