From 91fd5809ff893ba508035f36e070ffed916ca3a3 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Sat, 8 Nov 2025 08:28:52 +0100
Subject: [PATCH] Remove REDIRECT_APPEND_EXTRA_PATH env var

---
 CHANGELOG.md                                           | 3 ++-
 module/Core/src/Config/EnvVars.php                     | 8 ++------
 module/Core/src/Config/Options/UrlShortenerOptions.php | 9 +--------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee96a9b..0098a519 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,8 +15,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * *Nothing*
 
 ### Removed
-* [#2514](https://github.com/shlinkio/shlink/issues/2514) Remove support to generate QR codes. This functionality is now handled by Shlink Web Client and Shlink Dashboard.
 * [#2507](https://github.com/shlinkio/shlink/issues/2507) Drop support for PHP 8.3.
+* [#2514](https://github.com/shlinkio/shlink/issues/2514) Remove support to generate QR codes. This functionality is now handled by Shlink Web Client and Shlink Dashboard.
+* [#2517](https://github.com/shlinkio/shlink/issues/2517) Remove `REDIRECT_APPEND_EXTRA_PATH` env var. Use `REDIRECT_EXTRA_PATH_MODE=append` instead.
 
 ### Fixed
 * *Nothing*
diff --git a/module/Core/src/Config/EnvVars.php b/module/Core/src/Config/EnvVars.php
index 17b6dd60..f42d6894 100644
--- a/module/Core/src/Config/EnvVars.php
+++ b/module/Core/src/Config/EnvVars.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Core\Config;
 
+use Shlinkio\Shlink\Core\Config\Options\ExtraPathMode;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlMode;
 
 use function date_default_timezone_get;
@@ -87,9 +88,6 @@ enum EnvVars: string
     case TRUSTED_PROXIES = 'TRUSTED_PROXIES';
     case LOGS_FORMAT = 'LOGS_FORMAT';
 
-    /** @deprecated Use REDIRECT_EXTRA_PATH */
-    case REDIRECT_APPEND_EXTRA_PATH = 'REDIRECT_APPEND_EXTRA_PATH';
-
     public function loadFromEnv(): mixed
     {
         return env($this->value) ?? $this->loadFromFileEnv() ?? $this->defaultValue();
@@ -126,9 +124,7 @@ enum EnvVars: string
             self::SHORT_URL_TRAILING_SLASH => false,
             self::DEFAULT_DOMAIN, self::BASE_PATH => '',
             self::CACHE_NAMESPACE => 'Shlink',
-            // Deprecated. In Shlink 5.0.0, add default value for REDIRECT_EXTRA_PATH_MODE
-            self::REDIRECT_APPEND_EXTRA_PATH => false,
-            // self::REDIRECT_EXTRA_PATH_MODE => ExtraPathMode::DEFAULT->value,
+            self::REDIRECT_EXTRA_PATH_MODE => ExtraPathMode::DEFAULT->value,
 
             self::REDIS_PUB_SUB_ENABLED,
             self::MATOMO_ENABLED,
diff --git a/module/Core/src/Config/Options/UrlShortenerOptions.php b/module/Core/src/Config/Options/UrlShortenerOptions.php
index 3d111447..38fc172d 100644
--- a/module/Core/src/Config/Options/UrlShortenerOptions.php
+++ b/module/Core/src/Config/Options/UrlShortenerOptions.php
@@ -36,15 +36,8 @@ final readonly class UrlShortenerOptions
             MIN_SHORT_CODES_LENGTH,
         );
 
-        // Deprecated. Initialize extra path from REDIRECT_APPEND_EXTRA_PATH.
-        $appendExtraPath = EnvVars::REDIRECT_APPEND_EXTRA_PATH->loadFromEnv();
-        $extraPathMode = $appendExtraPath ? ExtraPathMode::APPEND : ExtraPathMode::DEFAULT;
-
-        // If REDIRECT_EXTRA_PATH_MODE was explicitly provided, it has precedence
         $extraPathModeFromEnv = EnvVars::REDIRECT_EXTRA_PATH_MODE->loadFromEnv();
-        if ($extraPathModeFromEnv !== null) {
-            $extraPathMode = ExtraPathMode::tryFrom($extraPathModeFromEnv) ?? ExtraPathMode::DEFAULT;
-        }
+        $extraPathMode = ExtraPathMode::tryFrom($extraPathModeFromEnv) ?? ExtraPathMode::DEFAULT;
 
         return new self(
             defaultDomain: EnvVars::DEFAULT_DOMAIN->loadFromEnv(),