Migrate dev-specific configuration to env vars via .env file

.gitignore

@@ -15,3 +15,4 @@ docs/mercure.html
 docker-compose.override.yml
 .phpunit.result.cache
 docs/swagger/swagger-inlined.json
+shlink-dev.local.env

config/autoload/delete_short_urls.global.php

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink;
-
-use Shlinkio\Shlink\Core\Config\EnvVars;
-
-return (static function (): array {
-    $threshold = EnvVars::DELETE_SHORT_URL_THRESHOLD->loadFromEnv();
-
-    return [
-
-        'delete_short_urls' => [
-            'check_visits_threshold' => $threshold !== null,
-            'visits_threshold' => (int) ($threshold ?? DEFAULT_DELETE_SHORT_URL_THRESHOLD),
-        ],
-
-    ];
-})();

config/autoload/entity-manager.local.php.dist

@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    'entity_manager' => [
-        'connection' => [
-            // MySQL
-            'user' => 'root',
-            'password' => 'root',
-            'driver' => 'pdo_mysql',
-            'host' => 'shlink_db_mysql',
-            'dbname' => 'shlink',
-//            'dbname' => 'shlink_foo',
-            'charset' => 'utf8mb4',
-
-            // MariaDB
-//            'user' => 'root',
-//            'password' => 'root',
-//            'driver' => 'pdo_mysql',
-//            'host' => 'shlink_db_maria',
-//            'dbname' => 'shlink_foo',
-//            'charset' => 'utf8mb4',
-
-            // Postgres
-//            'user' => 'postgres',
-//            'password' => 'root',
-//            'driver' => 'pdo_pgsql',
-//            'host' => 'shlink_db_postgres',
-//            'dbname' => 'shlink_foo',
-//            'charset' => 'utf8',
-
-            // MSSQL
-//            'user' => 'sa',
-//            'password' => 'Passw0rd!',
-//            'driver' => 'pdo_sqlsrv',
-//            'host' => 'shlink_db_ms',
-//            'dbname' => 'shlink_foo',
-//            'driverOptions' => [
-//                'TrustServerCertificate' => 'true',
-//            ],
-        ],
-    ],
-
-];

config/autoload/matomo.global.php

@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Shlinkio\Shlink\Core\Config\EnvVars;
-
-return [
-
-    'matomo' => [
-        'enabled' => (bool) EnvVars::MATOMO_ENABLED->loadFromEnv(),
-        'base_url' => EnvVars::MATOMO_BASE_URL->loadFromEnv(),
-        'site_id' => EnvVars::MATOMO_SITE_ID->loadFromEnv(),
-        'api_token' => EnvVars::MATOMO_API_TOKEN->loadFromEnv(),
-    ],
-
-];

config/autoload/matomo.local.php.dist

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Dev matomo instance needs to be manually configured once before enabling the configuration below.
- *
- * 1. Go to http://localhost:8003 and follow the installation instructions.
- * 2. Open data/infra/matomo/config/config.ini.php and replace `trusted_hosts[] = "localhost"` with
- *   `trusted_hosts[] = "localhost:8003"` (see https://github.com/matomo-org/matomo/issues/9549)
- * 3. Go to http://localhost:8003/index.php?module=SitesManager&action=index and paste the ID for the site you just
- *    created into the `site_id` field below.
- * 4. Go to http://localhost:8003/index.php?module=UsersManager&action=userSecurity, scroll down, click
- *    "Create new token" and once generated, paste the token into the `api_token` field below.
- */
-
-return [
-
-    'matomo' => [
-//        'enabled' => true,
-//        'base_url' => 'http://shlink_matomo',
-//        'site_id' => '...',
-//        'api_token' => '...',
-    ],
-
-];

config/autoload/mercure.global.php

@@ -8,34 +8,31 @@ use Shlinkio\Shlink\Core\Config\EnvVars;
 use Symfony\Component\Mercure\Hub;
 use Symfony\Component\Mercure\HubInterface;
 
-return (static function (): array {
+return [
-    $publicUrl = EnvVars::MERCURE_PUBLIC_HUB_URL->loadFromEnv();
 
-    return [
+    // This config is used by shlink-common. Do not delete
+    'mercure' => [
+        'public_hub_url' => EnvVars::MERCURE_PUBLIC_HUB_URL->loadFromEnv(),
+        'internal_hub_url' => EnvVars::MERCURE_INTERNAL_HUB_URL->loadFromEnv(),
+        'jwt_secret' => EnvVars::MERCURE_JWT_SECRET->loadFromEnv(),
+        'jwt_issuer' => 'Shlink',
+    ],
 
-        'mercure' => [
+    'dependencies' => [
-            'public_hub_url' => $publicUrl,
+        'delegators' => [
-            'internal_hub_url' => EnvVars::MERCURE_INTERNAL_HUB_URL->loadFromEnv(),
+            LcobucciJwtProvider::class => [
-            'jwt_secret' => EnvVars::MERCURE_JWT_SECRET->loadFromEnv(),
+                LazyServiceFactory::class,
-            'jwt_issuer' => 'Shlink',
-        ],
-
-        'dependencies' => [
-            'delegators' => [
-                LcobucciJwtProvider::class => [
-                    LazyServiceFactory::class,
-                ],
-                Hub::class => [
-                    LazyServiceFactory::class,
-                ],
             ],
-            'lazy_services' => [
+            Hub::class => [
-                'class_map' => [
+                LazyServiceFactory::class,
-                    LcobucciJwtProvider::class => LcobucciJwtProvider::class,
-                    Hub::class => HubInterface::class,
-                ],
             ],
         ],
+        'lazy_services' => [
+            'class_map' => [
+                LcobucciJwtProvider::class => LcobucciJwtProvider::class,
+                Hub::class => HubInterface::class,
+            ],
+        ],
+    ],
 
-    ];
+];
-})();

config/autoload/mercure.local.php.dist

@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    'mercure' => [
-        'public_hub_url' => 'http://localhost:8002',
-        'internal_hub_url' => 'http://shlink_mercure_proxy',
-        'jwt_secret' => 'mercure_jwt_key_long_enough_to_avoid_error',
-    ],
-
-];

config/autoload/qr-codes.global.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Shlinkio\Shlink\Core\Config\EnvVars;
-
-return [
-
-    'qr_codes' => [
-        'size' => (int) EnvVars::DEFAULT_QR_CODE_SIZE->loadFromEnv(),
-        'margin' => (int) EnvVars::DEFAULT_QR_CODE_MARGIN->loadFromEnv(),
-        'format' => EnvVars::DEFAULT_QR_CODE_FORMAT->loadFromEnv(),
-        'error_correction' => EnvVars::DEFAULT_QR_CODE_ERROR_CORRECTION->loadFromEnv(),
-        'round_block_size' => (bool) EnvVars::DEFAULT_QR_CODE_ROUND_BLOCK_SIZE->loadFromEnv(),
-        'enabled_for_disabled_short_urls' => (bool) EnvVars::QR_CODE_FOR_DISABLED_SHORT_URLS->loadFromEnv(),
-        'color' => EnvVars::DEFAULT_QR_CODE_COLOR->loadFromEnv(),
-        'bg_color' => EnvVars::DEFAULT_QR_CODE_BG_COLOR->loadFromEnv(),
-        'logo_url' => EnvVars::DEFAULT_QR_CODE_LOGO_URL->loadFromEnv(),
-    ],
-
-];

config/autoload/rabbit.global.php

@@ -6,6 +6,7 @@ use Shlinkio\Shlink\Core\Config\EnvVars;
 
 return [
 
+    // This config is used by shlink-common. Do not delete
     'rabbitmq' => [
         'enabled' => (bool) EnvVars::RABBITMQ_ENABLED->loadFromEnv(),
         'host' => EnvVars::RABBITMQ_HOST->loadFromEnv(),

config/autoload/rabbit.local.php.dist

@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    'rabbitmq' => [
-        'enabled' => true,
-        'host' => 'shlink_rabbitmq',
-        'port' => 5672,
-        'user' => 'rabbit',
-        'password' => 'rabbit',
-    ],
-
-];

config/autoload/redirects.global.php

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Shlinkio\Shlink\Core\Config\EnvVars;
-
-return [
-
-    'not_found_redirects' => [
-        'invalid_short_url' => EnvVars::DEFAULT_INVALID_SHORT_URL_REDIRECT->loadFromEnv(),
-        'regular_404' => EnvVars::DEFAULT_REGULAR_404_REDIRECT->loadFromEnv(),
-        'base_url' => EnvVars::DEFAULT_BASE_URL_REDIRECT->loadFromEnv(),
-    ],
-
-    'redirects' => [
-        'redirect_status_code' => (int) EnvVars::REDIRECT_STATUS_CODE->loadFromEnv(),
-        'redirect_cache_lifetime' => (int) EnvVars::REDIRECT_CACHE_LIFETIME->loadFromEnv(),
-    ],
-
-];

config/autoload/redis.local.php.local

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    'cache' => [
-        'redis' => [
-            'servers' => 'tcp://shlink_redis:6379',
-//            'servers' => 'tcp://barbar@shlink_redis_acl:6379',
-//            'servers' => 'tcp://foo:bar@shlink_redis_acl:6379',
-        ],
-    ],
-
-    'redis' => [
-        'pub_sub_enabled' => true,
-    ],
-
-    'dependencies' => [
-        'aliases' => [
-            // With this config, a user could alias 'lock_store' => 'redis_lock_store' to override the default
-//            'lock_store' => 'redis_lock_store',
-        ],
-    ],
-
-];

config/autoload/robots.global.php

@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core;
-
-return [
-
-    'robots' => [
-        'allow-all-short-urls' => (bool) Config\EnvVars::ROBOTS_ALLOW_ALL_SHORT_URLS->loadFromEnv(),
-        'user-agents' => splitByComma(Config\EnvVars::ROBOTS_USER_AGENTS->loadFromEnv()),
-    ],
-
-];

config/autoload/router.local.php.dist

@@ -7,7 +7,6 @@ use Mezzio\Router\FastRouteRouter;
 return [
 
     'router' => [
-//        'base_path' => '',
         'fastroute' => [
             FastRouteRouter::CONFIG_CACHE_ENABLED => false,
         ],

config/autoload/tracking.global.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Shlinkio\Shlink\Core\Config\EnvVars;
-
-use function Shlinkio\Shlink\Core\splitByComma;
-
-return [
-
-    'tracking' => [
-        // Tells if IP addresses should be anonymized before persisting, to fulfil data protection regulations
-        // This applies only if IP address tracking is enabled
-        'anonymize_remote_addr' => (bool) EnvVars::ANONYMIZE_REMOTE_ADDR->loadFromEnv(),
-
-        // Tells if visits to not-found URLs should be tracked. The disable_tracking option takes precedence
-        'track_orphan_visits' => (bool) EnvVars::TRACK_ORPHAN_VISITS->loadFromEnv(),
-
-        // A query param that, if provided, will disable tracking of one particular visit. Always takes precedence
-        'disable_track_param' => EnvVars::DISABLE_TRACK_PARAM->loadFromEnv(),
-
-        // If true, visits will not be tracked at all
-        'disable_tracking' => (bool) EnvVars::DISABLE_TRACKING->loadFromEnv(),
-
-        // If true, visits will be tracked, but neither the IP address, nor the location will be resolved
-        'disable_ip_tracking' => (bool) EnvVars::DISABLE_IP_TRACKING->loadFromEnv(),
-
-        // If true, the referrer will not be tracked
-        'disable_referrer_tracking' => (bool) EnvVars::DISABLE_REFERRER_TRACKING->loadFromEnv(),
-
-        // If true, the user agent will not be tracked
-        'disable_ua_tracking' => (bool) EnvVars::DISABLE_UA_TRACKING->loadFromEnv(),
-
-        // A list of IP addresses, patterns or CIDR blocks from which tracking is disabled by default
-        'disable_tracking_from' => splitByComma(EnvVars::DISABLE_TRACKING_FROM->loadFromEnv()),
-    ],
-
-];

config/autoload/url-shortener.local.php.dist

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use function Shlinkio\Shlink\Config\runningInRoadRunner;
-
-return [
-
-    'url_shortener' => [
-        'domain' => [
-            'schema' => 'http',
-            'hostname' => sprintf('localhost:%s', match (true) {
-                runningInRoadRunner() => '8800',
-                default => '8000',
-            }),
-        ],
-//        'multi_segment_slugs_enabled' => true,
-//        'trailing_slash_enabled' => true,
-    ],
-
-];

docker-compose.yml

@@ -33,7 +33,11 @@ services:
             - shlink_rabbitmq
             - shlink_matomo
         environment:
-            LC_ALL: C
+            DEFAULT_DOMAIN: localhost:8000
+        env_file:
+            - path: shlink-dev.env
+            - path: shlink-dev.local.env
+              required: false
         extra_hosts:
             - 'host.docker.internal:host-gateway'
 
@@ -59,7 +63,11 @@ services:
             - shlink_rabbitmq
             - shlink_matomo
         environment:
-            LC_ALL: C
+            DEFAULT_DOMAIN: localhost:8800
+        env_file:
+            - path: shlink-dev.env
+            - path: shlink-dev.local.env
+              required: false
         extra_hosts:
             - 'host.docker.internal:host-gateway'
 

module/CLI/config/dependencies.config.php

@@ -7,10 +7,10 @@ namespace Shlinkio\Shlink\CLI;
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Laminas\ServiceManager\Factory\InvokableFactory;
 use Shlinkio\Shlink\Common\Doctrine\NoDbNameConnectionFactory;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Domain\DomainService;
 use Shlinkio\Shlink\Core\Matomo;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\RedirectRule\ShortUrlRedirectRuleService;
 use Shlinkio\Shlink\Core\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifier;

module/CLI/src/Command/ShortUrl/CreateShortUrlCommand.php

@@ -6,8 +6,8 @@ namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\CLI\Input\ShortUrlDataInput;
 use Shlinkio\Shlink\CLI\Util\ExitCode;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
 use Shlinkio\Shlink\Core\ShortUrl\UrlShortenerInterface;
 use Symfony\Component\Console\Command\Command;

module/CLI/src/Factory/ApplicationFactory.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Factory;
 
 use Psr\Container\ContainerInterface;
-use Shlinkio\Shlink\Core\Options\AppOptions;
+use Shlinkio\Shlink\Core\Config\Options\AppOptions;
 use Symfony\Component\Console\Application as CliApp;
 use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
 

module/CLI/src/GeoLite/GeolocationDbUpdater.php

@@ -9,7 +9,7 @@ use Closure;
 use GeoIp2\Database\Reader;
 use MaxMind\Db\Reader\Metadata;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 use Shlinkio\Shlink\IpGeolocation\Exception\DbUpdateException;
 use Shlinkio\Shlink\IpGeolocation\Exception\MissingLicenseException;
 use Shlinkio\Shlink\IpGeolocation\Exception\WrongIpException;

module/CLI/src/Input/ShortUrlDataInput.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Input;
 
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlEdition;
 use Shlinkio\Shlink\Core\ShortUrl\Model\Validation\ShortUrlInputFilter;

module/CLI/test/Command/Domain/DomainRedirectsCommandTest.php

@@ -10,10 +10,10 @@ use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Domain\DomainRedirectsCommand;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
+use Shlinkio\Shlink\Core\Config\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\Domain\Model\DomainItem;
-use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 use ShlinkioTest\Shlink\CLI\Util\CliTestUtils;
 use Symfony\Component\Console\Tester\CommandTester;
 

module/CLI/test/Command/Domain/ListDomainsCommandTest.php

@@ -11,10 +11,10 @@ use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Domain\ListDomainsCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCode;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
+use Shlinkio\Shlink\Core\Config\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\Domain\Model\DomainItem;
-use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 use ShlinkioTest\Shlink\CLI\Util\CliTestUtils;
 use Symfony\Component\Console\Tester\CommandTester;
 

module/CLI/test/Command/ShortUrl/CreateShortUrlCommandTest.php

@@ -12,8 +12,8 @@ use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\CreateShortUrlCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCode;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;

module/CLI/test/Factory/ApplicationFactoryTest.php

@@ -8,7 +8,7 @@ use Laminas\ServiceManager\ServiceManager;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
-use Shlinkio\Shlink\Core\Options\AppOptions;
+use Shlinkio\Shlink\Core\Config\Options\AppOptions;
 use ShlinkioTest\Shlink\CLI\Util\CliTestUtils;
 
 class ApplicationFactoryTest extends TestCase

module/CLI/test/GeoLite/GeolocationDbUpdaterTest.php

@@ -14,7 +14,7 @@ use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\GeoLite\GeolocationDbUpdater;
 use Shlinkio\Shlink\CLI\GeoLite\GeolocationResult;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 use Shlinkio\Shlink\IpGeolocation\Exception\DbUpdateException;
 use Shlinkio\Shlink\IpGeolocation\Exception\MissingLicenseException;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;

module/Core/config/dependencies.config.php

@@ -9,7 +9,7 @@ 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\Options\NotFoundRedirectOptions;
+use Shlinkio\Shlink\Core\Config\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifier;
 use Shlinkio\Shlink\Importer\ImportedLinksProcessorInterface;
 use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
@@ -24,15 +24,15 @@ return [
             ErrorHandler\NotFoundRedirectHandler::class => ConfigAbstractFactory::class,
             ErrorHandler\NotFoundTemplateHandler::class => InvokableFactory::class,
 
-            Options\AppOptions::class => [ValinorConfigFactory::class, 'config.app_options'],
+            Config\Options\AppOptions::class => [ValinorConfigFactory::class, 'config.app_options'],
-            Options\DeleteShortUrlsOptions::class => [ValinorConfigFactory::class, 'config.delete_short_urls'],
+            Config\Options\DeleteShortUrlsOptions::class => [Config\Options\DeleteShortUrlsOptions::class, 'fromEnv'],
-            Options\NotFoundRedirectOptions::class => [ValinorConfigFactory::class, 'config.not_found_redirects'],
+            Config\Options\NotFoundRedirectOptions::class => [Config\Options\NotFoundRedirectOptions::class, 'fromEnv'],
-            Options\RedirectOptions::class => [ValinorConfigFactory::class, 'config.redirects'],
+            Config\Options\RedirectOptions::class => [Config\Options\RedirectOptions::class, 'fromEnv'],
-            Options\UrlShortenerOptions::class => [ValinorConfigFactory::class, 'config.url_shortener'],
+            Config\Options\UrlShortenerOptions::class => [Config\Options\UrlShortenerOptions::class, 'fromEnv'],
-            Options\TrackingOptions::class => [ValinorConfigFactory::class, 'config.tracking'],
+            Config\Options\TrackingOptions::class => [Config\Options\TrackingOptions::class, 'fromEnv'],
-            Options\QrCodeOptions::class => [ValinorConfigFactory::class, 'config.qr_codes'],
+            Config\Options\QrCodeOptions::class => [Config\Options\QrCodeOptions::class, 'fromEnv'],
-            Options\RabbitMqOptions::class => [ValinorConfigFactory::class, 'config.rabbitmq'],
+            Config\Options\RabbitMqOptions::class => [Config\Options\RabbitMqOptions::class, 'fromEnv'],
-            Options\RobotsOptions::class => [ValinorConfigFactory::class, 'config.robots'],
+            Config\Options\RobotsOptions::class => [Config\Options\RobotsOptions::class, 'fromEnv'],
 
             RedirectRule\ShortUrlRedirectRuleService::class => ConfigAbstractFactory::class,
             RedirectRule\ShortUrlRedirectionResolver::class => ConfigAbstractFactory::class,
@@ -101,7 +101,7 @@ return [
 
             Crawling\CrawlingHelper::class => ConfigAbstractFactory::class,
 
-            Matomo\MatomoOptions::class => [ValinorConfigFactory::class, 'config.matomo'],
+            Matomo\MatomoOptions::class => [Matomo\MatomoOptions::class, 'fromEnv'],
             Matomo\MatomoTrackerBuilder::class => ConfigAbstractFactory::class,
             Matomo\MatomoVisitSender::class => ConfigAbstractFactory::class,
         ],
@@ -137,9 +137,9 @@ return [
         Visit\VisitsTracker::class => [
             'em',
             EventDispatcherInterface::class,
-            Options\TrackingOptions::class,
+            Config\Options\TrackingOptions::class,
         ],
-        Visit\RequestTracker::class => [Visit\VisitsTracker::class, Options\TrackingOptions::class],
+        Visit\RequestTracker::class => [Visit\VisitsTracker::class, Config\Options\TrackingOptions::class],
         Visit\VisitsDeleter::class => [Visit\Repository\VisitDeleterRepository::class],
         ShortUrl\ShortUrlService::class => [
             'em',
@@ -149,7 +149,7 @@ return [
         ],
         ShortUrl\ShortUrlListService::class => [
             ShortUrl\Repository\ShortUrlListRepository::class,
-            Options\UrlShortenerOptions::class,
+            Config\Options\UrlShortenerOptions::class,
         ],
         Visit\Geolocation\VisitLocator::class => ['em', Visit\Repository\VisitIterationRepository::class],
         Visit\Geolocation\VisitToLocationHelper::class => [IpLocationResolverInterface::class],
@@ -157,20 +157,20 @@ return [
         Tag\TagService::class => ['em'],
         ShortUrl\DeleteShortUrlService::class => [
             'em',
-            Options\DeleteShortUrlsOptions::class,
+            Config\Options\DeleteShortUrlsOptions::class,
             ShortUrl\ShortUrlResolver::class,
             ShortUrl\Repository\ExpiredShortUrlsRepository::class,
         ],
-        ShortUrl\ShortUrlResolver::class => ['em', Options\UrlShortenerOptions::class],
+        ShortUrl\ShortUrlResolver::class => ['em', Config\Options\UrlShortenerOptions::class],
         ShortUrl\ShortUrlVisitsDeleter::class => [
             Visit\Repository\VisitDeleterRepository::class,
             ShortUrl\ShortUrlResolver::class,
         ],
-        ShortUrl\Helper\ShortCodeUniquenessHelper::class => ['em', Options\UrlShortenerOptions::class],
+        ShortUrl\Helper\ShortCodeUniquenessHelper::class => ['em', Config\Options\UrlShortenerOptions::class],
         Domain\DomainService::class => ['em', 'config.url_shortener.domain.hostname'],
 
         Util\DoctrineBatchHelper::class => ['em'],
-        Util\RedirectResponseHelper::class => [Options\RedirectOptions::class],
+        Util\RedirectResponseHelper::class => [Config\Options\RedirectOptions::class],
 
         Config\NotFoundRedirectResolver::class => [Util\RedirectResponseHelper::class, 'Logger_Shlink'],
 
@@ -188,19 +188,22 @@ return [
             ShortUrl\ShortUrlResolver::class,
             ShortUrl\Helper\ShortUrlStringifier::class,
             'Logger_Shlink',
-            Options\QrCodeOptions::class,
+            Config\Options\QrCodeOptions::class,
         ],
-        Action\RobotsAction::class => [Crawling\CrawlingHelper::class, Options\RobotsOptions::class],
+        Action\RobotsAction::class => [Crawling\CrawlingHelper::class, Config\Options\RobotsOptions::class],
 
         ShortUrl\Resolver\PersistenceShortUrlRelationResolver::class => [
             'em',
-            Options\UrlShortenerOptions::class,
+            Config\Options\UrlShortenerOptions::class,
             Lock\LockFactory::class,
         ],
         ShortUrl\Helper\ShortUrlStringifier::class => ['config.url_shortener.domain', 'config.router.base_path'],
-        ShortUrl\Helper\ShortUrlTitleResolutionHelper::class => ['httpClient', Options\UrlShortenerOptions::class],
+        ShortUrl\Helper\ShortUrlTitleResolutionHelper::class => [
+            'httpClient',
+            Config\Options\UrlShortenerOptions::class,
+        ],
         ShortUrl\Helper\ShortUrlRedirectionBuilder::class => [
-            Options\TrackingOptions::class,
+            Config\Options\TrackingOptions::class,
             RedirectRule\ShortUrlRedirectionResolver::class,
         ],
         ShortUrl\Transformer\ShortUrlDataTransformer::class => [ShortUrl\Helper\ShortUrlStringifier::class],
@@ -209,9 +212,9 @@ return [
             Visit\RequestTracker::class,
             ShortUrl\Helper\ShortUrlRedirectionBuilder::class,
             Util\RedirectResponseHelper::class,
-            Options\UrlShortenerOptions::class,
+            Config\Options\UrlShortenerOptions::class,
         ],
-        ShortUrl\Middleware\TrimTrailingSlashMiddleware::class => [Options\UrlShortenerOptions::class],
+        ShortUrl\Middleware\TrimTrailingSlashMiddleware::class => [Config\Options\UrlShortenerOptions::class],
 
         EventDispatcher\PublishingUpdatesGenerator::class => [ShortUrl\Transformer\ShortUrlDataTransformer::class],
 

module/Core/config/event_dispatcher.config.php

@@ -129,14 +129,14 @@ return (static function (): array {
                 EventDispatcher\PublishingUpdatesGenerator::class,
                 'em',
                 'Logger_Shlink',
-                Options\RabbitMqOptions::class,
+                Config\Options\RabbitMqOptions::class,
             ],
             EventDispatcher\RabbitMq\NotifyNewShortUrlToRabbitMq::class => [
                 RabbitMqPublishingHelper::class,
                 EventDispatcher\PublishingUpdatesGenerator::class,
                 'em',
                 'Logger_Shlink',
-                Options\RabbitMqOptions::class,
+                Config\Options\RabbitMqOptions::class,
             ],
             EventDispatcher\RedisPubSub\NotifyVisitToRedis::class => [
                 RedisPublishingHelper::class,
@@ -167,7 +167,7 @@ return (static function (): array {
             ],
 
             EventDispatcher\Helper\EnabledListenerChecker::class => [
-                Options\RabbitMqOptions::class,
+                Config\Options\RabbitMqOptions::class,
                 'config.redis.pub_sub_enabled',
                 MercureOptions::class,
                 GeoLite2Options::class,

module/Core/src/Action/Model/QrCodeParams.php

@@ -12,7 +12,7 @@ use Endroid\QrCode\Writer\PngWriter;
 use Endroid\QrCode\Writer\SvgWriter;
 use Endroid\QrCode\Writer\WriterInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Shlinkio\Shlink\Core\Options\QrCodeOptions;
+use Shlinkio\Shlink\Core\Config\Options\QrCodeOptions;
 
 use function ctype_xdigit;
 use function hexdec;

module/Core/src/Action/QrCodeAction.php

@@ -13,8 +13,8 @@ use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Common\Response\QrCodeResponse;
 use Shlinkio\Shlink\Core\Action\Model\QrCodeParams;
+use Shlinkio\Shlink\Core\Config\Options\QrCodeOptions;
 use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException;
-use Shlinkio\Shlink\Core\Options\QrCodeOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;
 use Shlinkio\Shlink\Core\ShortUrl\ShortUrlResolverInterface;

module/Core/src/Action/RobotsAction.php

@@ -9,8 +9,8 @@ use GuzzleHttp\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Shlinkio\Shlink\Core\Config\Options\RobotsOptions;
 use Shlinkio\Shlink\Core\Crawling\CrawlingHelperInterface;
-use Shlinkio\Shlink\Core\Options\RobotsOptions;
 
 use function sprintf;
 

module/Core/src/Config/Options/AppOptions.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Core\Options;
+namespace Shlinkio\Shlink\Core\Config\Options;
 
 use function sprintf;
 

module/Core/src/Config/Options/DeleteShortUrlsOptions.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Config\Options;
+
+use Shlinkio\Shlink\Core\Config\EnvVars;
+
+use const Shlinkio\Shlink\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
+
+final readonly class DeleteShortUrlsOptions
+{
+    public function __construct(
+        public int $visitsThreshold = DEFAULT_DELETE_SHORT_URL_THRESHOLD,
+        public bool $checkVisitsThreshold = true,
+    ) {
+    }
+
+    public static function fromEnv(): self
+    {
+        $threshold = EnvVars::DELETE_SHORT_URL_THRESHOLD->loadFromEnv();
+
+        return new self(
+            visitsThreshold: (int) ($threshold ?? DEFAULT_DELETE_SHORT_URL_THRESHOLD),
+            checkVisitsThreshold: $threshold !== null,
+        );
+    }
+}

module/Core/src/Config/Options/NotFoundRedirectOptions.php

@@ -2,19 +2,29 @@
 
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Core\Options;
+namespace Shlinkio\Shlink\Core\Config\Options;
 
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirectConfigInterface;
 
-final class NotFoundRedirectOptions implements NotFoundRedirectConfigInterface
+final readonly class NotFoundRedirectOptions implements NotFoundRedirectConfigInterface
 {
     public function __construct(
-        public readonly ?string $invalidShortUrl = null,
+        public ?string $invalidShortUrl = null,
-        public readonly ?string $regular404 = null,
+        public ?string $regular404 = null,
-        public readonly ?string $baseUrl = null,
+        public ?string $baseUrl = null,
     ) {
     }
 
+    public static function fromEnv(): self
+    {
+        return new self(
+            invalidShortUrl: EnvVars::DEFAULT_INVALID_SHORT_URL_REDIRECT->loadFromEnv(),
+            regular404: EnvVars::DEFAULT_REGULAR_404_REDIRECT->loadFromEnv(),
+            baseUrl: EnvVars::DEFAULT_BASE_URL_REDIRECT->loadFromEnv(),
+        );
+    }
+
     public function invalidShortUrlRedirect(): ?string
     {
         return $this->invalidShortUrl;

module/Core/src/Config/Options/QrCodeOptions.php

@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Core\Options;
+namespace Shlinkio\Shlink\Core\Config\Options;
+
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 use const Shlinkio\Shlink\DEFAULT_QR_CODE_BG_COLOR;
 use const Shlinkio\Shlink\DEFAULT_QR_CODE_COLOR;
@@ -13,7 +15,7 @@ use const Shlinkio\Shlink\DEFAULT_QR_CODE_MARGIN;
 use const Shlinkio\Shlink\DEFAULT_QR_CODE_ROUND_BLOCK_SIZE;
 use const Shlinkio\Shlink\DEFAULT_QR_CODE_SIZE;
 
-readonly final class QrCodeOptions
+final readonly class QrCodeOptions
 {
     public function __construct(
         public int $size = DEFAULT_QR_CODE_SIZE,
@@ -27,4 +29,19 @@ readonly final class QrCodeOptions
         public ?string $logoUrl = null,
     ) {
     }
+
+    public static function fromEnv(): self
+    {
+        return new self(
+            size: (int) EnvVars::DEFAULT_QR_CODE_SIZE->loadFromEnv(),
+            margin: (int) EnvVars::DEFAULT_QR_CODE_MARGIN->loadFromEnv(),
+            format: EnvVars::DEFAULT_QR_CODE_FORMAT->loadFromEnv(),
+            errorCorrection: EnvVars::DEFAULT_QR_CODE_ERROR_CORRECTION->loadFromEnv(),
+            roundBlockSize: (bool) EnvVars::DEFAULT_QR_CODE_ROUND_BLOCK_SIZE->loadFromEnv(),
+            enabledForDisabledShortUrls: (bool) EnvVars::QR_CODE_FOR_DISABLED_SHORT_URLS->loadFromEnv(),
+            color: EnvVars::DEFAULT_QR_CODE_COLOR->loadFromEnv(),
+            bgColor: EnvVars::DEFAULT_QR_CODE_BG_COLOR->loadFromEnv(),
+            logoUrl: EnvVars::DEFAULT_QR_CODE_LOGO_URL->loadFromEnv(),
+        );
+    }
 }

module/Core/src/Config/Options/RabbitMqOptions.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Config\Options;
+
+use Shlinkio\Shlink\Core\Config\EnvVars;
+
+final readonly class RabbitMqOptions
+{
+    public function __construct(public bool $enabled = false)
+    {
+    }
+
+    public static function fromEnv(): self
+    {
+        return new self((bool) EnvVars::RABBITMQ_ENABLED->loadFromEnv());
+    }
+}

module/Core/src/Config/Options/RedirectOptions.php

@@ -2,18 +2,19 @@
 
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Core\Options;
+namespace Shlinkio\Shlink\Core\Config\Options;
 
 use Fig\Http\Message\StatusCodeInterface;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Shlinkio\Shlink\Core\Util\RedirectStatus;
 
 use const Shlinkio\Shlink\DEFAULT_REDIRECT_CACHE_LIFETIME;
 use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE;
 
-final class RedirectOptions
+final readonly class RedirectOptions
 {
-    public readonly RedirectStatus $redirectStatusCode;
+    public RedirectStatus $redirectStatusCode;
-    public readonly int $redirectCacheLifetime;
+    public int $redirectCacheLifetime;
 
     public function __construct(
         int $redirectStatusCode = StatusCodeInterface::STATUS_FOUND,
@@ -24,4 +25,12 @@ final class RedirectOptions
             ? $redirectCacheLifetime
             : DEFAULT_REDIRECT_CACHE_LIFETIME;
     }
+
+    public static function fromEnv(): self
+    {
+        return new self(
+            redirectStatusCode: (int) EnvVars::REDIRECT_STATUS_CODE->loadFromEnv(),
+            redirectCacheLifetime: (int) EnvVars::REDIRECT_CACHE_LIFETIME->loadFromEnv(),
+        );
+    }
 }

module/Core/src/Config/Options/RobotsOptions.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Config\Options;
+
+use Shlinkio\Shlink\Core\Config\EnvVars;
+
+use function count;
+use function Shlinkio\Shlink\Core\splitByComma;
+
+final readonly class RobotsOptions
+{
+    /**
+     * @param string[] $userAgents
+     */
+    public function __construct(public bool $allowAllShortUrls = false, public array $userAgents = [])
+    {
+    }
+
+    public static function fromEnv(): self
+    {
+        return new self(
+            allowAllShortUrls: (bool) EnvVars::ROBOTS_ALLOW_ALL_SHORT_URLS->loadFromEnv(),
+            userAgents: splitByComma(EnvVars::ROBOTS_USER_AGENTS->loadFromEnv()),
+        );
+    }
+
+    public function hasUserAgents(): bool
+    {
+        return count($this->userAgents) > 0;
+    }
+}

module/Core/src/Config/Options/TrackingOptions.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Config\Options;
+
+use Shlinkio\Shlink\Core\Config\EnvVars;
+
+use function array_key_exists;
+use function Shlinkio\Shlink\Core\splitByComma;
+
+final readonly class TrackingOptions
+{
+    /**
+     * @param string[] $disableTrackingFrom
+     */
+    public function __construct(
+        // Tells if IP addresses should be anonymized before persisting, to fulfil data protection regulations.
+        // This applies only if IP address tracking is enabled
+        public bool $anonymizeRemoteAddr = true,
+        // Tells if visits to not-found URLs should be tracked. The disableTracking option takes precedence
+        public bool $trackOrphanVisits = true,
+        // A query param that, if provided, will disable tracking of one particular visit. Always takes precedence over
+        // other options
+        public ?string $disableTrackParam = null,
+        // If true, visits will not be tracked at all
+        public bool $disableTracking = false,
+        // If true, visits will be tracked, but neither the IP address, nor the location will be resolved
+        public bool $disableIpTracking = false,
+        // If true, the referrers will not be tracked
+        public bool $disableReferrerTracking = false,
+        // If true, the user agent will not be tracked
+        public bool $disableUaTracking = false,
+        // A list of IP addresses, patterns or CIDR blocks from which tracking is disabled by default
+        public array $disableTrackingFrom = [],
+    ) {
+    }
+
+    public static function fromEnv(): self
+    {
+        return new self(
+            anonymizeRemoteAddr: (bool) EnvVars::ANONYMIZE_REMOTE_ADDR->loadFromEnv(),
+            trackOrphanVisits: (bool) EnvVars::TRACK_ORPHAN_VISITS->loadFromEnv(),
+            disableTrackParam: EnvVars::DISABLE_TRACK_PARAM->loadFromEnv(),
+            disableTracking: (bool) EnvVars::DISABLE_TRACKING->loadFromEnv(),
+            disableIpTracking: (bool) EnvVars::DISABLE_IP_TRACKING->loadFromEnv(),
+            disableReferrerTracking: (bool) EnvVars::DISABLE_REFERRER_TRACKING->loadFromEnv(),
+            disableUaTracking: (bool) EnvVars::DISABLE_UA_TRACKING->loadFromEnv(),
+            disableTrackingFrom: splitByComma(EnvVars::DISABLE_TRACKING_FROM->loadFromEnv()),
+        );
+    }
+
+    public function hasDisableTrackingFrom(): bool
+    {
+        return ! empty($this->disableTrackingFrom);
+    }
+
+    public function queryHasDisableTrackParam(array $query): bool
+    {
+        return $this->disableTrackParam !== null && array_key_exists($this->disableTrackParam, $query);
+    }
+}

module/Core/src/Config/Options/UrlShortenerOptions.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Config\Options;
+
+use Shlinkio\Shlink\Core\Config\EnvVars;
+use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlMode;
+
+use function max;
+
+use const Shlinkio\Shlink\DEFAULT_SHORT_CODES_LENGTH;
+use const Shlinkio\Shlink\MIN_SHORT_CODES_LENGTH;
+
+final readonly class UrlShortenerOptions
+{
+    /**
+     * @param array{schema: ?string, hostname: ?string} $domain
+     */
+    public function __construct(
+        public array $domain = ['schema' => null, 'hostname' => null],
+        public int $defaultShortCodesLength = DEFAULT_SHORT_CODES_LENGTH,
+        public bool $autoResolveTitles = false,
+        public bool $appendExtraPath = false,
+        public bool $multiSegmentSlugsEnabled = false,
+        public bool $trailingSlashEnabled = false,
+        public ShortUrlMode $mode = ShortUrlMode::STRICT,
+    ) {
+    }
+
+    public static function fromEnv(): self
+    {
+        $shortCodesLength = max(
+            (int) EnvVars::DEFAULT_SHORT_CODES_LENGTH->loadFromEnv(),
+            MIN_SHORT_CODES_LENGTH,
+        );
+        $mode = EnvVars::SHORT_URL_MODE->loadFromEnv();
+
+        return new self(
+            domain: [
+                'schema' => ((bool) EnvVars::IS_HTTPS_ENABLED->loadFromEnv()) ? 'https' : 'http',
+                'hostname' => EnvVars::DEFAULT_DOMAIN->loadFromEnv(),
+            ],
+            defaultShortCodesLength: $shortCodesLength,
+            autoResolveTitles: (bool) EnvVars::AUTO_RESOLVE_TITLES->loadFromEnv(),
+            appendExtraPath: (bool) EnvVars::REDIRECT_APPEND_EXTRA_PATH->loadFromEnv(),
+            multiSegmentSlugsEnabled: (bool) EnvVars::MULTI_SEGMENT_SLUGS_ENABLED->loadFromEnv(),
+            trailingSlashEnabled: (bool) EnvVars::SHORT_URL_TRAILING_SLASH->loadFromEnv(),
+            mode: ShortUrlMode::tryFrom($mode) ?? ShortUrlMode::STRICT,
+        );
+    }
+
+    public function isLooseMode(): bool
+    {
+        return $this->mode === ShortUrlMode::LOOSE;
+    }
+
+    public function defaultDomain(): string
+    {
+        return $this->domain['hostname'] ?? '';
+    }
+}

module/Core/src/ErrorHandler/NotFoundRedirectHandler.php

@@ -9,15 +9,15 @@ use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Shlinkio\Shlink\Core\Config;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirectResolverInterface;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Core\ErrorHandler\Model\NotFoundType;
-use Shlinkio\Shlink\Core\Options;
 
-class NotFoundRedirectHandler implements MiddlewareInterface
+readonly class NotFoundRedirectHandler implements MiddlewareInterface
 {
     public function __construct(
-        private Options\NotFoundRedirectOptions $redirectOptions,
+        private Config\Options\NotFoundRedirectOptions $redirectOptions,
         private NotFoundRedirectResolverInterface $redirectResolver,
         private DomainServiceInterface $domainService,
     ) {

module/Core/src/EventDispatcher/Helper/EnabledListenerChecker.php

@@ -5,9 +5,9 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\EventDispatcher\Helper;
 
 use Shlinkio\Shlink\Common\Mercure\MercureOptions;
+use Shlinkio\Shlink\Core\Config\Options\RabbitMqOptions;
 use Shlinkio\Shlink\Core\EventDispatcher;
 use Shlinkio\Shlink\Core\Matomo\MatomoOptions;
-use Shlinkio\Shlink\Core\Options\RabbitMqOptions;
 use Shlinkio\Shlink\EventDispatcher\Listener\EnabledListenerCheckerInterface;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\GeoLite2Options;
 

module/Core/src/EventDispatcher/RabbitMq/NotifyNewShortUrlToRabbitMq.php

@@ -7,10 +7,10 @@ namespace Shlinkio\Shlink\Core\EventDispatcher\RabbitMq;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Common\UpdatePublishing\PublishingHelperInterface;
+use Shlinkio\Shlink\Core\Config\Options\RabbitMqOptions;
 use Shlinkio\Shlink\Core\EventDispatcher\Async\AbstractNotifyNewShortUrlListener;
 use Shlinkio\Shlink\Core\EventDispatcher\Async\RemoteSystem;
 use Shlinkio\Shlink\Core\EventDispatcher\PublishingUpdatesGeneratorInterface;
-use Shlinkio\Shlink\Core\Options\RabbitMqOptions;
 
 class NotifyNewShortUrlToRabbitMq extends AbstractNotifyNewShortUrlListener
 {

module/Core/src/EventDispatcher/RabbitMq/NotifyVisitToRabbitMq.php

@@ -7,10 +7,10 @@ namespace Shlinkio\Shlink\Core\EventDispatcher\RabbitMq;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Common\UpdatePublishing\PublishingHelperInterface;
+use Shlinkio\Shlink\Core\Config\Options\RabbitMqOptions;
 use Shlinkio\Shlink\Core\EventDispatcher\Async\AbstractNotifyVisitListener;
 use Shlinkio\Shlink\Core\EventDispatcher\Async\RemoteSystem;
 use Shlinkio\Shlink\Core\EventDispatcher\PublishingUpdatesGeneratorInterface;
-use Shlinkio\Shlink\Core\Options\RabbitMqOptions;
 
 class NotifyVisitToRabbitMq extends AbstractNotifyVisitListener
 {

module/Core/src/Matomo/MatomoOptions.php

@@ -4,17 +4,31 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Core\Matomo;
 
-class MatomoOptions
+use Shlinkio\Shlink\Core\Config\EnvVars;
+
+final readonly class MatomoOptions
 {
+    /**
+     * @param numeric-string|int|null $siteId
+     */
     public function __construct(
-        public readonly bool $enabled = false,
+        public bool $enabled = false,
-        public readonly ?string $baseUrl = null,
+        public ?string $baseUrl = null,
-        /** @var numeric-string|int|null */
+        private string|int|null $siteId = null,
-        private readonly string|int|null $siteId = null,
+        public ?string $apiToken = null,
-        public readonly ?string $apiToken = null,
     ) {
     }
 
+    public static function fromEnv(): self
+    {
+        return new self(
+            enabled: (bool) EnvVars::MATOMO_ENABLED->loadFromEnv(),
+            baseUrl: EnvVars::MATOMO_BASE_URL->loadFromEnv(),
+            siteId: EnvVars::MATOMO_SITE_ID->loadFromEnv(),
+            apiToken: EnvVars::MATOMO_API_TOKEN->loadFromEnv(),
+        );
+    }
+
     public function siteId(): ?int
     {
         if ($this->siteId === null) {

module/Core/src/Options/DeleteShortUrlsOptions.php

@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core\Options;
-
-use const Shlinkio\Shlink\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
-
-final class DeleteShortUrlsOptions
-{
-    public function __construct(
-        public readonly int $visitsThreshold = DEFAULT_DELETE_SHORT_URL_THRESHOLD,
-        public readonly bool $checkVisitsThreshold = true,
-    ) {
-    }
-}

module/Core/src/Options/RabbitMqOptions.php

@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core\Options;
-
-final readonly class RabbitMqOptions
-{
-    public function __construct(
-        public bool $enabled = false,
-    ) {
-    }
-}

module/Core/src/Options/RobotsOptions.php

@@ -1,22 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core\Options;
-
-use function count;
-
-final readonly class RobotsOptions
-{
-    public function __construct(
-        public bool $allowAllShortUrls = false,
-        /** @var string[] */
-        public array $userAgents = [],
-    ) {
-    }
-
-    public function hasUserAgents(): bool
-    {
-        return count($this->userAgents) > 0;
-    }
-}

module/Core/src/Options/TrackingOptions.php

@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core\Options;
-
-use function array_key_exists;
-
-final class TrackingOptions
-{
-    public function __construct(
-        public readonly bool $anonymizeRemoteAddr = true,
-        public readonly bool $trackOrphanVisits = true,
-        public readonly ?string $disableTrackParam = null,
-        public readonly bool $disableTracking = false,
-        public readonly bool $disableIpTracking = false,
-        public readonly bool $disableReferrerTracking = false,
-        public readonly bool $disableUaTracking = false,
-        /** @var string[] */
-        public readonly array $disableTrackingFrom = [],
-    ) {
-    }
-
-    public function hasDisableTrackingFrom(): bool
-    {
-        return ! empty($this->disableTrackingFrom);
-    }
-
-    public function queryHasDisableTrackParam(array $query): bool
-    {
-        return $this->disableTrackParam !== null && array_key_exists($this->disableTrackParam, $query);
-    }
-}

module/Core/src/Options/UrlShortenerOptions.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core\Options;
-
-use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlMode;
-
-use const Shlinkio\Shlink\DEFAULT_SHORT_CODES_LENGTH;
-
-final class UrlShortenerOptions
-{
-    /**
-     * @param array{schema: ?string, hostname: ?string} $domain
-     */
-    public function __construct(
-        public readonly array $domain = ['schema' => null, 'hostname' => null],
-        public readonly int $defaultShortCodesLength = DEFAULT_SHORT_CODES_LENGTH,
-        public readonly bool $autoResolveTitles = false,
-        public readonly bool $appendExtraPath = false,
-        public readonly bool $multiSegmentSlugsEnabled = false,
-        public readonly bool $trailingSlashEnabled = false,
-        public readonly ShortUrlMode $mode = ShortUrlMode::STRICT,
-    ) {
-    }
-
-    public function isLooseMode(): bool
-    {
-        return $this->mode === ShortUrlMode::LOOSE;
-    }
-
-    public function defaultDomain(): string
-    {
-        return $this->domain['hostname'] ?? '';
-    }
-}

module/Core/src/ShortUrl/DeleteShortUrlService.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\ShortUrl;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Shlinkio\Shlink\Core\Config\Options\DeleteShortUrlsOptions;
 use Shlinkio\Shlink\Core\Exception;
-use Shlinkio\Shlink\Core\Options\DeleteShortUrlsOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ExpiredShortUrlsConditions;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;

module/Core/src/ShortUrl/Helper/ShortCodeUniquenessHelper.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\ShortUrl\Helper;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;
 use Shlinkio\Shlink\Core\ShortUrl\Repository\ShortUrlRepository;

module/Core/src/ShortUrl/Helper/ShortUrlRedirectionBuilder.php

@@ -8,7 +8,7 @@ use GuzzleHttp\Psr7\Query;
 use GuzzleHttp\Psr7\Uri;
 use Laminas\Stdlib\ArrayUtils;
 use Psr\Http\Message\ServerRequestInterface;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\RedirectRule\ShortUrlRedirectionResolverInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 

module/Core/src/ShortUrl/Helper/ShortUrlTitleResolutionHelper.php

@@ -8,7 +8,7 @@ use Fig\Http\Message\RequestMethodInterface;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\RequestOptions;
 use Psr\Http\Message\ResponseInterface;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Throwable;
 
 use function html_entity_decode;

module/Core/src/ShortUrl/Middleware/ExtraPathRedirectMiddleware.php

@@ -9,9 +9,9 @@ use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ErrorHandler\Model\NotFoundType;
 use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlRedirectionBuilderInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;
 use Shlinkio\Shlink\Core\ShortUrl\ShortUrlResolverInterface;

module/Core/src/ShortUrl/Middleware/TrimTrailingSlashMiddleware.php

@@ -8,7 +8,7 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 
 use function rtrim;
 

module/Core/src/ShortUrl/Model/ShortUrlCreation.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\ShortUrl\Model;
 
 use Cake\Chronos\Chronos;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\TitleResolutionModelInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Model\Validation\ShortUrlInputFilter;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;

module/Core/src/ShortUrl/Model/Validation/CustomSlugFilter.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\ShortUrl\Model\Validation;
 
 use Laminas\Filter\FilterInterface;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 
 use function is_string;
 use function str_replace;

module/Core/src/ShortUrl/Model/Validation/CustomSlugValidator.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\ShortUrl\Model\Validation;
 
 use Laminas\Validator\AbstractValidator;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 
 use function is_string;
 use function strpbrk;

module/Core/src/ShortUrl/Model/Validation/ShortUrlInputFilter.php

@@ -10,7 +10,7 @@ use Laminas\InputFilter\InputFilter;
 use Laminas\Validator;
 use Shlinkio\Shlink\Common\Validation\HostAndPortValidator;
 use Shlinkio\Shlink\Common\Validation\InputFactory;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 
 use function is_string;

module/Core/src/ShortUrl/Resolver/PersistenceShortUrlRelationResolver.php

@@ -8,8 +8,8 @@ use Doctrine\Common\Collections;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Events;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Tag\Entity\Tag;
 use Symfony\Component\Lock\Lock;
 use Symfony\Component\Lock\LockFactory;

module/Core/src/ShortUrl/ShortUrlListService.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\ShortUrl;
 
 use Shlinkio\Shlink\Common\Paginator\Paginator;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlsParams;
 use Shlinkio\Shlink\Core\ShortUrl\Paginator\Adapter\ShortUrlRepositoryAdapter;
 use Shlinkio\Shlink\Core\ShortUrl\Repository\ShortUrlListRepositoryInterface;

module/Core/src/ShortUrl/ShortUrlResolver.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\ShortUrl;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;
 use Shlinkio\Shlink\Core\ShortUrl\Repository\ShortUrlRepository;

module/Core/src/Util/RedirectResponseHelper.php

@@ -6,7 +6,7 @@ namespace Shlinkio\Shlink\Core\Util;
 
 use Laminas\Diactoros\Response\RedirectResponse;
 use Psr\Http\Message\ResponseInterface;
-use Shlinkio\Shlink\Core\Options\RedirectOptions;
+use Shlinkio\Shlink\Core\Config\Options\RedirectOptions;
 
 use function sprintf;
 

module/Core/src/Visit/Model/Visitor.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Visit\Model;
 
 use Psr\Http\Message\ServerRequestInterface;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 
 use function Shlinkio\Shlink\Core\ipAddressFromRequest;
 use function Shlinkio\Shlink\Core\isCrawler;

module/Core/src/Visit/RequestTracker.php

@@ -7,9 +7,9 @@ namespace Shlinkio\Shlink\Core\Visit;
 use Fig\Http\Message\RequestMethodInterface;
 use Mezzio\Router\Middleware\ImplicitHeadMiddleware;
 use Psr\Http\Message\ServerRequestInterface;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\ErrorHandler\Model\NotFoundType;
 use Shlinkio\Shlink\Core\Exception\InvalidIpFormatException;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Util\IpAddressUtils;
 use Shlinkio\Shlink\Core\Visit\Model\Visitor;

module/Core/src/Visit/VisitsTracker.php

@@ -6,8 +6,8 @@ namespace Shlinkio\Shlink\Core\Visit;
 
 use Doctrine\ORM;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\EventDispatcher\Event\UrlVisited;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Visit\Entity\Visit;
 use Shlinkio\Shlink\Core\Visit\Model\Visitor;

module/Core/test/Action/QrCodeActionTest.php

@@ -16,8 +16,8 @@ use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Log\NullLogger;
 use Shlinkio\Shlink\Common\Response\QrCodeResponse;
 use Shlinkio\Shlink\Core\Action\QrCodeAction;
+use Shlinkio\Shlink\Core\Config\Options\QrCodeOptions;
 use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException;
-use Shlinkio\Shlink\Core\Options\QrCodeOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifier;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;

module/Core/test/Action/RobotsActionTest.php

@@ -10,8 +10,8 @@ use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Action\RobotsAction;
+use Shlinkio\Shlink\Core\Config\Options\RobotsOptions;
 use Shlinkio\Shlink\Core\Crawling\CrawlingHelperInterface;
-use Shlinkio\Shlink\Core\Options\RobotsOptions;
 
 class RobotsActionTest extends TestCase
 {

module/Core/test/Config/NotFoundRedirectResolverTest.php

@@ -18,8 +18,8 @@ use Psr\Http\Message\UriInterface;
 use Psr\Log\NullLogger;
 use Shlinkio\Shlink\Core\Action\RedirectAction;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirectResolver;
+use Shlinkio\Shlink\Core\Config\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\ErrorHandler\Model\NotFoundType;
-use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\Util\RedirectResponseHelperInterface;
 
 use function Laminas\Stratigility\middleware;

module/Core/test/ErrorHandler/NotFoundRedirectHandlerTest.php

@@ -16,11 +16,11 @@ use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirectResolverInterface;
+use Shlinkio\Shlink\Core\Config\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\ErrorHandler\Model\NotFoundType;
 use Shlinkio\Shlink\Core\ErrorHandler\NotFoundRedirectHandler;
-use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 
 class NotFoundRedirectHandlerTest extends TestCase
 {

module/Core/test/EventDispatcher/Helper/EnabledListenerCheckerTest.php

@@ -8,6 +8,7 @@ use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\Mercure\MercureOptions;
+use Shlinkio\Shlink\Core\Config\Options\RabbitMqOptions;
 use Shlinkio\Shlink\Core\EventDispatcher\Helper\EnabledListenerChecker;
 use Shlinkio\Shlink\Core\EventDispatcher\Matomo\SendVisitToMatomo;
 use Shlinkio\Shlink\Core\EventDispatcher\Mercure\NotifyNewShortUrlToMercure;
@@ -18,7 +19,6 @@ use Shlinkio\Shlink\Core\EventDispatcher\RedisPubSub\NotifyNewShortUrlToRedis;
 use Shlinkio\Shlink\Core\EventDispatcher\RedisPubSub\NotifyVisitToRedis;
 use Shlinkio\Shlink\Core\EventDispatcher\UpdateGeoLiteDb;
 use Shlinkio\Shlink\Core\Matomo\MatomoOptions;
-use Shlinkio\Shlink\Core\Options\RabbitMqOptions;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\GeoLite2Options;
 
 class EnabledListenerCheckerTest extends TestCase

module/Core/test/EventDispatcher/RabbitMq/NotifyNewShortUrlToRabbitMqTest.php

@@ -15,11 +15,11 @@ use Psr\Log\LoggerInterface;
 use RuntimeException;
 use Shlinkio\Shlink\Common\UpdatePublishing\PublishingHelperInterface;
 use Shlinkio\Shlink\Common\UpdatePublishing\Update;
+use Shlinkio\Shlink\Core\Config\Options\RabbitMqOptions;
 use Shlinkio\Shlink\Core\EventDispatcher\Event\ShortUrlCreated;
 use Shlinkio\Shlink\Core\EventDispatcher\PublishingUpdatesGeneratorInterface;
 use Shlinkio\Shlink\Core\EventDispatcher\RabbitMq\NotifyNewShortUrlToRabbitMq;
 use Shlinkio\Shlink\Core\EventDispatcher\Topic;
-use Shlinkio\Shlink\Core\Options\RabbitMqOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Throwable;
 

module/Core/test/EventDispatcher/RabbitMq/NotifyVisitToRabbitMqTest.php

@@ -16,10 +16,10 @@ use Psr\Log\LoggerInterface;
 use RuntimeException;
 use Shlinkio\Shlink\Common\UpdatePublishing\PublishingHelperInterface;
 use Shlinkio\Shlink\Common\UpdatePublishing\Update;
+use Shlinkio\Shlink\Core\Config\Options\RabbitMqOptions;
 use Shlinkio\Shlink\Core\EventDispatcher\Event\VisitLocated;
 use Shlinkio\Shlink\Core\EventDispatcher\PublishingUpdatesGeneratorInterface;
 use Shlinkio\Shlink\Core\EventDispatcher\RabbitMq\NotifyVisitToRabbitMq;
-use Shlinkio\Shlink\Core\Options\RabbitMqOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\Visit\Entity\Visit;

module/Core/test/ShortUrl/DeleteShortUrlServiceTest.php

@@ -9,8 +9,8 @@ use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Core\Config\Options\DeleteShortUrlsOptions;
 use Shlinkio\Shlink\Core\Exception\DeleteShortUrlException;
-use Shlinkio\Shlink\Core\Options\DeleteShortUrlsOptions;
 use Shlinkio\Shlink\Core\ShortUrl\DeleteShortUrlService;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ExpiredShortUrlsConditions;

module/Core/test/ShortUrl/Entity/ShortUrlTest.php

@@ -9,8 +9,8 @@ use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Exception\ShortCodeCannotBeRegeneratedException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlMode;

module/Core/test/ShortUrl/Helper/ShortCodeUniquenessHelperTest.php

@@ -9,8 +9,8 @@ use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortCodeUniquenessHelper;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;

module/Core/test/ShortUrl/Helper/ShortUrlRedirectionBuilderTest.php

@@ -12,7 +12,7 @@ use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\RedirectRule\ShortUrlRedirectionResolverInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlRedirectionBuilder;

module/Core/test/ShortUrl/Helper/ShortUrlTitleResolutionHelperTest.php

@@ -16,7 +16,7 @@ use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlTitleResolutionHelper;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 

module/Core/test/ShortUrl/Middleware/ExtraPathRedirectMiddlewareTest.php

@@ -16,9 +16,9 @@ use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Shlinkio\Shlink\Core\Action\RedirectAction;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ErrorHandler\Model\NotFoundType;
 use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlRedirectionBuilderInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Middleware\ExtraPathRedirectMiddleware;

module/Core/test/ShortUrl/Middleware/TrimTrailingSlashMiddlewareTest.php

@@ -13,7 +13,7 @@ use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Middleware\TrimTrailingSlashMiddleware;
 
 class TrimTrailingSlashMiddlewareTest extends TestCase

module/Core/test/ShortUrl/Model/ShortUrlCreationTest.php

@@ -8,8 +8,8 @@ use Cake\Chronos\Chronos;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlMode;
 use Shlinkio\Shlink\Core\ShortUrl\Model\Validation\ShortUrlInputFilter;

module/Core/test/ShortUrl/Model/Validation/CustomSlugValidatorTest.php

@@ -7,7 +7,7 @@ namespace ShlinkioTest\Shlink\Core\ShortUrl\Model\Validation;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Model\Validation\CustomSlugValidator;
 use stdClass;
 

module/Core/test/ShortUrl/Resolver/PersistenceShortUrlRelationResolverTest.php

@@ -10,9 +10,9 @@ use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\Domain\Repository\DomainRepository;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Resolver\PersistenceShortUrlRelationResolver;
 use Shlinkio\Shlink\Core\Tag\Entity\Tag;
 use Shlinkio\Shlink\Core\Tag\Repository\TagRepository;

module/Core/test/ShortUrl/ShortUrlListServiceTest.php

@@ -8,7 +8,7 @@ use PHPUnit\Framework\Attributes\DataProviderExternal;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlsParams;
 use Shlinkio\Shlink\Core\ShortUrl\Repository\ShortUrlListRepositoryInterface;

module/Core/test/ShortUrl/ShortUrlResolverTest.php

@@ -12,8 +12,8 @@ use PHPUnit\Framework\Attributes\DataProviderExternal;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlIdentifier;

module/Core/test/Util/RedirectResponseHelperTest.php

@@ -8,7 +8,7 @@ use Laminas\Diactoros\Response\RedirectResponse;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Core\Options\RedirectOptions;
+use Shlinkio\Shlink\Core\Config\Options\RedirectOptions;
 use Shlinkio\Shlink\Core\Util\RedirectResponseHelper;
 
 class RedirectResponseHelperTest extends TestCase

module/Core/test/Visit/Model/VisitorTest.php

@@ -7,7 +7,7 @@ namespace ShlinkioTest\Shlink\Core\Visit\Model;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\Visit\Model\Visitor;
 
 use function random_int;

module/Core/test/Visit/RequestTrackerTest.php

@@ -13,8 +13,8 @@ use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use Shlinkio\Shlink\Common\Middleware\IpAddressMiddlewareFactory;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\ErrorHandler\Model\NotFoundType;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Visit\Model\Visitor;
 use Shlinkio\Shlink\Core\Visit\RequestTracker;

module/Core/test/Visit/VisitsTrackerTest.php

@@ -10,8 +10,8 @@ use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Shlinkio\Shlink\Core\Config\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\EventDispatcher\Event\UrlVisited;
-use Shlinkio\Shlink\Core\Options\TrackingOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Visit\Entity\Visit;
 use Shlinkio\Shlink\Core\Visit\Model\Visitor;

module/Rest/config/dependencies.config.php

@@ -10,8 +10,8 @@ use Mezzio\ProblemDetails\ProblemDetailsResponseFactory;
 use Mezzio\Router\Middleware\ImplicitOptionsMiddleware;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Common\Mercure\LcobucciJwtProvider;
+use Shlinkio\Shlink\Core\Config;
 use Shlinkio\Shlink\Core\Domain\DomainService;
-use Shlinkio\Shlink\Core\Options;
 use Shlinkio\Shlink\Core\RedirectRule;
 use Shlinkio\Shlink\Core\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Transformer\ShortUrlDataTransformer;
@@ -64,17 +64,17 @@ return [
     ConfigAbstractFactory::class => [
         ApiKeyService::class => ['em'],
 
-        Action\HealthAction::class => ['em', Options\AppOptions::class],
+        Action\HealthAction::class => ['em', Config\Options\AppOptions::class],
         Action\MercureInfoAction::class => [LcobucciJwtProvider::class, 'config.mercure'],
         Action\ShortUrl\CreateShortUrlAction::class => [
             ShortUrl\UrlShortener::class,
             ShortUrlDataTransformer::class,
-            Options\UrlShortenerOptions::class,
+            Config\Options\UrlShortenerOptions::class,
         ],
         Action\ShortUrl\SingleStepCreateShortUrlAction::class => [
             ShortUrl\UrlShortener::class,
             ShortUrlDataTransformer::class,
-            Options\UrlShortenerOptions::class,
+            Config\Options\UrlShortenerOptions::class,
         ],
         Action\ShortUrl\EditShortUrlAction::class => [ShortUrl\ShortUrlService::class, ShortUrlDataTransformer::class],
         Action\ShortUrl\DeleteShortUrlAction::class => [ShortUrl\DeleteShortUrlService::class],
@@ -101,7 +101,7 @@ return [
         Action\Tag\TagsStatsAction::class => [TagService::class],
         Action\Tag\DeleteTagsAction::class => [TagService::class],
         Action\Tag\UpdateTagAction::class => [TagService::class],
-        Action\Domain\ListDomainsAction::class => [DomainService::class, Options\NotFoundRedirectOptions::class],
+        Action\Domain\ListDomainsAction::class => [DomainService::class, Config\Options\NotFoundRedirectOptions::class],
         Action\Domain\DomainRedirectsAction::class => [DomainService::class],
         Action\RedirectRule\ListRedirectRulesAction::class => [
             ShortUrl\ShortUrlResolver::class,

module/Rest/src/Action/Domain/ListDomainsAction.php

@@ -8,8 +8,8 @@ use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
+use Shlinkio\Shlink\Core\Config\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
-use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Middleware\AuthenticationMiddleware;
 

module/Rest/src/Action/HealthAction.php

@@ -8,7 +8,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Shlinkio\Shlink\Core\Options\AppOptions;
+use Shlinkio\Shlink\Core\Config\Options\AppOptions;
 use Throwable;
 
 class HealthAction extends AbstractRestAction

module/Rest/src/Action/ShortUrl/AbstractCreateShortUrlAction.php

@@ -7,8 +7,8 @@ namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\ShortUrl\Transformer\ShortUrlDataTransformerInterface;
 use Shlinkio\Shlink\Core\ShortUrl\UrlShortenerInterface;

module/Rest/test/Action/Domain/ListDomainsActionTest.php

@@ -10,10 +10,10 @@ use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
+use Shlinkio\Shlink\Core\Config\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\Domain\Model\DomainItem;
-use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Rest\Action\Domain\ListDomainsAction;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 

module/Rest/test/Action/Domain/Request/DomainRedirectsRequestTest.php

@@ -8,8 +8,8 @@ use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Core\Config\NotFoundRedirectConfigInterface;
+use Shlinkio\Shlink\Core\Config\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
-use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Rest\Action\Domain\Request\DomainRedirectsRequest;
 
 class DomainRedirectsRequestTest extends TestCase

module/Rest/test/Action/HealthActionTest.php

@@ -14,7 +14,7 @@ use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Core\Options\AppOptions;
+use Shlinkio\Shlink\Core\Config\Options\AppOptions;
 use Shlinkio\Shlink\Rest\Action\HealthAction;
 
 class HealthActionTest extends TestCase

module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php

@@ -12,8 +12,8 @@ use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Exception\ValidationException;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\ShortUrl\Model\UrlShorteningResult;

module/Rest/test/Action/ShortUrl/SingleStepCreateShortUrlActionTest.php

@@ -8,7 +8,7 @@ use Laminas\Diactoros\ServerRequest;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
+use Shlinkio\Shlink\Core\Config\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\ShortUrl\Model\UrlShorteningResult;