From 857c3a4f8d49e303f19d4c571402ce855a1595b8 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 24 Feb 2024 17:26:12 +0100 Subject: [PATCH] Remove unused entries from EnvVars enum --- UPGRADE.md | 1 + composer.json | 2 +- config/autoload/installer.global.php | 2 -- module/Core/src/Config/EnvVars.php | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index aa235473..e8390213 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -7,6 +7,7 @@ * Swoole and Openswoole are no longer officially supported runtimes. The recommended alternative is RoadRunner. * Dist files for swoole/openswoole are no longer published. * Webhooks are no longer supported. Migrate to one of the other [real-time updates](https://shlink.io/documentation/advanced/real-time-updates/) mechanisms. +* When using RoadRunner, the amount of web workers, task workers and the port number can no longer be provided via config options. Use `WEB_WORKER_NUM`, `TASK_WORKER_NUM` and `PORT` env vars instead. ### Changes in URL shortener diff --git a/composer.json b/composer.json index 76a98041..fdb6459f 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "shlinkio/shlink-config": "dev-main#a43b380 as 3.0", "shlinkio/shlink-event-dispatcher": "dev-main#aa9023c as 4.0", "shlinkio/shlink-importer": "dev-main#65a9a30 as 5.3", - "shlinkio/shlink-installer": "dev-develop#41e433c as 9.0", + "shlinkio/shlink-installer": "dev-develop#5943255 as 9.0", "shlinkio/shlink-ip-geolocation": "dev-main#a807668 as 3.5", "shlinkio/shlink-json": "^1.1", "spiral/roadrunner": "^2023.3", diff --git a/config/autoload/installer.global.php b/config/autoload/installer.global.php index 753bdb9a..b6a79679 100644 --- a/config/autoload/installer.global.php +++ b/config/autoload/installer.global.php @@ -28,8 +28,6 @@ return [ Option\BasePathConfigOption::class, Option\TimezoneConfigOption::class, Option\Cache\CacheNamespaceConfigOption::class, - Option\Worker\TaskWorkerNumConfigOption::class, - Option\Worker\WebWorkerNumConfigOption::class, Option\Redis\RedisServersConfigOption::class, Option\Redis\RedisSentinelServiceConfigOption::class, Option\Redis\RedisPubSubConfigOption::class, diff --git a/module/Core/src/Config/EnvVars.php b/module/Core/src/Config/EnvVars.php index 0ea74451..e5df9532 100644 --- a/module/Core/src/Config/EnvVars.php +++ b/module/Core/src/Config/EnvVars.php @@ -56,9 +56,6 @@ enum EnvVars: string case BASE_PATH = 'BASE_PATH'; case SHORT_URL_TRAILING_SLASH = 'SHORT_URL_TRAILING_SLASH'; case SHORT_URL_MODE = 'SHORT_URL_MODE'; - case PORT = 'PORT'; - case TASK_WORKER_NUM = 'TASK_WORKER_NUM'; - case WEB_WORKER_NUM = 'WEB_WORKER_NUM'; case ANONYMIZE_REMOTE_ADDR = 'ANONYMIZE_REMOTE_ADDR'; case TRACK_ORPHAN_VISITS = 'TRACK_ORPHAN_VISITS'; case DISABLE_TRACK_PARAM = 'DISABLE_TRACK_PARAM';