From a3ea8f56dd81b9f6acc88817b1bf001bd8bfa873 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Thu, 24 Oct 2024 08:49:58 +0200
Subject: [PATCH] Remove app_options config

---
 Dockerfile                                    |  2 +-
 build.sh                                      |  4 ++--
 config/autoload/app_options.global.php        | 14 --------------
 module/Core/config/dependencies.config.php    |  3 +--
 module/Core/src/Config/Options/AppOptions.php | 10 +++++++++-
 5 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 100644 config/autoload/app_options.global.php

diff --git a/Dockerfile b/Dockerfile
index 3a1d5bcc..e6e94734 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ RUN apk add --no-cache git && \
     php composer.phar install --no-dev --prefer-dist --optimize-autoloader --no-progress --no-interaction && \
     php composer.phar clear-cache && \
     rm -r docker composer.* && \
-    sed -i "s/%SHLINK_VERSION%/${SHLINK_VERSION}/g" config/autoload/app_options.global.php
+    sed -i "s/%SHLINK_VERSION%/${SHLINK_VERSION}/g" module/Core/src/Config/Options/AppOptions.php
 
 
 # Prepare final image
diff --git a/build.sh b/build.sh
index 7b77295f..6786c492 100755
--- a/build.sh
+++ b/build.sh
@@ -35,8 +35,8 @@ ${composerBin} install --no-dev --prefer-dist --optimize-autoloader --no-progres
 echo 'Deleting dev files...'
 rm composer.*
 
-# Update Shlink version in config
-sed -i "s/%SHLINK_VERSION%/${version}/g" config/autoload/app_options.global.php
+# Update Shlink version
+sed -i "s/%SHLINK_VERSION%/${version}/g" module/Core/src/Config/Options/AppOptions.php
 
 # Compressing file
 echo 'Compressing files...'
diff --git a/config/autoload/app_options.global.php b/config/autoload/app_options.global.php
deleted file mode 100644
index 9590e544..00000000
--- a/config/autoload/app_options.global.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Shlinkio\Shlink\Core\Config\EnvVars;
-
-return [
-
-    'app_options' => [
-        'name' => 'Shlink',
-        'version' => EnvVars::isDevEnv() ? 'latest' : '%SHLINK_VERSION%',
-    ],
-
-];
diff --git a/module/Core/config/dependencies.config.php b/module/Core/config/dependencies.config.php
index 420d8a39..552d5e2a 100644
--- a/module/Core/config/dependencies.config.php
+++ b/module/Core/config/dependencies.config.php
@@ -8,7 +8,6 @@ use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Laminas\ServiceManager\Factory\InvokableFactory;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Shlinkio\Shlink\Common\Doctrine\EntityRepositoryFactory;
-use Shlinkio\Shlink\Config\Factory\ValinorConfigFactory;
 use Shlinkio\Shlink\Core\Config\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifier;
 use Shlinkio\Shlink\Importer\ImportedLinksProcessorInterface;
@@ -24,7 +23,7 @@ return [
             ErrorHandler\NotFoundRedirectHandler::class => ConfigAbstractFactory::class,
             ErrorHandler\NotFoundTemplateHandler::class => InvokableFactory::class,
 
-            Config\Options\AppOptions::class => [ValinorConfigFactory::class, 'config.app_options'],
+            Config\Options\AppOptions::class => [Config\Options\AppOptions::class, 'fromEnv'],
             Config\Options\DeleteShortUrlsOptions::class => [Config\Options\DeleteShortUrlsOptions::class, 'fromEnv'],
             Config\Options\NotFoundRedirectOptions::class => [Config\Options\NotFoundRedirectOptions::class, 'fromEnv'],
             Config\Options\RedirectOptions::class => [Config\Options\RedirectOptions::class, 'fromEnv'],
diff --git a/module/Core/src/Config/Options/AppOptions.php b/module/Core/src/Config/Options/AppOptions.php
index 42f07642..71e3f507 100644
--- a/module/Core/src/Config/Options/AppOptions.php
+++ b/module/Core/src/Config/Options/AppOptions.php
@@ -4,14 +4,22 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Core\Config\Options;
 
+use Shlinkio\Shlink\Core\Config\EnvVars;
+
 use function sprintf;
 
 final class AppOptions
 {
-    public function __construct(public string $name = 'Shlink', public string $version = '3.0.0')
+    public function __construct(public string $name = 'Shlink', public string $version = '4.0.0')
     {
     }
 
+    public static function fromEnv(): self
+    {
+        $version = EnvVars::isDevEnv() ? 'latest' : '%SHLINK_VERSION%';
+        return new self(version: $version);
+    }
+
     public function __toString(): string
     {
         return sprintf('%s:v%s', $this->name, $this->version);