From cd4fcc9b0a8a04f5e34d753bd9775c3c37d7ad40 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 8 Jul 2025 13:06:16 +0200 Subject: [PATCH] Update shlink-installer --- composer.json | 2 +- config/autoload/installer.global.php | 3 +++ module/Core/src/Config/Options/CorsOptions.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f391842b..26031b7c 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "shlinkio/shlink-config": "^4.0", "shlinkio/shlink-event-dispatcher": "^4.2", "shlinkio/shlink-importer": "^5.6", - "shlinkio/shlink-installer": "dev-develop#c5a8523 as 9.6", + "shlinkio/shlink-installer": "dev-develop#9005232 as 9.6", "shlinkio/shlink-ip-geolocation": "^4.3", "shlinkio/shlink-json": "^1.2", "spiral/roadrunner": "^2025.1", diff --git a/config/autoload/installer.global.php b/config/autoload/installer.global.php index 063ff7d4..e9270eb6 100644 --- a/config/autoload/installer.global.php +++ b/config/autoload/installer.global.php @@ -77,6 +77,9 @@ return [ Option\Matomo\MatomoSiteIdConfigOption::class, Option\Matomo\MatomoApiTokenConfigOption::class, Option\RealTimeUpdates\RealTimeUpdatesTopicsConfigOption::class, + Option\Cors\CorsAllowOriginConfigOption::class, + Option\Cors\CorsAllowCredentialsConfigOption::class, + Option\Cors\CorsMaxAgeConfigOption::class, ], 'installation_commands' => [ diff --git a/module/Core/src/Config/Options/CorsOptions.php b/module/Core/src/Config/Options/CorsOptions.php index efc6ae1c..fbf191ee 100644 --- a/module/Core/src/Config/Options/CorsOptions.php +++ b/module/Core/src/Config/Options/CorsOptions.php @@ -23,7 +23,7 @@ final readonly class CorsOptions public int $maxAge = 3600, ) { $lowerCaseAllowOrigins = strtolower($allowOrigins); - $this->allowOrigins = contains($lowerCaseAllowOrigins, ['*', self::ORIGIN_PATTERN]) + $this->allowOrigins = $lowerCaseAllowOrigins === '*' || $lowerCaseAllowOrigins === self::ORIGIN_PATTERN ? $lowerCaseAllowOrigins : splitByComma($lowerCaseAllowOrigins); }