shlinkio · acelaya · Dec 2, 2024 · Dec 2, 2024
diff --git a/.github/workflows/ci-db-tests.yml b/.github/workflows/ci-db-tests.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php-version: ['8.2', '8.3', '8.4']
+        php-version: ['8.3', '8.4']
     env:
       LC_ALL: C
     steps:

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php-version: ['8.2', '8.3', '8.4']
+        php-version: ['8.3', '8.4']
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # rr get-binary picks this env automatically
     steps:

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php-version: ['8.2', '8.3', '8.4']
+        php-version: ['8.3', '8.4']
     steps:
       - uses: actions/checkout@v4
       - uses: './.github/actions/ci-setup'

diff --git a/.github/workflows/publish-swagger-spec.yml b/.github/workflows/publish-swagger-spec.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php-version: ['8.2']
+        php-version: ['8.3']
     steps:
       - uses: actions/checkout@v4
       - name: Determine version

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,7 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * *Nothing*
 
 ### Removed
-* *Nothing*
+* * [#2247](https://github.com/shlinkio/shlink/issues/2247) Drop support for PHP 8.2
 
 ### Fixed
 * *Nothing*

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ The idea is that you can just generate a container using the image and provide t
 
 First, make sure the host where you are going to run shlink fulfills these requirements:
 
-* PHP 8.2 or 8.3
+* PHP 8.3 or 8.4
 * The next PHP extensions: json, curl, pdo, intl, gd and gmp/bcmath.
     * apcu extension is recommended if you don't plan to use RoadRunner.
     * xml extension is required if you want to generate QR codes in svg format.

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-curl": "*",
         "ext-gd": "*",
         "ext-json": "*",

diff --git a/module/CLI/src/Command/Api/DisableKeyCommand.php b/module/CLI/src/Command/Api/DisableKeyCommand.php
@@ -20,7 +20,7 @@
 
 class DisableKeyCommand extends Command
 {
-    public const NAME = 'api-key:disable';
+    public const string NAME = 'api-key:disable';
 
     public function __construct(private readonly ApiKeyServiceInterface $apiKeyService)
     {

diff --git a/module/CLI/src/Command/Api/GenerateKeyCommand.php b/module/CLI/src/Command/Api/GenerateKeyCommand.php
@@ -23,7 +23,7 @@
 
 class GenerateKeyCommand extends Command
 {
-    public const NAME = 'api-key:generate';
+    public const string NAME = 'api-key:generate';
 
     public function __construct(
         private readonly ApiKeyServiceInterface $apiKeyService,

diff --git a/module/CLI/src/Command/Api/InitialApiKeyCommand.php b/module/CLI/src/Command/Api/InitialApiKeyCommand.php
@@ -13,7 +13,7 @@
 
 class InitialApiKeyCommand extends Command
 {
-    public const NAME = 'api-key:initial';
+    public const string NAME = 'api-key:initial';
 
     public function __construct(private readonly ApiKeyServiceInterface $apiKeyService)
     {

diff --git a/module/CLI/src/Command/Api/ListKeysCommand.php b/module/CLI/src/Command/Api/ListKeysCommand.php
@@ -21,11 +21,11 @@
 
 class ListKeysCommand extends Command
 {
-    private const ERROR_STRING_PATTERN = '<fg=red>%s</>';
-    private const SUCCESS_STRING_PATTERN = '<info>%s</info>';
-    private const WARNING_STRING_PATTERN = '<comment>%s</comment>';
+    private const string ERROR_STRING_PATTERN = '<fg=red>%s</>';
+    private const string SUCCESS_STRING_PATTERN = '<info>%s</info>';
+    private const string WARNING_STRING_PATTERN = '<comment>%s</comment>';
 
-    public const NAME = 'api-key:list';
+    public const string NAME = 'api-key:list';
 
     public function __construct(private readonly ApiKeyServiceInterface $apiKeyService)
     {

diff --git a/module/CLI/src/Command/Api/RenameApiKeyCommand.php b/module/CLI/src/Command/Api/RenameApiKeyCommand.php
@@ -19,7 +19,7 @@
 
 class RenameApiKeyCommand extends Command
 {
-    public const NAME = 'api-key:rename';
+    public const string NAME = 'api-key:rename';
 
     public function __construct(private readonly ApiKeyServiceInterface $apiKeyService)
     {

diff --git a/module/CLI/src/Command/Config/ReadEnvVarCommand.php b/module/CLI/src/Command/Config/ReadEnvVarCommand.php
@@ -21,7 +21,7 @@
 
 class ReadEnvVarCommand extends Command
 {
-    public const NAME = 'env-var:read';
+    public const string NAME = 'env-var:read';
 
     /** @var Closure(string $envVar): mixed */
     private readonly Closure $loadEnvVar;

diff --git a/module/CLI/src/Command/Db/CreateDatabaseCommand.php b/module/CLI/src/Command/Db/CreateDatabaseCommand.php
@@ -24,9 +24,9 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
 {
     private readonly Connection $regularConn;
 
-    public const NAME = 'db:create';
-    public const DOCTRINE_SCRIPT = 'bin/doctrine';
-    public const DOCTRINE_CREATE_SCHEMA_COMMAND = 'orm:schema-tool:create';
+    public const string NAME = 'db:create';
+    public const string DOCTRINE_SCRIPT = 'bin/doctrine';
+    public const string DOCTRINE_CREATE_SCHEMA_COMMAND = 'orm:schema-tool:create';
 
     public function __construct(
         LockFactory $locker,

diff --git a/module/CLI/src/Command/Db/MigrateDatabaseCommand.php b/module/CLI/src/Command/Db/MigrateDatabaseCommand.php
@@ -11,9 +11,9 @@
 
 class MigrateDatabaseCommand extends AbstractDatabaseCommand
 {
-    public const NAME = 'db:migrate';
-    public const DOCTRINE_MIGRATIONS_SCRIPT = 'vendor/doctrine/migrations/bin/doctrine-migrations.php';
-    public const DOCTRINE_MIGRATE_COMMAND = 'migrations:migrate';
+    public const string NAME = 'db:migrate';
+    public const string DOCTRINE_MIGRATIONS_SCRIPT = 'vendor/doctrine/migrations/bin/doctrine-migrations.php';
+    public const string DOCTRINE_MIGRATE_COMMAND = 'migrations:migrate';
 
     protected function configure(): void
     {

diff --git a/module/CLI/src/Command/Domain/DomainRedirectsCommand.php b/module/CLI/src/Command/Domain/DomainRedirectsCommand.php
@@ -21,7 +21,7 @@
 
 class DomainRedirectsCommand extends Command
 {
-    public const NAME = 'domain:redirects';
+    public const string NAME = 'domain:redirects';
 
     public function __construct(private readonly DomainServiceInterface $domainService)
     {

diff --git a/module/CLI/src/Command/Domain/GetDomainVisitsCommand.php b/module/CLI/src/Command/Domain/GetDomainVisitsCommand.php
@@ -16,7 +16,7 @@
 
 class GetDomainVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'domain:visits';
+    public const string NAME = 'domain:visits';
 
     public function __construct(
         VisitsStatsHelperInterface $visitsHelper,

diff --git a/module/CLI/src/Command/Domain/ListDomainsCommand.php b/module/CLI/src/Command/Domain/ListDomainsCommand.php
@@ -18,7 +18,7 @@
 
 class ListDomainsCommand extends Command
 {
-    public const NAME = 'domain:list';
+    public const string NAME = 'domain:list';
 
     public function __construct(private readonly DomainServiceInterface $domainService)
     {

diff --git a/module/CLI/src/Command/Integration/MatomoSendVisitsCommand.php b/module/CLI/src/Command/Integration/MatomoSendVisitsCommand.php
@@ -22,7 +22,7 @@
 
 class MatomoSendVisitsCommand extends Command implements VisitSendingProgressTrackerInterface
 {
-    public const NAME = 'integration:matomo:send-visits';
+    public const string NAME = 'integration:matomo:send-visits';
 
     private readonly bool $matomoEnabled;
     private SymfonyStyle $io;

diff --git a/module/CLI/src/Command/RedirectRule/ManageRedirectRulesCommand.php b/module/CLI/src/Command/RedirectRule/ManageRedirectRulesCommand.php
@@ -19,7 +19,7 @@
 
 class ManageRedirectRulesCommand extends Command
 {
-    public const NAME = 'short-url:manage-rules';
+    public const string NAME = 'short-url:manage-rules';
 
     private readonly ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

diff --git a/module/CLI/src/Command/ShortUrl/CreateShortUrlCommand.php b/module/CLI/src/Command/ShortUrl/CreateShortUrlCommand.php
@@ -20,7 +20,7 @@
 
 class CreateShortUrlCommand extends Command
 {
-    public const NAME = 'short-url:create';
+    public const string NAME = 'short-url:create';
 
     private SymfonyStyle $io;
     private readonly ShortUrlDataInput $shortUrlDataInput;

diff --git a/module/CLI/src/Command/ShortUrl/DeleteExpiredShortUrlsCommand.php b/module/CLI/src/Command/ShortUrl/DeleteExpiredShortUrlsCommand.php
@@ -17,7 +17,7 @@
 
 class DeleteExpiredShortUrlsCommand extends Command
 {
-    public const NAME = 'short-url:delete-expired';
+    public const string NAME = 'short-url:delete-expired';
 
     public function __construct(private readonly DeleteShortUrlServiceInterface $deleteShortUrlService)
     {

diff --git a/module/CLI/src/Command/ShortUrl/DeleteShortUrlCommand.php b/module/CLI/src/Command/ShortUrl/DeleteShortUrlCommand.php
@@ -19,7 +19,7 @@
 
 class DeleteShortUrlCommand extends Command
 {
-    public const NAME = 'short-url:delete';
+    public const string NAME = 'short-url:delete';
 
     private readonly ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

diff --git a/module/CLI/src/Command/ShortUrl/DeleteShortUrlVisitsCommand.php b/module/CLI/src/Command/ShortUrl/DeleteShortUrlVisitsCommand.php
@@ -16,7 +16,7 @@
 
 class DeleteShortUrlVisitsCommand extends AbstractDeleteVisitsCommand
 {
-    public const NAME = 'short-url:visits-delete';
+    public const string NAME = 'short-url:visits-delete';
 
     private readonly ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

diff --git a/module/CLI/src/Command/ShortUrl/EditShortUrlCommand.php b/module/CLI/src/Command/ShortUrl/EditShortUrlCommand.php
@@ -19,7 +19,7 @@
 
 class EditShortUrlCommand extends Command
 {
-    public const NAME = 'short-url:edit';
+    public const string NAME = 'short-url:edit';
 
     private readonly ShortUrlDataInput $shortUrlDataInput;
     private readonly ShortUrlIdentifierInput $shortUrlIdentifierInput;

diff --git a/module/CLI/src/Command/ShortUrl/GetShortUrlVisitsCommand.php b/module/CLI/src/Command/ShortUrl/GetShortUrlVisitsCommand.php
@@ -16,7 +16,7 @@
 
 class GetShortUrlVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'short-url:visits';
+    public const string NAME = 'short-url:visits';
 
     private ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

diff --git a/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php b/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php
@@ -33,7 +33,7 @@
 
 class ListShortUrlsCommand extends Command
 {
-    public const NAME = 'short-url:list';
+    public const string NAME = 'short-url:list';
 
     private readonly StartDateOption $startDateOption;
     private readonly EndDateOption $endDateOption;

diff --git a/module/CLI/src/Command/ShortUrl/ResolveUrlCommand.php b/module/CLI/src/Command/ShortUrl/ResolveUrlCommand.php
@@ -17,7 +17,7 @@
 
 class ResolveUrlCommand extends Command
 {
-    public const NAME = 'short-url:parse';
+    public const string NAME = 'short-url:parse';
 
     private readonly ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

diff --git a/module/CLI/src/Command/Tag/DeleteTagsCommand.php b/module/CLI/src/Command/Tag/DeleteTagsCommand.php
@@ -14,9 +14,9 @@
 
 class DeleteTagsCommand extends Command
 {
-    public const NAME = 'tag:delete';
+    public const string NAME = 'tag:delete';
 
-    public function __construct(private TagServiceInterface $tagService)
+    public function __construct(private readonly TagServiceInterface $tagService)
     {
         parent::__construct();
     }

diff --git a/module/CLI/src/Command/Tag/GetTagVisitsCommand.php b/module/CLI/src/Command/Tag/GetTagVisitsCommand.php
@@ -16,7 +16,7 @@
 
 class GetTagVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'tag:visits';
+    public const string NAME = 'tag:visits';
 
     public function __construct(
         VisitsStatsHelperInterface $visitsHelper,

diff --git a/module/CLI/src/Command/Tag/ListTagsCommand.php b/module/CLI/src/Command/Tag/ListTagsCommand.php
@@ -17,7 +17,7 @@
 
 class ListTagsCommand extends Command
 {
-    public const NAME = 'tag:list';
+    public const string NAME = 'tag:list';
 
     public function __construct(private readonly TagServiceInterface $tagService)
     {

diff --git a/module/CLI/src/Command/Tag/RenameTagCommand.php b/module/CLI/src/Command/Tag/RenameTagCommand.php
@@ -17,7 +17,7 @@
 
 class RenameTagCommand extends Command
 {
-    public const NAME = 'tag:rename';
+    public const string NAME = 'tag:rename';
 
     public function __construct(private readonly TagServiceInterface $tagService)
     {

diff --git a/module/CLI/src/Command/Util/LockedCommandConfig.php b/module/CLI/src/Command/Util/LockedCommandConfig.php
@@ -6,7 +6,7 @@
 
 final class LockedCommandConfig
 {
-    public const DEFAULT_TTL = 600.0; // 10 minutes
+    public const float DEFAULT_TTL = 600.0; // 10 minutes
 
     private function __construct(
         public readonly string $lockName,

diff --git a/module/CLI/src/Command/Visit/DeleteOrphanVisitsCommand.php b/module/CLI/src/Command/Visit/DeleteOrphanVisitsCommand.php
@@ -13,7 +13,7 @@
 
 class DeleteOrphanVisitsCommand extends AbstractDeleteVisitsCommand
 {
-    public const NAME = 'visit:orphan-delete';
+    public const string NAME = 'visit:orphan-delete';
 
     public function __construct(private readonly VisitsDeleterInterface $deleter)
     {

diff --git a/module/CLI/src/Command/Visit/DownloadGeoLiteDbCommand.php b/module/CLI/src/Command/Visit/DownloadGeoLiteDbCommand.php
@@ -18,7 +18,7 @@
 
 class DownloadGeoLiteDbCommand extends Command
 {
-    public const NAME = 'visit:download-db';
+    public const string NAME = 'visit:download-db';
 
     private ProgressBar|null $progressBar = null;
 

diff --git a/module/CLI/src/Command/Visit/GetNonOrphanVisitsCommand.php b/module/CLI/src/Command/Visit/GetNonOrphanVisitsCommand.php
@@ -14,7 +14,7 @@
 
 class GetNonOrphanVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'visit:non-orphan';
+    public const string NAME = 'visit:non-orphan';
 
     public function __construct(
         VisitsStatsHelperInterface $visitsHelper,

diff --git a/module/CLI/src/Command/Visit/GetOrphanVisitsCommand.php b/module/CLI/src/Command/Visit/GetOrphanVisitsCommand.php
@@ -17,7 +17,7 @@
 
 class GetOrphanVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'visit:orphan';
+    public const string NAME = 'visit:orphan';
 
     protected function configure(): void
     {

diff --git a/module/CLI/src/Command/Visit/LocateVisitsCommand.php b/module/CLI/src/Command/Visit/LocateVisitsCommand.php
@@ -29,7 +29,7 @@
 
 class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocationHelperInterface
 {
-    public const NAME = 'visit:locate';
+    public const string NAME = 'visit:locate';
 
     private SymfonyStyle $io;
 

diff --git a/module/CLI/src/GeoLite/GeolocationDbUpdater.php b/module/CLI/src/GeoLite/GeolocationDbUpdater.php
@@ -20,7 +20,7 @@
 
 class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
 {
-    private const LOCK_NAME = 'geolocation-db-update';
+    private const string LOCK_NAME = 'geolocation-db-update';
 
     /** @var Closure(): Reader */
     private readonly Closure $geoLiteDbReaderFactory;

diff --git a/module/CLI/src/Util/ExitCode.php b/module/CLI/src/Util/ExitCode.php
@@ -6,7 +6,7 @@
 
 final class ExitCode
 {
-    public const EXIT_SUCCESS = 0;
-    public const EXIT_FAILURE = -1;
-    public const EXIT_WARNING = 1;
+    public const int EXIT_SUCCESS = 0;
+    public const int EXIT_FAILURE = -1;
+    public const int EXIT_WARNING = 1;
 }
diff --git a/module/CLI/src/Util/ShlinkTable.php b/module/CLI/src/Util/ShlinkTable.php
@@ -12,8 +12,8 @@
 
 final class ShlinkTable
 {
-    private const DEFAULT_STYLE_NAME = 'default';
-    private const TABLE_TITLE_STYLE = '<options=bold> %s </>';
+    private const string DEFAULT_STYLE_NAME = 'default';
+    private const string TABLE_TITLE_STYLE = '<options=bold> %s </>';
 
     private function __construct(private readonly Table $baseTable, private readonly bool $withRowSeparators = false)
     {

diff --git a/module/Core/migrations/Version20230211171904.php b/module/Core/migrations/Version20230211171904.php
@@ -10,7 +10,7 @@
 
 final class Version20230211171904 extends AbstractMigration
 {
-    private const INDEX_NAME = 'IDX_visits_potential_bot';
+    private const string INDEX_NAME = 'IDX_visits_potential_bot';
 
     public function up(Schema $schema): void
     {