From 4b7b530f49248c665dcacffaa0690e427dd1f8ea Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Thu, 17 Oct 2024 09:33:53 +0200
Subject: [PATCH] Update to shlink-config 3.2.1, which fixes skipping config
 options with null value

---
 CHANGELOG.md                       | 17 +++++++++++++++
 composer.json                      |  2 +-
 module/Core/src/Config/EnvVars.php | 34 +++++++++++++++---------------
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07cae7fc9..7575178bc 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).
 
+## [4.2.3] - 2024-10-17
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#2225](https://github.com/shlinkio/shlink/issues/2225) Fix regression introduced in v4.2.2, making config options with `null` value to be promoted as env vars with value `''`, instead of being skipped.
+
+
 ## [4.2.2] - 2024-10-14
 ### Added
 * *Nothing*
diff --git a/composer.json b/composer.json
index 11109b644..8c85e1eba 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
         "ramsey/uuid": "^4.7",
         "shlinkio/doctrine-specification": "^2.1.1",
         "shlinkio/shlink-common": "^6.3",
-        "shlinkio/shlink-config": "^3.2",
+        "shlinkio/shlink-config": "^3.2.1",
         "shlinkio/shlink-event-dispatcher": "^4.1",
         "shlinkio/shlink-importer": "^5.3.2",
         "shlinkio/shlink-installer": "^9.2",
diff --git a/module/Core/src/Config/EnvVars.php b/module/Core/src/Config/EnvVars.php
index f478048ba..2fe5dfd9e 100644
--- a/module/Core/src/Config/EnvVars.php
+++ b/module/Core/src/Config/EnvVars.php
@@ -97,6 +97,23 @@ public function loadFromEnv(): mixed
         return env($this->value) ?? $this->loadFromFileEnv() ?? $this->defaultValue();
     }
 
+    /**
+     * Checks if an equivalent environment variable exists with the `_FILE` suffix. If so, it loads its value as a file,
+     * reads it, and returns its contents.
+     * This is useful when loading Shlink with docker compose and using secrets.
+     * See https://docs.docker.com/compose/use-secrets/
+     */
+    private function loadFromFileEnv(): string|int|bool|null
+    {
+        $file = env(sprintf('%s_FILE', $this->value));
+        if ($file === null || ! is_file($file)) {
+            return null;
+        }
+
+        $content = file_get_contents($file);
+        return $content ? parseEnvVar($content) : null;
+    }
+
     private function defaultValue(): string|int|bool|null
     {
         return match ($this) {
@@ -153,23 +170,6 @@ private function defaultValue(): string|int|bool|null
         };
     }
 
-    /**
-     * Checks if an equivalent environment variable exists with the `_FILE` suffix. If so, it loads its value as a file,
-     * reads it, and returns its contents.
-     * This is useful when loading Shlink with docker compose and using secrets.
-     * See https://docs.docker.com/compose/use-secrets/
-     */
-    private function loadFromFileEnv(): string|int|bool|null
-    {
-        $file = env(sprintf('%s_FILE', $this->value));
-        if ($file === null || ! is_file($file)) {
-            return null;
-        }
-
-        $content = file_get_contents($file);
-        return $content ? parseEnvVar($content) : null;
-    }
-
     public function existsInEnv(): bool
     {
         return $this->loadFromEnv() !== null;