Merge pull request #2348 from shlinkio/develop

Release 4.4.2

.github/actions/ci-setup/action.yml

@@ -43,5 +43,5 @@ runs:
         coverage: xdebug
     - name: Install dependencies
       if: ${{ inputs.install-deps == 'yes' }}
-      run: composer install --no-interaction --prefer-dist ${{ inputs.php-version == '8.4' && '--ignore-platform-req=php' || '' }}
+      run: composer install --no-interaction --prefer-dist
       shell: bash

.github/workflows/ci-db-tests.yml

@@ -13,8 +13,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php-version: ['8.2', '8.3', '8.4']
-    continue-on-error: ${{ matrix.php-version == '8.4' }}
+        php-version: ['8.3', '8.4']
     env:
       LC_ALL: C
     steps:

.github/workflows/ci-docker-image-build.yml

@@ -8,3 +8,5 @@ on:
 jobs:
   build-docker-image:
     uses: shlinkio/github-actions/.github/workflows/docker-image-build-ci.yml@main
+    with:
+      platforms: 'linux/arm64/v8,linux/amd64'

.github/workflows/ci-tests.yml

@@ -13,8 +13,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php-version: ['8.2', '8.3', '8.4']
-    continue-on-error: ${{ matrix.php-version == '8.4' }}
+        php-version: ['8.3', '8.4']
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # rr get-binary picks this env automatically
     steps:

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         php-version: ['8.3']
-        command: ['cs', 'stan', 'swagger:validate']
+        command: ['cs', 'stan', 'openapi:validate']
     steps:
       - uses: actions/checkout@v4
       - uses: './.github/actions/ci-setup'

.github/workflows/publish-openapi-spec.yml

@@ -1,4 +1,4 @@
-name: Publish swagger spec
+name: Publish openapi spec
 
 on:
   push:
@@ -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
@@ -20,10 +20,10 @@ jobs:
       - uses: './.github/actions/ci-setup'
         with:
           php-version: ${{ matrix.php-version }}
-          extensions-cache-key: publish-swagger-spec-extensions-${{ matrix.php-version }}
-      - run: composer swagger:inline
+          extensions-cache-key: publish-openapi-spec-extensions-${{ matrix.php-version }}
+      - run: composer openapi:inline
       - run: mkdir ${{ steps.determine_version.outputs.version }}
-      - run: mv docs/swagger/swagger-inlined.json ${{ steps.determine_version.outputs.version }}/open-api-spec.json
+      - run: mv docs/swagger/openapi-inlined.json ${{ steps.determine_version.outputs.version }}/open-api-spec.json
       - name: Publish spec
         uses: JamesIves/github-pages-deploy-action@v4
         with:

.github/workflows/publish-release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        php-version: ['8.2', '8.3'] # TODO 8.4
+        php-version: ['8.3', '8.4']
     steps:
       - uses: actions/checkout@v4
       - uses: './.github/actions/ci-setup'

.gitignore

@@ -10,7 +10,6 @@ data/database.sqlite
 data/shlink-tests.db
 data/GeoLite2-City.*
 data/infra/matomo
-docs/swagger-ui*
 docs/mercure.html
 .phpunit.result.cache
-docs/swagger/swagger-inlined.json
+docs/swagger/openapi-inlined.json

CHANGELOG.md

@@ -4,6 +4,157 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [4.4.2] - 2025-01-29
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#2346](https://github.com/shlinkio/shlink/issues/2346) Get back docker images for ARM architectures.
+
+
+## [4.4.1] - 2025-01-28
+### Added
+* [#2331](https://github.com/shlinkio/shlink/issues/2331) Add `ADDRESS` env var which allows to customize the IP address to which RoadRunner binds, when using the official docker image.
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#2341](https://github.com/shlinkio/shlink/issues/2341) Ensure all asynchronous jobs that interact with the database do not leave idle connections open.
+* [#2334](https://github.com/shlinkio/shlink/issues/2334) Improve how page titles are encoded to UTF-8, falling back from mbstring to iconv if available, and ultimately using the original title in case of error, but never causing the short URL creation to fail.
+
+
+## [4.4.0] - 2024-12-27
+### Added
+* [#2265](https://github.com/shlinkio/shlink/issues/2265) Add a new `REDIRECT_EXTRA_PATH_MODE` option that accepts three values:
+
+    * `default`: Short URLs only match if the path matches their short code or custom slug.
+    * `append`: Short URLs are matched as soon as the path starts with the short code or custom slug, and the extra path is appended to the long URL before redirecting.
+    * `ignore`: Short URLs are matched as soon as the path starts with the short code or custom slug, and the extra path is ignored.
+
+    This option effectively replaces the old `REDIRECT_APPEND_EXTRA_PATH` option, which is now deprecated and will be removed in Shlink 5.0.0
+
+* [#2156](https://github.com/shlinkio/shlink/issues/2156) Be less restrictive on what characters are disallowed in custom slugs.
+
+    All [URI-reserved characters](https://datatracker.ietf.org/doc/html/rfc3986#section-2.2) were disallowed up until now, but from now on, only the gen-delimiters are.
+
+* [#2229](https://github.com/shlinkio/shlink/issues/2229) Add `logo=disabled` query param to dynamically disable the default logo on QR codes.
+* [#2206](https://github.com/shlinkio/shlink/issues/2206) Add new `DB_USE_ENCRYPTION` config option to enable SSL database connections trusting any server certificate.
+* [#2209](https://github.com/shlinkio/shlink/issues/2209) Redirect rules are now imported when importing short URLs from a Shlink >=4.0 instance.
+
+### Changed
+* [#2281](https://github.com/shlinkio/shlink/issues/2281) Update docker image to PHP 8.4
+* [#2124](https://github.com/shlinkio/shlink/issues/2124) Improve how Shlink decides if a GeoLite db file needs to be downloaded, and reduces the chances for API limits to be reached.
+
+    Now Shlink tracks all download attempts, and knows which of them failed and succeeded. This lets it know when was the last error or success, how many consecutive errors have happened, etc.
+
+    It also tracks now the reason for a download to be attempted, and the error that happened when one fails.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* [#2247](https://github.com/shlinkio/shlink/issues/2247) Drop support for PHP 8.2
+
+### Fixed
+* *Nothing*
+
+
+## [4.3.1] - 2024-11-25
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#2285](https://github.com/shlinkio/shlink/issues/2285) Fix performance degradation when using Microsoft SQL due to incorrect order of columns in `unique_short_code_plus_domain` index.
+
+
+## [4.3.0] - 2024-11-24
+### Added
+* [#2159](https://github.com/shlinkio/shlink/issues/2159) Add support for PHP 8.4.
+* [#2207](https://github.com/shlinkio/shlink/issues/2207) Add `hasRedirectRules` flag to short URL API model. This flag tells if a specific short URL has any redirect rules attached to it.
+* [#1520](https://github.com/shlinkio/shlink/issues/1520) Allow short URLs list to be filtered by `domain`.
+
+    This change applies both to the `GET /short-urls` endpoint, via the `domain` query parameter, and the `short-url:list` console command, via the `--domain`|`-d` flag.
+
+* [#1774](https://github.com/shlinkio/shlink/issues/1774) Add new geolocation redirect rules for the dynamic redirects system.
+
+    * `geolocation-country-code`: Allows to perform redirections based on the ISO 3166-1 alpha-2 two-letter country code resolved while geolocating the visitor.
+    * `geolocation-city-name`: Allows to perform redirections based on the city name resolved while geolocating the visitor.
+
+* [#2032](https://github.com/shlinkio/shlink/issues/2032) Save the URL to which a visitor is redirected when a visit is tracked.
+
+    The value is exposed in the API as a new `redirectUrl` field for visit objects.
+
+    This is useful to know where a visitor was redirected for a short URL with dynamic redirect rules, for special redirects, or simply in case the long URL was changed over time, and you still want to know where visitors were redirected originally.
+
+    Some visits may not have a redirect URL if a redirect didn't happen, like for orphan visits when no special redirects are configured, or when a visit is tracked as part of the pixel action.
+
+### Changed
+* [#2193](https://github.com/shlinkio/shlink/issues/2193) API keys are now hashed using SHA256, instead of being saved in plain text.
+
+    As a side effect, API key names have now become more important, and are considered unique.
+
+    When people update to this Shlink version, existing API keys will be hashed for everything to continue working.
+
+    In order to avoid data to be lost, plain-text keys will be written in the `name` field, either together with any existing name, or as the name itself. Then users are responsible for renaming them using the new `api-key:rename` command.
+
+    For newly created API keys, it is recommended to provide a name, but if not provided, a name will be generated from a redacted version of the new API key.
+
+* Update to Shlink PHP coding standard 2.4
+* Update to `hidehalo/nanoid-php` 2.0
+* Update to PHPStan 2.0
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#2264](https://github.com/shlinkio/shlink/issues/2264) Fix visits counts not being deleted when deleting short URL or orphan visits.
+
+
+## [4.2.5] - 2024-11-03
+### Added
+* *Nothing*
+
+### Changed
+* Update to Shlink PHP coding standard 2.4
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#2244](https://github.com/shlinkio/shlink/issues/2244) Fix integration with Redis 7.4 and Valkey.
+
+
 ## [4.2.4] - 2024-10-27
 ### Added
 * *Nothing*

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3-alpine3.19 as base
+FROM php:8.4-alpine3.21 AS base
 
 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION ${SHLINK_VERSION}
@@ -7,8 +7,8 @@ ENV SHLINK_RUNTIME ${SHLINK_RUNTIME}
 
 ENV USER_ID '1001'
 ENV PDO_SQLSRV_VERSION 5.12.0
-ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
-ENV MS_ODBC_SQL_VERSION 18_18.1.1.1
+ENV MS_ODBC_DOWNLOAD '7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
+ENV MS_ODBC_SQL_VERSION 18_18.4.1.1
 ENV LC_ALL 'C'
 
 WORKDIR /etc/shlink
@@ -36,7 +36,7 @@ RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \
     apk del .phpize-deps
 
 # Install shlink
-FROM base as builder
+FROM base AS builder
 COPY . .
 COPY --from=composer:2 /usr/bin/composer ./composer.phar
 RUN apk add --no-cache git && \

README.md

@@ -7,7 +7,7 @@
 [![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/main/LICENSE)
 
 [![Mastodon](https://img.shields.io/mastodon/follow/109329425426175098?color=%236364ff&domain=https%3A%2F%2Ffosstodon.org&label=follow&logo=mastodon&logoColor=white&style=flat-square)](https://fosstodon.org/@shlinkio)
-[![Bluesky](https://img.shields.io/badge/follow-shlinkio-0285FF.svg?style=flat-square&logo=bluesky&logoColor=white)](https://bsky.app/profile/shlinkio.bsky.social)
+[![Bluesky](https://img.shields.io/badge/follow-shlinkio-0285FF.svg?style=flat-square&logo=bluesky&logoColor=white)](https://bsky.app/profile/shlink.io)
 [![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://slnk.to/donate)
 
 A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own domain.
@@ -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.

composer.json

@@ -12,69 +12,68 @@
         }
     ],
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-curl": "*",
         "ext-gd": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pdo": "*",
-        "akrabat/ip-address-middleware": "^2.3",
+        "akrabat/ip-address-middleware": "^2.5",
         "cakephp/chronos": "^3.1",
         "doctrine/dbal": "^4.2",
         "doctrine/migrations": "^3.8",
         "doctrine/orm": "^3.3",
+        "donatj/phpuseragentparser": "^1.10",
         "endroid/qr-code": "^6.0",
         "friendsofphp/proxy-manager-lts": "^1.0",
-        "geoip2/geoip2": "^3.0",
+        "geoip2/geoip2": "^3.1",
         "guzzlehttp/guzzle": "^7.9",
-        "hidehalo/nanoid-php": "^1.1",
-        "jaybizzle/crawler-detect": "^1.2.116",
-        "laminas/laminas-config": "^3.9",
-        "laminas/laminas-config-aggregator": "^1.15",
+        "hidehalo/nanoid-php": "^2.0",
+        "jaybizzle/crawler-detect": "^1.3",
+        "laminas/laminas-config-aggregator": "^1.17",
         "laminas/laminas-diactoros": "^3.5",
-        "laminas/laminas-inputfilter": "^2.30",
-        "laminas/laminas-servicemanager": "^3.22",
-        "laminas/laminas-stdlib": "^3.19",
+        "laminas/laminas-inputfilter": "^2.31",
+        "laminas/laminas-servicemanager": "^3.23",
+        "laminas/laminas-stdlib": "^3.20",
         "matomo/matomo-php-tracker": "^3.3",
         "mezzio/mezzio": "^3.20",
         "mezzio/mezzio-fastroute": "^3.12",
         "mezzio/mezzio-problem-details": "^1.15",
-        "mlocati/ip-lib": "^1.18",
-        "mobiledetect/mobiledetectlib": "^4.8",
+        "mlocati/ip-lib": "^1.18.1",
         "pagerfanta/core": "^3.8",
         "ramsey/uuid": "^4.7",
-        "shlinkio/doctrine-specification": "^2.1.1",
-        "shlinkio/shlink-common": "^6.4",
-        "shlinkio/shlink-config": "^3.3",
-        "shlinkio/shlink-event-dispatcher": "^4.1",
-        "shlinkio/shlink-importer": "^5.3.2",
-        "shlinkio/shlink-installer": "^9.2",
-        "shlinkio/shlink-ip-geolocation": "^4.1",
-        "shlinkio/shlink-json": "^1.1",
-        "spiral/roadrunner": "^2024.1",
+        "shlinkio/doctrine-specification": "^2.2",
+        "shlinkio/shlink-common": "^7.0",
+        "shlinkio/shlink-config": "^4.0",
+        "shlinkio/shlink-event-dispatcher": "^4.2",
+        "shlinkio/shlink-importer": "^5.6",
+        "shlinkio/shlink-installer": "^9.5",
+        "shlinkio/shlink-ip-geolocation": "^4.3",
+        "shlinkio/shlink-json": "^1.2",
+        "spiral/roadrunner": "^2024.3",
         "spiral/roadrunner-cli": "^2.6",
         "spiral/roadrunner-http": "^3.5",
-        "spiral/roadrunner-jobs": "^4.5",
-        "symfony/console": "^7.1",
-        "symfony/filesystem": "^7.1",
-        "symfony/lock": "^7.1",
-        "symfony/process": "^7.1",
-        "symfony/string": "^7.1"
+        "spiral/roadrunner-jobs": "^4.6",
+        "symfony/console": "^7.2",
+        "symfony/filesystem": "^7.2",
+        "symfony/lock": "^7.2",
+        "symfony/process": "^7.2",
+        "symfony/string": "^7.2"
     },
     "require-dev": {
-        "devizzent/cebe-php-openapi": "^1.0.1",
+        "devizzent/cebe-php-openapi": "^1.1.2",
         "devster/ubench": "^2.1",
-        "phpstan/phpstan": "^1.12",
-        "phpstan/phpstan-doctrine": "^1.5",
-        "phpstan/phpstan-phpunit": "^1.4",
-        "phpstan/phpstan-symfony": "^1.4",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-doctrine": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-symfony": "^2.0",
         "phpunit/php-code-coverage": "^11.0",
         "phpunit/phpcov": "^10.0",
-        "phpunit/phpunit": "^11.4",
+        "phpunit/phpunit": "^11.5",
         "roave/security-advisories": "dev-master",
-        "shlinkio/php-coding-standard": "~2.3.0",
-        "shlinkio/shlink-test-utils": "^4.1.1",
-        "symfony/var-dumper": "^7.1",
+        "shlinkio/php-coding-standard": "~2.4.0",
+        "shlinkio/shlink-test-utils": "^4.2",
+        "symfony/var-dumper": "^7.2",
         "veewee/composer-run-parallel": "^1.4"
     },
     "conflict": {
@@ -109,7 +108,7 @@
     },
     "scripts": {
         "ci": [
-            "@parallel cs stan swagger:validate test:unit:ci test:db:sqlite:ci test:db:postgres test:db:mysql test:db:maria test:db:ms",
+            "@parallel cs stan openapi:validate test:unit:ci test:db:sqlite:ci test:db:postgres test:db:mysql test:db:maria test:db:ms",
             "@parallel test:api:ci test:cli:ci"
         ],
         "cs": "phpcs -s",
@@ -155,36 +154,18 @@
             "@test:cli",
             "phpcov merge build/coverage-cli --html build/coverage-cli/coverage-html && rm build/coverage-cli/*.cov"
         ],
-        "swagger:validate": "php-openapi validate docs/swagger/swagger.json",
-        "swagger:inline": "php-openapi inline docs/swagger/swagger.json docs/swagger/swagger-inlined.json",
+        "openapi:validate": "@php -d error_reporting=\"E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED\" vendor/bin/php-openapi validate docs/swagger/swagger.json",
+        "openapi:inline": "@php -d error_reporting=\"E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED\" vendor/bin/php-openapi inline docs/swagger/swagger.json docs/swagger/openapi-inlined.json",
+        "swagger:validate": [
+            "echo \"This command is deprecated. Use openapi:validate instead\"",
+            "@openapi:validate"
+        ],
+        "swagger:inline": [
+            "echo \"This command is deprecated. Use openapi:inline instead\"",
+            "@openapi:inline"
+        ],
         "clean:dev": "rm -f data/database.sqlite && rm -f config/params/generated_config.php"
     },
-    "scripts-descriptions": {
-        "ci": "<fg=blue;options=bold>Alias for \"cs\", \"stan\", \"swagger:validate\" and \"test:ci\"</>",
-        "cs": "<fg=blue;options=bold>Checks coding styles</>",
-        "cs:fix": "<fg=blue;options=bold>Fixes coding styles, when possible</>",
-        "stan": "<fg=blue;options=bold>Inspects code with phpstan</>",
-        "test": "<fg=blue;options=bold>Runs all test suites</>",
-        "test:unit": "<fg=blue;options=bold>Runs unit test suites</>",
-        "test:unit:ci": "<fg=blue;options=bold>Runs unit test suites, generating all needed reports and logs for CI envs</>",
-        "test:unit:pretty": "<fg=blue;options=bold>Runs unit test suites and generates an HTML code coverage report</>",
-        "test:db": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL, MariaDB, PostgreSQL and MsSQL</>",
-        "test:db:sqlite": "<fg=blue;options=bold>Runs database test suites on a SQLite database</>",
-        "test:db:sqlite:ci": "<fg=blue;options=bold>Runs database test suites on a SQLite database, generating all needed reports and logs for CI envs</>",
-        "test:db:mysql": "<fg=blue;options=bold>Runs database test suites on a MySQL database</>",
-        "test:db:maria": "<fg=blue;options=bold>Runs database test suites on a MariaDB database</>",
-        "test:db:postgres": "<fg=blue;options=bold>Runs database test suites on a PostgreSQL database</>",
-        "test:db:ms": "<fg=blue;options=bold>Runs database test suites on a Microsoft SQL Server database</>",
-        "test:api": "<fg=blue;options=bold>Runs API test suites</>",
-        "test:api:ci": "<fg=blue;options=bold>Runs API test suites, and generates code coverage for CI</>",
-        "test:api:pretty": "<fg=blue;options=bold>Runs API test suites, and generates code coverage in HTML format</>",
-        "test:cli": "<fg=blue;options=bold>Runs CLI test suites</>",
-        "test:cli:ci": "<fg=blue;options=bold>Runs CLI test suites, and generates code coverage for CI</>",
-        "test:cli:pretty": "<fg=blue;options=bold>Runs CLI test suites, and generates code coverage in HTML format</>",
-        "swagger:validate": "<fg=blue;options=bold>Validates the swagger docs, making sure they fulfil the spec</>",
-        "swagger:inline": "<fg=blue;options=bold>Inlines swagger docs in a single file</>",
-        "clean:dev": "<fg=blue;options=bold>Deletes artifacts which are gitignored and could affect dev env</>"
-    },
     "config": {
         "sort-packages": true,
         "platform-check": false,

config/autoload/client-detection.global.php

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    'ip_address_resolution' => [
-        'headers_to_inspect' => [
-            'CF-Connecting-IP',
-            'X-Forwarded-For',
-            'X-Forwarded',
-            'Forwarded',
-            'True-Client-IP',
-            'X-Real-IP',
-            'X-Cluster-Client-Ip',
-            'Client-Ip',
-        ],
-    ],
-
-];

config/autoload/entity-manager.global.php

@@ -12,9 +12,10 @@ use function Shlinkio\Shlink\Core\ArrayUtils\contains;
 
 return (static function (): array {
     $driver = EnvVars::DB_DRIVER->loadFromEnv();
+    $useEncryption = (bool) EnvVars::DB_USE_ENCRYPTION->loadFromEnv();
     $isMysqlCompatible = contains($driver, ['maria', 'mysql']);
 
-    $resolveDriver = static fn () => match ($driver) {
+    $doctrineDriver = match ($driver) {
         'postgres' => 'pdo_pgsql',
         'mssql' => 'pdo_sqlsrv',
         default => 'pdo_mysql',
@@ -23,31 +24,40 @@ return (static function (): array {
         $value = $envVar->loadFromEnv();
         return $value === null ? null : (string) $value;
     };
-    $resolveCharset = static fn () => match ($driver) {
+    $charset = match ($driver) {
         // This does not determine charsets or collations in tables or columns, but the charset used in the data
         // flowing in the connection, so it has to match what has been set in the database.
         'maria', 'mysql' => 'utf8mb4',
         'postgres' => 'utf8',
         default => null,
     };
-
-    $resolveConnection = static fn () => match ($driver) {
+    $driverOptions = match ($driver) {
+        'mssql' => ['TrustServerCertificate' => 'true'],
+        'maria', 'mysql' => ! $useEncryption ? [] : [
+            1007 => true, // PDO::MYSQL_ATTR_SSL_KEY: Require using SSL
+            1014 => false, // PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT: Trust any certificate
+        ],
+        'postgres' =>  ! $useEncryption ? [] : [
+            'sslmode' => 'require', // Require connections to be encrypted
+            'sslrootcert' => '', // Allow any certificate
+        ],
+        default => [],
+    };
+    $connection = match ($driver) {
         null, 'sqlite' => [
             'driver' => 'pdo_sqlite',
             'path' => 'data/database.sqlite',
         ],
         default => [
-            'driver' => $resolveDriver(),
+            'driver' => $doctrineDriver,
             'dbname' => EnvVars::DB_NAME->loadFromEnv(),
             'user' => $readCredentialAsString(EnvVars::DB_USER),
             'password' => $readCredentialAsString(EnvVars::DB_PASSWORD),
             'host' => EnvVars::DB_HOST->loadFromEnv(),
             'port' => EnvVars::DB_PORT->loadFromEnv(),
             'unix_socket' => $isMysqlCompatible ? EnvVars::DB_UNIX_SOCKET->loadFromEnv() : null,
-            'charset' => $resolveCharset(),
-            'driverOptions' => $driver !== 'mssql' ? [] : [
-                'TrustServerCertificate' => 'true',
-            ],
+            'charset' => $charset,
+            'driverOptions' => $driverOptions,
         ],
     };
 
@@ -63,7 +73,7 @@ return (static function (): array {
                     Events::postFlush => [ShortUrlVisitsCountTracker::class, OrphanVisitsCountTracker::class],
                 ],
             ],
-            'connection' => $resolveConnection(),
+            'connection' => $connection,
         ],
 
     ];

config/autoload/installer.global.php

@@ -20,6 +20,7 @@ return [
             Option\Database\DatabaseUserConfigOption::class,
             Option\Database\DatabasePasswordConfigOption::class,
             Option\Database\DatabaseUnixSocketConfigOption::class,
+            Option\Database\DatabaseUseEncryptionConfigOption::class,
             Option\UrlShortener\ShortDomainHostConfigOption::class,
             Option\UrlShortener\ShortDomainSchemaConfigOption::class,
             Option\Redirect\BaseUrlRedirectConfigOption::class,
@@ -41,7 +42,7 @@ return [
             Option\UrlShortener\RedirectStatusCodeConfigOption::class,
             Option\UrlShortener\RedirectCacheLifeTimeConfigOption::class,
             Option\UrlShortener\AutoResolveTitlesConfigOption::class,
-            Option\UrlShortener\AppendExtraPathConfigOption::class,
+            Option\UrlShortener\ExtraPathModeConfigOption::class,
             Option\UrlShortener\EnableMultiSegmentSlugsConfigOption::class,
             Option\UrlShortener\EnableTrailingSlashConfigOption::class,
             Option\UrlShortener\ShortUrlModeConfigOption::class,

config/autoload/ip-address.global.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+use RKA\Middleware\IpAddress;
+use RKA\Middleware\Mezzio\IpAddressFactory;
+
+use const Shlinkio\Shlink\IP_ADDRESS_REQUEST_ATTRIBUTE;
+
+return [
+
+    // Configuration for RKA\Middleware\IpAddress
+    'rka' => [
+        'ip_address' => [
+            'attribute_name' => IP_ADDRESS_REQUEST_ATTRIBUTE,
+            'check_proxy_headers' => true,
+            'trusted_proxies' => [],
+            'headers_to_inspect' => [
+                'CF-Connecting-IP',
+                'X-Forwarded-For',
+                'X-Forwarded',
+                'Forwarded',
+                'True-Client-IP',
+                'X-Real-IP',
+                'X-Cluster-Client-Ip',
+                'Client-Ip',
+            ],
+        ],
+    ],
+
+    'dependencies' => [
+        'factories' => [
+            IpAddress::class => IpAddressFactory::class,
+        ],
+    ],
+
+];

config/autoload/middleware-pipeline.global.php

@@ -11,6 +11,7 @@ use RKA\Middleware\IpAddress;
 use Shlinkio\Shlink\Common\Middleware\AccessLogMiddleware;
 use Shlinkio\Shlink\Common\Middleware\ContentLengthMiddleware;
 use Shlinkio\Shlink\Common\Middleware\RequestIdMiddleware;
+use Shlinkio\Shlink\Core\Geolocation\Middleware\IpGeolocationMiddleware;
 
 return [
 
@@ -67,8 +68,11 @@ return [
         ],
         'not-found' => [
             'middleware' => [
-                // This middleware is in front of tracking actions explicitly. Putting here for orphan visits tracking
+                // These two middlewares are in front of other tracking actions.
+                // Putting them here for orphan visits tracking
                 IpAddress::class,
+                IpGeolocationMiddleware::class,
+
                 Core\ErrorHandler\NotFoundTypeResolverMiddleware::class,
                 Core\ShortUrl\Middleware\ExtraPathRedirectMiddleware::class,
                 Core\ErrorHandler\NotFoundTrackerMiddleware::class,

config/autoload/routes.config.php

@@ -8,6 +8,7 @@ use Fig\Http\Message\RequestMethodInterface;
 use RKA\Middleware\IpAddress;
 use Shlinkio\Shlink\Core\Action as CoreAction;
 use Shlinkio\Shlink\Core\Config\EnvVars;
+use Shlinkio\Shlink\Core\Geolocation\Middleware\IpGeolocationMiddleware;
 use Shlinkio\Shlink\Core\ShortUrl\Middleware\TrimTrailingSlashMiddleware;
 use Shlinkio\Shlink\Rest\Action;
 use Shlinkio\Shlink\Rest\ConfigProvider;
@@ -88,6 +89,7 @@ return (static function (): array {
                 'path' => '/{shortCode}/track',
                 'middleware' => [
                     IpAddress::class,
+                    IpGeolocationMiddleware::class,
                     CoreAction\PixelAction::class,
                 ],
                 'allowed_methods' => [RequestMethodInterface::METHOD_GET],
@@ -105,6 +107,7 @@ return (static function (): array {
                 'path' => sprintf('/{shortCode}%s', $shortUrlRouteSuffix),
                 'middleware' => [
                     IpAddress::class,
+                    IpGeolocationMiddleware::class,
                     TrimTrailingSlashMiddleware::class,
                     CoreAction\RedirectAction::class,
                 ],

config/constants.php

@@ -21,3 +21,5 @@ const DEFAULT_QR_CODE_ROUND_BLOCK_SIZE = true;
 const DEFAULT_QR_CODE_ENABLED_FOR_DISABLED_SHORT_URLS = true;
 const DEFAULT_QR_CODE_COLOR = '#000000'; // Black
 const DEFAULT_QR_CODE_BG_COLOR = '#ffffff'; // White
+const IP_ADDRESS_REQUEST_ATTRIBUTE = 'remote_address';
+const REDIRECT_URL_REQUEST_ATTRIBUTE = 'redirect_url';

config/roadrunner/.rr.yml

@@ -7,7 +7,7 @@ server:
   command: 'php -dopcache.enable_cli=1 -dopcache.validate_timestamps=0 ../../bin/roadrunner-worker.php'
 
 http:
-  address: '0.0.0.0:${PORT:-8080}'
+  address: '${ADDRESS:-0.0.0.0}:${PORT:-8080}'
   middleware: ['static']
   static:
     dir: '../../public'

data/infra/ci/install-ms-odbc.sh

@@ -3,7 +3,7 @@
 set -ex
 
 curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
-curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
+curl https://packages.microsoft.com/config/ubuntu/24.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
 apt-get update
 ACCEPT_EULA=Y apt-get install msodbcsql18
 # apt-get install unixodbc-dev

data/infra/php.Dockerfile

@@ -1,10 +1,10 @@
-FROM php:8.3-fpm-alpine3.19
+FROM php:8.4-fpm-alpine3.21
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV APCU_VERSION 5.1.23
+ENV APCU_VERSION 5.1.24
 ENV PDO_SQLSRV_VERSION 5.12.0
-ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
-ENV MS_ODBC_SQL_VERSION 18_18.1.1.1
+ENV MS_ODBC_DOWNLOAD '7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
+ENV MS_ODBC_SQL_VERSION 18_18.4.1.1
 
 RUN apk update
 

data/infra/roadrunner.Dockerfile

@@ -1,10 +1,9 @@
-FROM php:8.3-alpine3.19
+FROM php:8.4-alpine3.21
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV APCU_VERSION 5.1.23
 ENV PDO_SQLSRV_VERSION 5.12.0
-ENV MS_ODBC_DOWNLOAD 'b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486'
-ENV MS_ODBC_SQL_VERSION 18_18.1.1.1
+ENV MS_ODBC_DOWNLOAD '7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8'
+ENV MS_ODBC_SQL_VERSION 18_18.4.1.1
 
 RUN apk update
 
@@ -36,16 +35,6 @@ RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS linux-headers && \
     apk del .phpize-deps
 RUN docker-php-ext-install bcmath
 
-# Install APCu extension
-ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz
-RUN mkdir -p /usr/src/php/ext/apcu \
-  && tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1 \
-  && docker-php-ext-configure apcu \
-  && docker-php-ext-install apcu \
-  && rm /tmp/apcu.tar.gz \
-  && rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini \
-  && echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
-
 # Install xdebug and sqlsrv driver
 RUN apk add --update linux-headers && \
     wget https://download.microsoft.com/download/${MS_ODBC_DOWNLOAD}/msodbcsql${MS_ODBC_SQL_VERSION}-1_amd64.apk && \

docker-compose.yml

@@ -118,13 +118,13 @@ services:
 
     shlink_redis:
         container_name: shlink_redis
-        image: redis:6.2-alpine
+        image: redis:7.4-alpine
         ports:
             - "6380:6379"
 
     shlink_redis_acl:
         container_name: shlink_redis_acl
-        image: redis:6.2-alpine
+        image: redis:7.4-alpine
         command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
         ports:
             - "6382:6379"
@@ -144,7 +144,7 @@ services:
 
     shlink_mercure:
         container_name: shlink_mercure
-        image: dunglas/mercure:v0.15
+        image: dunglas/mercure:v0.18
         ports:
             - "3080:80"
         environment:

docs/async-api/async-api.json

@@ -141,6 +141,14 @@
                     "crawlable": {
                         "type": "boolean",
                         "description": "Tells if this URL will be included as 'Allow' in Shlink's robots.txt."
+                    },
+                    "forwardQuery": {
+                        "type": "boolean",
+                        "description": "Tells if this URL will forward the query params to the long URL when visited, as explained in [the docs](https://shlink.io/documentation/some-features/#query-params-forwarding)."
+                    },
+                    "hasRedirectRules": {
+                        "type": "boolean",
+                        "description": "Whether this short URL has redirect rules attached to it or not. Use [this endpoint](https://api-spec.shlink.io/#/Redirect%20rules/listShortUrlRedirectRules) to get the actual list of rules."
                     }
                 },
                 "example": {
@@ -164,7 +172,9 @@
                     },
                     "domain": "example.com",
                     "title": "The title",
-                    "crawlable": false
+                    "crawlable": false,
+                    "forwardQuery": false,
+                    "hasRedirectRules": true
                 }
             },
             "ShortUrlMeta": {
@@ -237,6 +247,11 @@
                         "type": "string",
                         "nullable": true,
                         "description": "The originally visited URL that triggered the tracking of this visit"
+                    },
+                    "redirectUrl": {
+                        "type": "string",
+                        "nullable":  true,
+                        "description": "The URL to which the visitor was redirected, or null if a redirect did not occur, like for 404 requests or pixel tracking"
                     }
                 },
                 "example": {

docs/swagger/definitions/SetShortUrlRedirectRule.json

@@ -15,7 +15,14 @@
         "properties": {
           "type": {
             "type": "string",
-            "enum": ["device", "language", "query-param", "ip-address"],
+            "enum": [
+              "device",
+              "language",
+              "query-param",
+              "ip-address",
+              "geolocation-country-code",
+              "geolocation-city-name"
+            ],
             "description": "The type of the condition, which will determine the logic used to match it"
           },
           "matchKey":  {

docs/swagger/definitions/ShortUrl.json

@@ -11,7 +11,8 @@
         "domain",
         "title",
         "crawlable",
-        "forwardQuery"
+        "forwardQuery",
+        "hasRedirectRules"
     ],
     "properties": {
         "shortCode": {
@@ -59,6 +60,10 @@
         "forwardQuery": {
             "type": "boolean",
             "description": "Tells if this URL will forward the query params to the long URL when visited, as explained in [the docs](https://shlink.io/documentation/some-features/#query-params-forwarding)."
+        },
+        "hasRedirectRules": {
+            "type": "boolean",
+            "description": "Whether this short URL has redirect rules attached to it or not. Use [this endpoint](https://api-spec.shlink.io/#/Redirect%20rules/listShortUrlRedirectRules) to get the actual list of rules."
         }
     }
 }

docs/swagger/definitions/Visit.json

@@ -25,6 +25,10 @@
         "visitedUrl": {
             "type": ["string", "null"],
             "description": "The originally visited URL that triggered the tracking of this visit"
+        },
+        "redirectUrl": {
+            "type": ["string", "null"],
+            "description": "The URL to which the visitor was redirected, or null if a redirect did not occur, like for 404 requests or pixel tracking"
         }
     }
 }

docs/swagger/paths/v1_short-urls.json

@@ -125,6 +125,15 @@
                         "false"
                     ]
                 }
+            },
+            {
+                "name": "domain",
+                "in": "query",
+                "description": "Get short URLs for this particular domain only. Use **DEFAULT** keyword for default domain.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
             }
         ],
         "security": [
@@ -180,7 +189,9 @@
                                         },
                                         "domain": null,
                                         "title": "Welcome to Steam",
-                                        "crawlable": false
+                                        "crawlable": false,
+                                        "forwardQuery": true,
+                                        "hasRedirectRules": true
                                     },
                                     {
                                         "shortCode": "12Kb3",
@@ -202,7 +213,9 @@
                                         },
                                         "domain":  null,
                                         "title": null,
-                                        "crawlable": false
+                                        "crawlable": false,
+                                        "forwardQuery": true,
+                                        "hasRedirectRules": false
                                     },
                                     {
                                         "shortCode": "123bA",
@@ -222,7 +235,9 @@
                                         },
                                         "domain":  "example.com",
                                         "title": null,
-                                        "crawlable": false
+                                        "crawlable": false,
+                                        "forwardQuery": false,
+                                        "hasRedirectRules": true
                                     }
                                 ],
                                 "pagination": {
@@ -337,7 +352,9 @@
                             },
                             "domain": null,
                             "title": null,
-                            "crawlable": false
+                            "crawlable": false,
+                            "forwardQuery": true,
+                            "hasRedirectRules": false
                         }
                     }
                 }

docs/swagger/paths/v1_short-urls_shorten.json

@@ -72,7 +72,9 @@
                             },
                             "domain": null,
                             "title": null,
-                            "crawlable": false
+                            "crawlable": false,
+                            "forwardQuery": true,
+                            "hasRedirectRules": false
                         }
                     },
                     "text/plain": {

docs/swagger/paths/v1_short-urls_{shortCode}.json

@@ -50,7 +50,9 @@
                             },
                             "domain": null,
                             "title": null,
-                            "crawlable": false
+                            "crawlable": false,
+                            "forwardQuery": true,
+                            "hasRedirectRules": true
                         }
                     }
                 }
@@ -163,7 +165,9 @@
                             },
                             "domain": null,
                             "title": "Shlink - The URL shortener",
-                            "crawlable": false
+                            "crawlable": false,
+                            "forwardQuery": false,
+                            "hasRedirectRules": true
                         }
                     }
                 }

docs/swagger/paths/{shortCode}_qr-code.json

@@ -85,6 +85,16 @@
                     "type": "string",
                     "default": "#ffffff"
                 }
+            },
+            {
+                "name": "logo",
+                "in": "query",
+                "description": "Currently used to disable the logo that was set via configuration options. It may be used in future to dynamically choose from multiple logos.",
+                "required": false,
+                "schema": {
+                    "type": "string",
+                    "enum": ["disable"]
+                }
             }
         ],
         "responses": {

module/CLI/config/cli.config.php

@@ -28,6 +28,7 @@ return [
             Command\Api\DisableKeyCommand::NAME => Command\Api\DisableKeyCommand::class,
             Command\Api\ListKeysCommand::NAME => Command\Api\ListKeysCommand::class,
             Command\Api\InitialApiKeyCommand::NAME => Command\Api\InitialApiKeyCommand::class,
+            Command\Api\RenameApiKeyCommand::NAME => Command\Api\RenameApiKeyCommand::class,
 
             Command\Tag\ListTagsCommand::NAME => Command\Tag\ListTagsCommand::class,
             Command\Tag\RenameTagCommand::NAME => Command\Tag\RenameTagCommand::class,

module/CLI/config/dependencies.config.php

@@ -7,9 +7,9 @@ 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\Geolocation\GeolocationDbUpdater;
 use Shlinkio\Shlink\Core\Matomo;
 use Shlinkio\Shlink\Core\RedirectRule\ShortUrlRedirectRuleService;
 use Shlinkio\Shlink\Core\ShortUrl;
@@ -17,15 +17,11 @@ use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifier;
 use Shlinkio\Shlink\Core\Tag\TagService;
 use Shlinkio\Shlink\Core\Visit;
 use Shlinkio\Shlink\Installer\Factory\ProcessHelperFactory;
-use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdater;
-use Shlinkio\Shlink\IpGeolocation\GeoLite2\GeoLite2ReaderFactory;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Symfony\Component\Console as SymfonyCli;
 use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Process\PhpExecutableFinder;
 
-use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;
-
 return [
 
     'dependencies' => [
@@ -34,7 +30,6 @@ return [
             SymfonyCli\Helper\ProcessHelper::class => ProcessHelperFactory::class,
             PhpExecutableFinder::class => InvokableFactory::class,
 
-            GeoLite\GeolocationDbUpdater::class => ConfigAbstractFactory::class,
             RedirectRule\RedirectRuleHandler::class => InvokableFactory::class,
             Util\ProcessRunner::class => ConfigAbstractFactory::class,
 
@@ -59,6 +54,7 @@ return [
             Command\Api\DisableKeyCommand::class => ConfigAbstractFactory::class,
             Command\Api\ListKeysCommand::class => ConfigAbstractFactory::class,
             Command\Api\InitialApiKeyCommand::class => ConfigAbstractFactory::class,
+            Command\Api\RenameApiKeyCommand::class => ConfigAbstractFactory::class,
 
             Command\Tag\ListTagsCommand::class => ConfigAbstractFactory::class,
             Command\Tag\RenameTagCommand::class => ConfigAbstractFactory::class,
@@ -81,12 +77,6 @@ return [
     ],
 
     ConfigAbstractFactory::class => [
-        GeoLite\GeolocationDbUpdater::class => [
-            DbUpdater::class,
-            GeoLite2ReaderFactory::class,
-            LOCAL_LOCK_FACTORY,
-            TrackingOptions::class,
-        ],
         Util\ProcessRunner::class => [SymfonyCli\Helper\ProcessHelper::class],
         ApiKey\RoleResolver::class => [DomainService::class, UrlShortenerOptions::class],
 
@@ -106,7 +96,7 @@ return [
         Command\ShortUrl\DeleteShortUrlVisitsCommand::class => [ShortUrl\ShortUrlVisitsDeleter::class],
         Command\ShortUrl\DeleteExpiredShortUrlsCommand::class => [ShortUrl\DeleteShortUrlService::class],
 
-        Command\Visit\DownloadGeoLiteDbCommand::class => [GeoLite\GeolocationDbUpdater::class],
+        Command\Visit\DownloadGeoLiteDbCommand::class => [GeolocationDbUpdater::class],
         Command\Visit\LocateVisitsCommand::class => [
             Visit\Geolocation\VisitLocator::class,
             Visit\Geolocation\VisitToLocationHelper::class,
@@ -120,6 +110,7 @@ return [
         Command\Api\DisableKeyCommand::class => [ApiKeyService::class],
         Command\Api\ListKeysCommand::class => [ApiKeyService::class],
         Command\Api\InitialApiKeyCommand::class => [ApiKeyService::class],
+        Command\Api\RenameApiKeyCommand::class => [ApiKeyService::class],
 
         Command\Tag\ListTagsCommand::class => [TagService::class],
         Command\Tag\RenameTagCommand::class => [TagService::class],

module/CLI/src/Command/Api/DisableKeyCommand.php

@@ -6,39 +6,99 @@ namespace Shlinkio\Shlink\CLI\Command\Api;
 
 use Shlinkio\Shlink\CLI\Util\ExitCode;
 use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
+use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
+use function Shlinkio\Shlink\Core\ArrayUtils\map;
 use function sprintf;
 
 class DisableKeyCommand extends Command
 {
-    public const NAME = 'api-key:disable';
+    public const string NAME = 'api-key:disable';
 
-    public function __construct(private ApiKeyServiceInterface $apiKeyService)
+    public function __construct(private readonly ApiKeyServiceInterface $apiKeyService)
     {
         parent::__construct();
     }
 
     protected function configure(): void
     {
-        $this->setName(self::NAME)
-             ->setDescription('Disables an API key.')
-             ->addArgument('apiKey', InputArgument::REQUIRED, 'The API key to disable');
+        $help = <<<HELP
+        The <info>%command.name%</info> command allows you to disable an existing API key, via its name or the
+        plain-text key.
+
+        If no arguments are provided, you will be prompted to select one of the existing non-disabled API keys.
+
+            <info>%command.full_name%</info>
+
+        You can optionally pass the API key name to be disabled. In that case <comment>--by-name</comment> is also
+        required, to indicate the first argument is the API key name and not the plain-text key:
+
+            <info>%command.full_name% the_key_name --by-name</info>
+
+        You can pass the plain-text key to be disabled, but that is <options=bold>DEPRECATED</>. In next major version,
+        the argument will always be assumed to be the name:
+
+            <info>%command.full_name% d6b6c60e-edcd-4e43-96ad-fa6b7014c143</info>
+
+        HELP;
+
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Disables an API key by name or plain-text key (providing a plain-text key is DEPRECATED)')
+            ->addArgument(
+                'keyOrName',
+                InputArgument::OPTIONAL,
+                'The API key to disable. Pass `--by-name` to indicate this value is the name and not the key.',
+            )
+            ->addOption(
+                'by-name',
+                mode: InputOption::VALUE_NONE,
+                description: 'Indicates the first argument is the API key name, not the plain-text key.',
+            )
+            ->setHelp($help);
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output): void
+    {
+        $keyOrName = $input->getArgument('keyOrName');
+
+        if ($keyOrName === null) {
+            $apiKeys = $this->apiKeyService->listKeys(enabledOnly: true);
+            $name = (new SymfonyStyle($input, $output))->choice(
+                'What API key do you want to disable?',
+                map($apiKeys, static fn (ApiKey $apiKey) => $apiKey->name),
+            );
+
+            $input->setArgument('keyOrName', $name);
+            $input->setOption('by-name', true);
+        }
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $apiKey = $input->getArgument('apiKey');
+        $keyOrName = $input->getArgument('keyOrName');
+        $byName = $input->getOption('by-name');
         $io = new SymfonyStyle($input, $output);
 
+        if (! $keyOrName) {
+            $io->warning('An API key name was not provided.');
+            return ExitCode::EXIT_WARNING;
+        }
+
         try {
-            $this->apiKeyService->disable($apiKey);
-            $io->success(sprintf('API key "%s" properly disabled', $apiKey));
+            if ($byName) {
+                $this->apiKeyService->disableByName($keyOrName);
+            } else {
+                $this->apiKeyService->disableByKey($keyOrName);
+            }
+            $io->success(sprintf('API key "%s" properly disabled', $keyOrName));
             return ExitCode::EXIT_SUCCESS;
         } catch (InvalidArgumentException $e) {
             $io->error($e->getMessage());

module/CLI/src/Command/Api/GenerateKeyCommand.php

@@ -23,7 +23,7 @@ use function sprintf;
 
 class GenerateKeyCommand extends Command
 {
-    public const NAME = 'api-key:generate';
+    public const string NAME = 'api-key:generate';
 
     public function __construct(
         private readonly ApiKeyServiceInterface $apiKeyService,
@@ -100,23 +100,26 @@ class GenerateKeyCommand extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
+        $io = new SymfonyStyle($input, $output);
         $expirationDate = $input->getOption('expiration-date');
-
-        $apiKey = $this->apiKeyService->create(ApiKeyMeta::fromParams(
+        $apiKeyMeta = ApiKeyMeta::fromParams(
             name: $input->getOption('name'),
             expirationDate: isset($expirationDate) ? Chronos::parse($expirationDate) : null,
             roleDefinitions: $this->roleResolver->determineRoles($input),
-        ));
+        );
 
-        $io = new SymfonyStyle($input, $output);
-        $io->success(sprintf('Generated API key: "%s"', $apiKey->toString()));
+        $apiKey = $this->apiKeyService->create($apiKeyMeta);
+        $io->success(sprintf('Generated API key: "%s"', $apiKeyMeta->key));
+
+        if ($input->isInteractive()) {
+            $io->warning('Save the key in a secure location. You will not be able to get it afterwards.');
+        }
 
         if (! ApiKey::isAdmin($apiKey)) {
             ShlinkTable::default($io)->render(
                 ['Role name', 'Role metadata'],
-                $apiKey->mapRoles(fn (Role $role, array $meta) => [$role->value, arrayToString($meta, 0)]),
-                null,
-                'Roles',
+                $apiKey->mapRoles(fn (Role $role, array $meta) => [$role->value, arrayToString($meta, indentSize: 0)]),
+                headerTitle: 'Roles',
             );
         }
 

module/CLI/src/Command/Api/InitialApiKeyCommand.php

@@ -13,7 +13,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class InitialApiKeyCommand extends Command
 {
-    public const NAME = 'api-key:initial';
+    public const string NAME = 'api-key:initial';
 
     public function __construct(private readonly ApiKeyServiceInterface $apiKeyService)
     {

module/CLI/src/Command/Api/ListKeysCommand.php

@@ -21,11 +21,11 @@ use function sprintf;
 
 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)
     {
@@ -54,7 +54,7 @@ class ListKeysCommand extends Command
             $messagePattern = $this->determineMessagePattern($apiKey);
 
             // Set columns for this row
-            $rowData = [sprintf($messagePattern, $apiKey), sprintf($messagePattern, $apiKey->name ?? '-')];
+            $rowData = [sprintf($messagePattern, $apiKey->name ?? '-')];
             if (! $enabledOnly) {
                 $rowData[] = sprintf($messagePattern, $this->getEnabledSymbol($apiKey));
             }
@@ -67,7 +67,6 @@ class ListKeysCommand extends Command
         }, $this->apiKeyService->listKeys($enabledOnly));
 
         ShlinkTable::withRowSeparators($output)->render(array_filter([
-            'Key',
             'Name',
             ! $enabledOnly ? 'Is enabled' : null,
             'Expiration date',

module/CLI/src/Command/Api/RenameApiKeyCommand.php

@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Api;
+
+use Shlinkio\Shlink\CLI\Util\ExitCode;
+use Shlinkio\Shlink\Core\Exception\InvalidArgumentException;
+use Shlinkio\Shlink\Core\Model\Renaming;
+use Shlinkio\Shlink\Rest\Entity\ApiKey;
+use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+use function Shlinkio\Shlink\Core\ArrayUtils\map;
+
+class RenameApiKeyCommand extends Command
+{
+    public const string NAME = 'api-key:rename';
+
+    public function __construct(private readonly ApiKeyServiceInterface $apiKeyService)
+    {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Renames an API key by name')
+            ->addArgument('oldName', InputArgument::REQUIRED, 'Current name of the API key to rename')
+            ->addArgument('newName', InputArgument::REQUIRED, 'New name to set to the API key');
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output): void
+    {
+        $io = new SymfonyStyle($input, $output);
+        $oldName = $input->getArgument('oldName');
+        $newName = $input->getArgument('newName');
+
+        if ($oldName === null) {
+            $apiKeys = $this->apiKeyService->listKeys();
+            $requestedOldName = $io->choice(
+                'What API key do you want to rename?',
+                map($apiKeys, static fn (ApiKey $apiKey) => $apiKey->name),
+            );
+
+            $input->setArgument('oldName', $requestedOldName);
+        }
+
+        if ($newName === null) {
+            $requestedNewName = $io->ask(
+                'What is the new name you want to set?',
+                validator: static fn (string|null $value): string => $value !== null
+                    ? $value
+                    : throw new InvalidArgumentException('The new name cannot be empty'),
+            );
+
+            $input->setArgument('newName', $requestedNewName);
+        }
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+        $oldName = $input->getArgument('oldName');
+        $newName = $input->getArgument('newName');
+
+        $this->apiKeyService->renameApiKey(Renaming::fromNames($oldName, $newName));
+        $io->success('API key properly renamed');
+
+        return ExitCode::EXIT_SUCCESS;
+    }
+}

module/CLI/src/Command/Config/ReadEnvVarCommand.php

@@ -21,12 +21,12 @@ use function sprintf;
 
 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;
 
-    public function __construct(?Closure $loadEnvVar = null)
+    public function __construct(Closure|null $loadEnvVar = null)
     {
         $this->loadEnvVar = $loadEnvVar ?? static fn (string $envVar) => EnvVars::from($envVar)->loadFromEnv();
         parent::__construct();

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,

module/CLI/src/Command/Db/MigrateDatabaseCommand.php

@@ -11,9 +11,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 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
     {

module/CLI/src/Command/Domain/DomainRedirectsCommand.php

@@ -21,7 +21,7 @@ use function str_contains;
 
 class DomainRedirectsCommand extends Command
 {
-    public const NAME = 'domain:redirects';
+    public const string NAME = 'domain:redirects';
 
     public function __construct(private readonly DomainServiceInterface $domainService)
     {
@@ -74,7 +74,7 @@ class DomainRedirectsCommand extends Command
         $domainAuthority = $input->getArgument('domain');
         $domain = $this->domainService->findByAuthority($domainAuthority);
 
-        $ask = static function (string $message, ?string $current) use ($io): ?string {
+        $ask = static function (string $message, string|null $current) use ($io): string|null {
             if ($current === null) {
                 return $io->ask(sprintf('%s (Leave empty for no redirect)', $message));
             }

module/CLI/src/Command/Domain/GetDomainVisitsCommand.php

@@ -16,7 +16,7 @@ use Symfony\Component\Console\Input\InputInterface;
 
 class GetDomainVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'domain:visits';
+    public const string NAME = 'domain:visits';
 
     public function __construct(
         VisitsStatsHelperInterface $visitsHelper,

module/CLI/src/Command/Domain/ListDomainsCommand.php

@@ -18,7 +18,7 @@ use function array_map;
 
 class ListDomainsCommand extends Command
 {
-    public const NAME = 'domain:list';
+    public const string NAME = 'domain:list';
 
     public function __construct(private readonly DomainServiceInterface $domainService)
     {

module/CLI/src/Command/Integration/MatomoSendVisitsCommand.php

@@ -22,7 +22,7 @@ use function sprintf;
 
 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;

module/CLI/src/Command/RedirectRule/ManageRedirectRulesCommand.php

@@ -19,7 +19,7 @@ use function sprintf;
 
 class ManageRedirectRulesCommand extends Command
 {
-    public const NAME = 'short-url:manage-rules';
+    public const string NAME = 'short-url:manage-rules';
 
     private readonly ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

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

@@ -20,9 +20,9 @@ use function sprintf;
 
 class CreateShortUrlCommand extends Command
 {
-    public const NAME = 'short-url:create';
+    public const string NAME = 'short-url:create';
 
-    private ?SymfonyStyle $io;
+    private SymfonyStyle $io;
     private readonly ShortUrlDataInput $shortUrlDataInput;
 
     public function __construct(

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

@@ -17,7 +17,7 @@ use function sprintf;
 
 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)
     {

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

@@ -19,7 +19,7 @@ use function sprintf;
 
 class DeleteShortUrlCommand extends Command
 {
-    public const NAME = 'short-url:delete';
+    public const string NAME = 'short-url:delete';
 
     private readonly ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

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

@@ -16,7 +16,7 @@ use function sprintf;
 
 class DeleteShortUrlVisitsCommand extends AbstractDeleteVisitsCommand
 {
-    public const NAME = 'short-url:visits-delete';
+    public const string NAME = 'short-url:visits-delete';
 
     private readonly ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

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

@@ -19,7 +19,7 @@ use function sprintf;
 
 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;

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

@@ -16,7 +16,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 class GetShortUrlVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'short-url:visits';
+    public const string NAME = 'short-url:visits';
 
     private ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

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

@@ -10,9 +10,10 @@ use Shlinkio\Shlink\CLI\Util\ExitCode;
 use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Common\Paginator\Paginator;
 use Shlinkio\Shlink\Common\Paginator\Util\PagerfantaUtils;
+use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlsParams;
-use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlWithVisitsSummary;
+use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlWithDeps;
 use Shlinkio\Shlink\Core\ShortUrl\Model\TagsMode;
 use Shlinkio\Shlink\Core\ShortUrl\Model\Validation\ShortUrlsParamsInputFilter;
 use Shlinkio\Shlink\Core\ShortUrl\ShortUrlListServiceInterface;
@@ -32,7 +33,7 @@ use function sprintf;
 
 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;
@@ -64,6 +65,12 @@ class ListShortUrlsCommand extends Command
                 InputOption::VALUE_REQUIRED,
                 'A query used to filter results by searching for it on the longUrl and shortCode fields.',
             )
+            ->addOption(
+                'domain',
+                'd',
+                InputOption::VALUE_REQUIRED,
+                'Used to filter results by domain. Use DEFAULT keyword to filter by default domain',
+            )
             ->addOption(
                 'tags',
                 't',
@@ -111,14 +118,9 @@ class ListShortUrlsCommand extends Command
                 'show-api-key',
                 'k',
                 InputOption::VALUE_NONE,
-                'Whether to display the API key from which the URL was generated or not.',
-            )
-            ->addOption(
-                'show-api-key-name',
-                'm',
-                InputOption::VALUE_NONE,
                 'Whether to display the API key name from which the URL was generated or not.',
             )
+            ->addOption('show-api-key-name', 'm', InputOption::VALUE_NONE, '[DEPRECATED] Use show-api-key')
             ->addOption(
                 'all',
                 'a',
@@ -134,6 +136,7 @@ class ListShortUrlsCommand extends Command
 
         $page = (int) $input->getOption('page');
         $searchTerm = $input->getOption('search-term');
+        $domain = $input->getOption('domain');
         $tags = $input->getOption('tags');
         $tagsMode = $input->getOption('including-all-tags') === true ? TagsMode::ALL->value : TagsMode::ANY->value;
         $tags = ! empty($tags) ? explode(',', $tags) : [];
@@ -145,6 +148,7 @@ class ListShortUrlsCommand extends Command
 
         $data = [
             ShortUrlsParamsInputFilter::SEARCH_TERM => $searchTerm,
+            ShortUrlsParamsInputFilter::DOMAIN => $domain,
             ShortUrlsParamsInputFilter::TAGS => $tags,
             ShortUrlsParamsInputFilter::TAGS_MODE => $tagsMode,
             ShortUrlsParamsInputFilter::ORDER_BY => $orderBy,
@@ -177,7 +181,7 @@ class ListShortUrlsCommand extends Command
 
     /**
      * @param array<string, callable(array $serializedShortUrl, ShortUrl $shortUrl): ?string> $columnsMap
-     * @return Paginator<ShortUrlWithVisitsSummary>
+     * @return Paginator<ShortUrlWithDeps>
      */
     private function renderPage(
         OutputInterface $output,
@@ -187,7 +191,7 @@ class ListShortUrlsCommand extends Command
     ): Paginator {
         $shortUrls = $this->shortUrlService->listShortUrls($params);
 
-        $rows = map([...$shortUrls], function (ShortUrlWithVisitsSummary $shortUrl) use ($columnsMap) {
+        $rows = map([...$shortUrls], function (ShortUrlWithDeps $shortUrl) use ($columnsMap) {
             $serializedShortUrl = $this->transformer->transform($shortUrl);
             return map($columnsMap, fn (callable $call) => $call($serializedShortUrl, $shortUrl->shortUrl));
         });
@@ -201,7 +205,7 @@ class ListShortUrlsCommand extends Command
         return $shortUrls;
     }
 
-    private function processOrderBy(InputInterface $input): ?string
+    private function processOrderBy(InputInterface $input): string|null
     {
         $orderBy = $input->getOption('order-by');
         if (empty($orderBy)) {
@@ -231,14 +235,10 @@ class ListShortUrlsCommand extends Command
         }
         if ($input->getOption('show-domain')) {
             $columnsMap['Domain'] = static fn (array $_, ShortUrl $shortUrl): string =>
-                $shortUrl->getDomain()?->authority ?? 'DEFAULT';
+                $shortUrl->getDomain()->authority ?? Domain::DEFAULT_AUTHORITY;
         }
-        if ($input->getOption('show-api-key')) {
-            $columnsMap['API Key'] = static fn (array $_, ShortUrl $shortUrl): string =>
-                $shortUrl->authorApiKey?->__toString() ?? '';
-        }
-        if ($input->getOption('show-api-key-name')) {
-            $columnsMap['API Key Name'] = static fn (array $_, ShortUrl $shortUrl): ?string =>
+        if ($input->getOption('show-api-key') || $input->getOption('show-api-key-name')) {
+            $columnsMap['API Key Name'] = static fn (array $_, ShortUrl $shortUrl): string|null =>
                 $shortUrl->authorApiKey?->name;
         }
 

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

@@ -17,7 +17,7 @@ use function sprintf;
 
 class ResolveUrlCommand extends Command
 {
-    public const NAME = 'short-url:parse';
+    public const string NAME = 'short-url:parse';
 
     private readonly ShortUrlIdentifierInput $shortUrlIdentifierInput;
 

module/CLI/src/Command/Tag/DeleteTagsCommand.php

@@ -14,9 +14,9 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 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();
     }

module/CLI/src/Command/Tag/GetTagVisitsCommand.php

@@ -16,7 +16,7 @@ use Symfony\Component\Console\Input\InputInterface;
 
 class GetTagVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'tag:visits';
+    public const string NAME = 'tag:visits';
 
     public function __construct(
         VisitsStatsHelperInterface $visitsHelper,

module/CLI/src/Command/Tag/ListTagsCommand.php

@@ -17,7 +17,7 @@ use function array_map;
 
 class ListTagsCommand extends Command
 {
-    public const NAME = 'tag:list';
+    public const string NAME = 'tag:list';
 
     public function __construct(private readonly TagServiceInterface $tagService)
     {

module/CLI/src/Command/Tag/RenameTagCommand.php

@@ -7,7 +7,7 @@ namespace Shlinkio\Shlink\CLI\Command\Tag;
 use Shlinkio\Shlink\CLI\Util\ExitCode;
 use Shlinkio\Shlink\Core\Exception\TagConflictException;
 use Shlinkio\Shlink\Core\Exception\TagNotFoundException;
-use Shlinkio\Shlink\Core\Tag\Model\TagRenaming;
+use Shlinkio\Shlink\Core\Model\Renaming;
 use Shlinkio\Shlink\Core\Tag\TagServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -17,7 +17,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 class RenameTagCommand extends Command
 {
-    public const NAME = 'tag:rename';
+    public const string NAME = 'tag:rename';
 
     public function __construct(private readonly TagServiceInterface $tagService)
     {
@@ -40,7 +40,7 @@ class RenameTagCommand extends Command
         $newName = $input->getArgument('newName');
 
         try {
-            $this->tagService->renameTag(TagRenaming::fromNames($oldName, $newName));
+            $this->tagService->renameTag(Renaming::fromNames($oldName, $newName));
             $io->success('Tag properly renamed.');
             return ExitCode::EXIT_SUCCESS;
         } catch (TagNotFoundException | TagConflictException $e) {

module/CLI/src/Command/Util/LockedCommandConfig.php

@@ -6,7 +6,7 @@ namespace Shlinkio\Shlink\CLI\Command\Util;
 
 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,

module/CLI/src/Command/Visit/AbstractVisitsListCommand.php

@@ -61,8 +61,8 @@ abstract class AbstractVisitsListCommand extends Command
                 'date' => $visit->date->toAtomString(),
                 'userAgent' => $visit->userAgent,
                 'potentialBot' => $visit->potentialBot,
-                'country' => $visit->getVisitLocation()?->countryName ?? 'Unknown',
-                'city' => $visit->getVisitLocation()?->cityName ?? 'Unknown',
+                'country' => $visit->getVisitLocation()->countryName ?? 'Unknown',
+                'city' => $visit->getVisitLocation()->cityName ?? 'Unknown',
                 ...$extraFields,
             ];
 

module/CLI/src/Command/Visit/DeleteOrphanVisitsCommand.php

@@ -13,7 +13,7 @@ use function sprintf;
 
 class DeleteOrphanVisitsCommand extends AbstractDeleteVisitsCommand
 {
-    public const NAME = 'visit:orphan-delete';
+    public const string NAME = 'visit:orphan-delete';
 
     public function __construct(private readonly VisitsDeleterInterface $deleter)
     {

module/CLI/src/Command/Visit/DownloadGeoLiteDbCommand.php

@@ -4,10 +4,11 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Visit;
 
-use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
-use Shlinkio\Shlink\CLI\GeoLite\GeolocationDbUpdaterInterface;
-use Shlinkio\Shlink\CLI\GeoLite\GeolocationResult;
 use Shlinkio\Shlink\CLI\Util\ExitCode;
+use Shlinkio\Shlink\Core\Exception\GeolocationDbUpdateFailedException;
+use Shlinkio\Shlink\Core\Geolocation\GeolocationDbUpdaterInterface;
+use Shlinkio\Shlink\Core\Geolocation\GeolocationDownloadProgressHandlerInterface;
+use Shlinkio\Shlink\Core\Geolocation\GeolocationResult;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
@@ -16,13 +17,14 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 use function sprintf;
 
-class DownloadGeoLiteDbCommand extends Command
+class DownloadGeoLiteDbCommand extends Command implements GeolocationDownloadProgressHandlerInterface
 {
-    public const NAME = 'visit:download-db';
+    public const string NAME = 'visit:download-db';
 
-    private ?ProgressBar $progressBar = null;
+    private ProgressBar|null $progressBar = null;
+    private SymfonyStyle $io;
 
-    public function __construct(private GeolocationDbUpdaterInterface $dbUpdater)
+    public function __construct(private readonly GeolocationDbUpdaterInterface $dbUpdater)
     {
         parent::__construct();
     }
@@ -39,38 +41,42 @@ class DownloadGeoLiteDbCommand extends Command
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $io = new SymfonyStyle($input, $output);
+        $this->io = new SymfonyStyle($input, $output);
 
         try {
-            $result = $this->dbUpdater->checkDbUpdate(function (bool $olderDbExists) use ($io): void {
-                $io->text(sprintf('<fg=blue>%s GeoLite2 db file...</>', $olderDbExists ? 'Updating' : 'Downloading'));
-                $this->progressBar = new ProgressBar($io);
-            }, function (int $total, int $downloaded): void {
-                $this->progressBar?->setMaxSteps($total);
-                $this->progressBar?->setProgress($downloaded);
-            });
+            $result = $this->dbUpdater->checkDbUpdate($this);
 
             if ($result === GeolocationResult::LICENSE_MISSING) {
-                $io->warning('It was not possible to download GeoLite2 db, because a license was not provided.');
+                $this->io->warning('It was not possible to download GeoLite2 db, because a license was not provided.');
+                return ExitCode::EXIT_WARNING;
+            }
+
+            if ($result === GeolocationResult::MAX_ERRORS_REACHED) {
+                $this->io->warning('Max consecutive errors reached. Cannot retry for a couple of days.');
+                return ExitCode::EXIT_WARNING;
+            }
+
+            if ($result === GeolocationResult::UPDATE_IN_PROGRESS) {
+                $this->io->warning('A geolocation db is already being downloaded by another process.');
                 return ExitCode::EXIT_WARNING;
             }
 
             if ($this->progressBar === null) {
-                $io->info('GeoLite2 db file is up to date.');
+                $this->io->info('GeoLite2 db file is up to date.');
             } else {
                 $this->progressBar->finish();
-                $io->success('GeoLite2 db file properly downloaded.');
+                $this->io->success('GeoLite2 db file properly downloaded.');
             }
 
             return ExitCode::EXIT_SUCCESS;
         } catch (GeolocationDbUpdateFailedException $e) {
-            return $this->processGeoLiteUpdateError($e, $io);
+            return $this->processGeoLiteUpdateError($e, $this->io);
         }
     }
 
     private function processGeoLiteUpdateError(GeolocationDbUpdateFailedException $e, SymfonyStyle $io): int
     {
-        $olderDbExists = $e->olderDbExists();
+        $olderDbExists = $e->olderDbExists;
 
         if ($olderDbExists) {
             $io->warning(
@@ -86,4 +92,16 @@ class DownloadGeoLiteDbCommand extends Command
 
         return $olderDbExists ? ExitCode::EXIT_WARNING : ExitCode::EXIT_FAILURE;
     }
+
+    public function beforeDownload(bool $olderDbExists): void
+    {
+        $this->io->text(sprintf('<fg=blue>%s GeoLite2 db file...</>', $olderDbExists ? 'Updating' : 'Downloading'));
+        $this->progressBar = new ProgressBar($this->io);
+    }
+
+    public function handleProgress(int $total, int $downloaded, bool $olderDbExists): void
+    {
+        $this->progressBar?->setMaxSteps($total);
+        $this->progressBar?->setProgress($downloaded);
+    }
 }

module/CLI/src/Command/Visit/GetNonOrphanVisitsCommand.php

@@ -14,7 +14,7 @@ use Symfony\Component\Console\Input\InputInterface;
 
 class GetNonOrphanVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'visit:non-orphan';
+    public const string NAME = 'visit:non-orphan';
 
     public function __construct(
         VisitsStatsHelperInterface $visitsHelper,

module/CLI/src/Command/Visit/GetOrphanVisitsCommand.php

@@ -17,7 +17,7 @@ use function sprintf;
 
 class GetOrphanVisitsCommand extends AbstractVisitsListCommand
 {
-    public const NAME = 'visit:orphan';
+    public const string NAME = 'visit:orphan';
 
     protected function configure(): void
     {

module/CLI/src/Command/Visit/LocateVisitsCommand.php

@@ -29,7 +29,7 @@ use function sprintf;
 
 class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocationHelperInterface
 {
-    public const NAME = 'visit:locate';
+    public const string NAME = 'visit:locate';
 
     private SymfonyStyle $io;
 

module/CLI/src/Exception/GeolocationDbUpdateFailedException.php

@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Exception;
-
-use RuntimeException;
-use Throwable;
-
-use function sprintf;
-
-class GeolocationDbUpdateFailedException extends RuntimeException implements ExceptionInterface
-{
-    private bool $olderDbExists;
-
-    private function __construct(string $message, ?Throwable $previous = null)
-    {
-        parent::__construct($message, previous: $previous);
-    }
-
-    public static function withOlderDb(?Throwable $prev = null): self
-    {
-        $e = new self(
-            'An error occurred while updating geolocation database, but an older DB is already present.',
-            $prev,
-        );
-        $e->olderDbExists = true;
-
-        return $e;
-    }
-
-    public static function withoutOlderDb(?Throwable $prev = null): self
-    {
-        $e = new self(
-            'An error occurred while updating geolocation database, and an older version could not be found.',
-            $prev,
-        );
-        $e->olderDbExists = false;
-
-        return $e;
-    }
-
-    public static function withInvalidEpochInOldDb(mixed $buildEpoch): self
-    {
-        $e = new self(sprintf(
-            'Build epoch with value "%s" from existing geolocation database, could not be parsed to integer.',
-            $buildEpoch,
-        ));
-        $e->olderDbExists = true;
-
-        return $e;
-    }
-
-    public function olderDbExists(): bool
-    {
-        return $this->olderDbExists;
-    }
-}

module/CLI/src/GeoLite/GeolocationDbUpdater.php

@@ -1,135 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\GeoLite;
-
-use Cake\Chronos\Chronos;
-use Closure;
-use GeoIp2\Database\Reader;
-use MaxMind\Db\Reader\Metadata;
-use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
-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;
-use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdaterInterface;
-use Symfony\Component\Lock\LockFactory;
-
-use function is_int;
-
-class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
-{
-    private const LOCK_NAME = 'geolocation-db-update';
-
-    /** @var Closure(): Reader */
-    private readonly Closure $geoLiteDbReaderFactory;
-
-    /**
-     * @param callable(): Reader $geoLiteDbReaderFactory
-     */
-    public function __construct(
-        private readonly DbUpdaterInterface $dbUpdater,
-        callable $geoLiteDbReaderFactory,
-        private readonly LockFactory $locker,
-        private readonly TrackingOptions $trackingOptions,
-    ) {
-        $this->geoLiteDbReaderFactory = $geoLiteDbReaderFactory(...);
-    }
-
-    /**
-     * @throws GeolocationDbUpdateFailedException
-     */
-    public function checkDbUpdate(?callable $beforeDownload = null, ?callable $handleProgress = null): GeolocationResult
-    {
-        if ($this->trackingOptions->disableTracking || $this->trackingOptions->disableIpTracking) {
-            return GeolocationResult::CHECK_SKIPPED;
-        }
-
-        $lock = $this->locker->createLock(self::LOCK_NAME);
-        $lock->acquire(true); // Block until lock is released
-
-        try {
-            return $this->downloadIfNeeded($beforeDownload, $handleProgress);
-        } finally {
-            $lock->release();
-        }
-    }
-
-    /**
-     * @throws GeolocationDbUpdateFailedException
-     */
-    private function downloadIfNeeded(?callable $beforeDownload, ?callable $handleProgress): GeolocationResult
-    {
-        if (! $this->dbUpdater->databaseFileExists()) {
-            return $this->downloadNewDb(false, $beforeDownload, $handleProgress);
-        }
-
-        $meta = ($this->geoLiteDbReaderFactory)()->metadata();
-        if ($this->buildIsTooOld($meta)) {
-            return $this->downloadNewDb(true, $beforeDownload, $handleProgress);
-        }
-
-        return GeolocationResult::DB_IS_UP_TO_DATE;
-    }
-
-    private function buildIsTooOld(Metadata $meta): bool
-    {
-        $buildTimestamp = $this->resolveBuildTimestamp($meta);
-        $buildDate = Chronos::createFromTimestamp($buildTimestamp);
-
-        return Chronos::now()->greaterThan($buildDate->addDays(35));
-    }
-
-    private function resolveBuildTimestamp(Metadata $meta): int
-    {
-        // In theory the buildEpoch should be an int, but it has been reported to come as a string.
-        // See https://github.com/shlinkio/shlink/issues/1002 for context
-
-        /** @var int|string $buildEpoch */
-        $buildEpoch = $meta->buildEpoch;
-        if (is_int($buildEpoch)) {
-            return $buildEpoch;
-        }
-
-        $intBuildEpoch = (int) $buildEpoch;
-        if ($buildEpoch === (string) $intBuildEpoch) {
-            return $intBuildEpoch;
-        }
-
-        throw GeolocationDbUpdateFailedException::withInvalidEpochInOldDb($buildEpoch);
-    }
-
-    /**
-     * @throws GeolocationDbUpdateFailedException
-     */
-    private function downloadNewDb(
-        bool $olderDbExists,
-        ?callable $beforeDownload,
-        ?callable $handleProgress,
-    ): GeolocationResult {
-        if ($beforeDownload !== null) {
-            $beforeDownload($olderDbExists);
-        }
-
-        try {
-            $this->dbUpdater->downloadFreshCopy($this->wrapHandleProgressCallback($handleProgress, $olderDbExists));
-            return $olderDbExists ? GeolocationResult::DB_UPDATED : GeolocationResult::DB_CREATED;
-        } catch (MissingLicenseException) {
-            return GeolocationResult::LICENSE_MISSING;
-        } catch (DbUpdateException | WrongIpException $e) {
-            throw $olderDbExists
-                ? GeolocationDbUpdateFailedException::withOlderDb($e)
-                : GeolocationDbUpdateFailedException::withoutOlderDb($e);
-        }
-    }
-
-    private function wrapHandleProgressCallback(?callable $handleProgress, bool $olderDbExists): ?callable
-    {
-        if ($handleProgress === null) {
-            return null;
-        }
-
-        return static fn (int $total, int $downloaded) => $handleProgress($total, $downloaded, $olderDbExists);
-    }
-}

module/CLI/src/GeoLite/GeolocationResult.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Shlinkio\Shlink\CLI\GeoLite;
-
-enum GeolocationResult
-{
-    case CHECK_SKIPPED;
-    case LICENSE_MISSING;
-    case DB_CREATED;
-    case DB_UPDATED;
-    case DB_IS_UP_TO_DATE;
-}

module/CLI/src/Input/DateOption.php

@@ -21,7 +21,7 @@ readonly class DateOption
         $command->addOption($name, $shortcut, InputOption::VALUE_REQUIRED, $description);
     }
 
-    public function get(InputInterface $input, OutputInterface $output): ?Chronos
+    public function get(InputInterface $input, OutputInterface $output): Chronos|null
     {
         $value = $input->getOption($this->name);
         if (empty($value) || ! is_string($value)) {

module/CLI/src/Input/EndDateOption.php

@@ -11,7 +11,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 use function sprintf;
 
-readonly final class EndDateOption
+final readonly class EndDateOption
 {
     private DateOption $dateOption;
 
@@ -23,7 +23,7 @@ readonly final class EndDateOption
         ));
     }
 
-    public function get(InputInterface $input, OutputInterface $output): ?Chronos
+    public function get(InputInterface $input, OutputInterface $output): Chronos|null
     {
         return $this->dateOption->get($input, $output);
     }

module/CLI/src/Input/ShortUrlDataInput.php

@@ -18,7 +18,7 @@ use function array_unique;
 use function Shlinkio\Shlink\Core\ArrayUtils\flatten;
 use function Shlinkio\Shlink\Core\splitByComma;
 
-readonly final class ShortUrlDataInput
+final readonly class ShortUrlDataInput
 {
     public function __construct(Command $command, private bool $longUrlAsOption = false)
     {

module/CLI/src/Input/ShortUrlDataOption.php

@@ -18,7 +18,7 @@ enum ShortUrlDataOption: string
     case CRAWLABLE = 'crawlable';
     case NO_FORWARD_QUERY = 'no-forward-query';
 
-    public function shortcut(): ?string
+    public function shortcut(): string|null
     {
         return match ($this) {
             self::TAGS => 't',

module/CLI/src/Input/ShortUrlIdentifierInput.php

@@ -10,7 +10,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 
-readonly final class ShortUrlIdentifierInput
+final readonly class ShortUrlIdentifierInput
 {
     public function __construct(Command $command, string $shortCodeDesc, string $domainDesc)
     {
@@ -19,7 +19,7 @@ readonly final class ShortUrlIdentifierInput
             ->addOption('domain', 'd', InputOption::VALUE_REQUIRED, $domainDesc);
     }
 
-    public function shortCode(InputInterface $input): ?string
+    public function shortCode(InputInterface $input): string|null
     {
         return $input->getArgument('shortCode');
     }

module/CLI/src/Input/StartDateOption.php

@@ -11,7 +11,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 use function sprintf;
 
-readonly final class StartDateOption
+final readonly class StartDateOption
 {
     private DateOption $dateOption;
 
@@ -23,7 +23,7 @@ readonly final class StartDateOption
         ));
     }
 
-    public function get(InputInterface $input, OutputInterface $output): ?Chronos
+    public function get(InputInterface $input, OutputInterface $output): Chronos|null
     {
         return $this->dateOption->get($input, $output);
     }

module/CLI/src/RedirectRule/RedirectRuleHandler.php

@@ -33,7 +33,7 @@ use const STR_PAD_LEFT;
 
 class RedirectRuleHandler implements RedirectRuleHandlerInterface
 {
-    public function manageRules(StyleInterface $io, ShortUrl $shortUrl, array $rules): ?array
+    public function manageRules(StyleInterface $io, ShortUrl $shortUrl, array $rules): array|null
     {
         $amountOfRules = count($rules);
 
@@ -111,6 +111,12 @@ class RedirectRuleHandler implements RedirectRuleHandlerInterface
                 RedirectConditionType::IP_ADDRESS => RedirectCondition::forIpAddress(
                     $this->askMandatory('IP address, CIDR block or wildcard-pattern (1.2.*.*)', $io),
                 ),
+                RedirectConditionType::GEOLOCATION_COUNTRY_CODE => RedirectCondition::forGeolocationCountryCode(
+                    $this->askMandatory('Country code to match?', $io),
+                ),
+                RedirectConditionType::GEOLOCATION_CITY_NAME => RedirectCondition::forGeolocationCityName(
+                    $this->askMandatory('City name to match?', $io),
+                )
             };
 
             $continue = $io->confirm('Do you want to add another condition?');
@@ -213,7 +219,7 @@ class RedirectRuleHandler implements RedirectRuleHandlerInterface
 
     private function askMandatory(string $message, StyleInterface $io): string
     {
-        return $io->ask($message, validator: function (?string $answer): string {
+        return $io->ask($message, validator: function (string|null $answer): string {
             if ($answer === null) {
                 throw new InvalidArgumentException('The value is mandatory');
             }
@@ -223,6 +229,6 @@ class RedirectRuleHandler implements RedirectRuleHandlerInterface
 
     private function askOptional(string $message, StyleInterface $io): string
     {
-        return $io->ask($message, validator: fn (?string $answer) => $answer === null ? '' : trim($answer));
+        return $io->ask($message, validator: fn (string|null $answer) => $answer === null ? '' : trim($answer));
     }
 }

module/CLI/src/RedirectRule/RedirectRuleHandlerInterface.php

@@ -16,5 +16,5 @@ interface RedirectRuleHandlerInterface
      * @param ShortUrlRedirectRule[] $rules
      * @return ShortUrlRedirectRule[]|null - A new list of rules to save, or null if no changes should be saved
      */
-    public function manageRules(StyleInterface $io, ShortUrl $shortUrl, array $rules): ?array;
+    public function manageRules(StyleInterface $io, ShortUrl $shortUrl, array $rules): array|null;
 }

module/CLI/src/Util/ExitCode.php

@@ -6,7 +6,7 @@ namespace Shlinkio\Shlink\CLI\Util;
 
 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;
 }

module/CLI/src/Util/ProcessRunner.php

@@ -20,7 +20,7 @@ class ProcessRunner implements ProcessRunnerInterface
 {
     private Closure $createProcess;
 
-    public function __construct(private ProcessHelper $helper, ?callable $createProcess = null)
+    public function __construct(private ProcessHelper $helper, callable|null $createProcess = null)
     {
         $this->createProcess = $createProcess !== null
             ? $createProcess(...)

module/CLI/src/Util/ShlinkTable.php

@@ -12,8 +12,8 @@ use function array_pop;
 
 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)
     {
@@ -34,8 +34,12 @@ final class ShlinkTable
         return new self($baseTable);
     }
 
-    public function render(array $headers, array $rows, ?string $footerTitle = null, ?string $headerTitle = null): void
-    {
+    public function render(
+        array $headers,
+        array $rows,
+        string|null $footerTitle = null,
+        string|null $headerTitle = null,
+    ): void {
         $style = Table::getStyleDefinition(self::DEFAULT_STYLE_NAME);
         $style->setFooterTitleFormat(self::TABLE_TITLE_STYLE)
               ->setHeaderTitleFormat(self::TABLE_TITLE_STYLE);

module/CLI/test-cli/Command/CreateShortUrlTest.php

@@ -8,6 +8,7 @@ use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\CreateShortUrlCommand;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\ListShortUrlsCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCode;
+use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\TestUtils\CliTest\CliTestCase;
 
 class CreateShortUrlTest extends CliTestCase
@@ -26,6 +27,6 @@ class CreateShortUrlTest extends CliTestCase
         self::assertStringContainsString('Generated short URL: http://' . $defaultDomain . '/' . $slug, $output);
 
         [$listOutput] = $this->exec([ListShortUrlsCommand::NAME, '--show-domain', '--search-term', $slug]);
-        self::assertStringContainsString('DEFAULT', $listOutput);
+        self::assertStringContainsString(Domain::DEFAULT_AUTHORITY, $listOutput);
     }
 }

module/CLI/test-cli/Command/ImportShortUrlsTest.php

@@ -6,6 +6,7 @@ namespace ShlinkioCliTest\Shlink\CLI\Command;
 
 use PHPUnit\Framework\Attributes\Test;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\ListShortUrlsCommand;
+use Shlinkio\Shlink\Core\Domain\Entity\Domain;
 use Shlinkio\Shlink\Importer\Command\ImportCommand;
 use Shlinkio\Shlink\TestUtils\CliTest\CliTestCase;
 
@@ -66,10 +67,10 @@ class ImportShortUrlsTest extends CliTestCase
         [$listOutput1] = $this->exec(
             [ListShortUrlsCommand::NAME, '--show-domain', '--search-term', 'testing-default-domain-import-1'],
         );
-        self::assertStringContainsString('DEFAULT', $listOutput1);
+        self::assertStringContainsString(Domain::DEFAULT_AUTHORITY, $listOutput1);
         [$listOutput1] = $this->exec(
             [ListShortUrlsCommand::NAME, '--show-domain', '--search-term', 'testing-default-domain-import-2'],
         );
-        self::assertStringContainsString('DEFAULT', $listOutput1);
+        self::assertStringContainsString(Domain::DEFAULT_AUTHORITY, $listOutput1);
     }
 }

module/CLI/test-cli/Command/ListApiKeysTest.php

@@ -26,38 +26,38 @@ class ListApiKeysTest extends CliTestCase
     {
         $expiredApiKeyDate = Chronos::now()->subDays(1)->startOfDay()->toAtomString();
         $enabledOnlyOutput = <<<OUT
-        +--------------------+------+---------------------------+--------------------------+
-        | Key                | Name | Expiration date           | Roles                    |
-        +--------------------+------+---------------------------+--------------------------+
-        | valid_api_key      | -    | -                         | Admin                    |
-        +--------------------+------+---------------------------+--------------------------+
-        | expired_api_key    | -    | {$expiredApiKeyDate} | Admin                    |
-        +--------------------+------+---------------------------+--------------------------+
-        | author_api_key     | -    | -                         | Author only              |
-        +--------------------+------+---------------------------+--------------------------+
-        | domain_api_key     | -    | -                         | Domain only: example.com |
-        +--------------------+------+---------------------------+--------------------------+
-        | no_orphans_api_key | -    | -                         | No orphan visits         |
-        +--------------------+------+---------------------------+--------------------------+
+        +--------------------+---------------------------+--------------------------+
+        | Name               | Expiration date           | Roles                    |
+        +--------------------+---------------------------+--------------------------+
+        | valid_api_key      | -                         | Admin                    |
+        +--------------------+---------------------------+--------------------------+
+        | expired_api_key    | {$expiredApiKeyDate} | Admin                    |
+        +--------------------+---------------------------+--------------------------+
+        | author_api_key     | -                         | Author only              |
+        +--------------------+---------------------------+--------------------------+
+        | domain_api_key     | -                         | Domain only: example.com |
+        +--------------------+---------------------------+--------------------------+
+        | no_orphans_api_key | -                         | No orphan visits         |
+        +--------------------+---------------------------+--------------------------+
 
         OUT;
 
         yield 'no flags' => [[], <<<OUT
-            +--------------------+------+------------+---------------------------+--------------------------+
-            | Key                | Name | Is enabled | Expiration date           | Roles                    |
-            +--------------------+------+------------+---------------------------+--------------------------+
-            | valid_api_key      | -    | +++        | -                         | Admin                    |
-            +--------------------+------+------------+---------------------------+--------------------------+
-            | disabled_api_key   | -    | ---        | -                         | Admin                    |
-            +--------------------+------+------------+---------------------------+--------------------------+
-            | expired_api_key    | -    | ---        | {$expiredApiKeyDate} | Admin                    |
-            +--------------------+------+------------+---------------------------+--------------------------+
-            | author_api_key     | -    | +++        | -                         | Author only              |
-            +--------------------+------+------------+---------------------------+--------------------------+
-            | domain_api_key     | -    | +++        | -                         | Domain only: example.com |
-            +--------------------+------+------------+---------------------------+--------------------------+
-            | no_orphans_api_key | -    | +++        | -                         | No orphan visits         |
-            +--------------------+------+------------+---------------------------+--------------------------+
+            +--------------------+------------+---------------------------+--------------------------+
+            | Name               | Is enabled | Expiration date           | Roles                    |
+            +--------------------+------------+---------------------------+--------------------------+
+            | valid_api_key      | +++        | -                         | Admin                    |
+            +--------------------+------------+---------------------------+--------------------------+
+            | disabled_api_key   | ---        | -                         | Admin                    |
+            +--------------------+------------+---------------------------+--------------------------+
+            | expired_api_key    | ---        | {$expiredApiKeyDate} | Admin                    |
+            +--------------------+------------+---------------------------+--------------------------+
+            | author_api_key     | +++        | -                         | Author only              |
+            +--------------------+------------+---------------------------+--------------------------+
+            | domain_api_key     | +++        | -                         | Domain only: example.com |
+            +--------------------+------------+---------------------------+--------------------------+
+            | no_orphans_api_key | +++        | -                         | No orphan visits         |
+            +--------------------+------------+---------------------------+--------------------------+
 
             OUT];
         yield '-e' => [['-e'], $enabledOnlyOutput];

module/CLI/test-cli/Command/ListShortUrlsTest.php

@@ -70,6 +70,23 @@ class ListShortUrlsTest extends CliTestCase
             | custom-with-domain |       | http://some-domain.com/custom-with-domain | https://google.com                                                                                        | 2018-10-20T00:00:00+00:00 | 0            |
             +--------------------+-------+-------------------------------------------+-------------------------------- Page 1 of 1 --------------------------------------------------------------+---------------------------+--------------+
             OUTPUT];
+        yield 'non-default domain' => [['--domain=example.com'], <<<OUTPUT
+            +------------+-------+---------------------------+-----------------------------------------------------------------------------------------------------------+---------------------------+--------------+
+            | Short Code | Title | Short URL                 | Long URL                                                                                                  | Date created              | Visits count |
+            +------------+-------+---------------------------+-----------------------------------------------------------------------------------------------------------+---------------------------+--------------+
+            | ghi789     |       | http://example.com/ghi789 | https://blog.alejandrocelaya.com/2019/04/27/considerations-to-properly-use-open-source-software-projects/ | 2019-01-01T00:00:30+00:00 | 0            |
+            +------------+-------+---------------------------+-------------------------------------------- Page 1 of 1 --------------------------------------------------+---------------------------+--------------+
+            OUTPUT];
+        yield 'default domain' => [['-d DEFAULT'], <<<OUTPUT
+            +------------+---------------+----------------------+-----------------------------------------------------------------------------------------------------+---------------------------+--------------+
+            | Short Code | Title         | Short URL            | Long URL                                                                                            | Date created              | Visits count |
+            +------------+---------------+----------------------+-----------------------------------------------------------------------------------------------------+---------------------------+--------------+
+            | custom     |               | http://s.test/custom | https://shlink.io                                                                                   | 2019-01-01T00:00:20+00:00 | 0            |
+            | def456     |               | http://s.test/def456 | https://blog.alejandrocelaya.com/2017/12/09/acmailer-7-0-the-most-important-release-in-a-long-time/ | 2019-01-01T00:00:10+00:00 | 2            |
+            | abc123     | My cool title | http://s.test/abc123 | https://shlink.io                                                                                   | 2018-05-01T00:00:00+00:00 | 3            |
+            | ghi789     |               | http://s.test/ghi789 | https://shlink.io/documentation/                                                                    | 2018-05-01T00:00:00+00:00 | 2            |
+            +------------+---------------+----------------------+--------------------------------------- Page 1 of 1 -------------------------------------------------+---------------------------+--------------+
+            OUTPUT];
         // phpcs:enable
     }
 }

module/CLI/test/Command/Api/DisableKeyCommandTest.php

@@ -8,7 +8,10 @@ use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Api\DisableKeyCommand;
+use Shlinkio\Shlink\CLI\Util\ExitCode;
 use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
+use Shlinkio\Shlink\Rest\ApiKey\Model\ApiKeyMeta;
+use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use ShlinkioTest\Shlink\CLI\Util\CliTestUtils;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -28,30 +31,103 @@ class DisableKeyCommandTest extends TestCase
     public function providedApiKeyIsDisabled(): void
     {
         $apiKey = 'abcd1234';
-        $this->apiKeyService->expects($this->once())->method('disable')->with($apiKey);
+        $this->apiKeyService->expects($this->once())->method('disableByKey')->with($apiKey);
+        $this->apiKeyService->expects($this->never())->method('disableByName');
 
-        $this->commandTester->execute([
-            'apiKey' => $apiKey,
+        $exitCode = $this->commandTester->execute([
+            'keyOrName' => $apiKey,
         ]);
         $output = $this->commandTester->getDisplay();
 
         self::assertStringContainsString('API key "abcd1234" properly disabled', $output);
+        self::assertEquals(ExitCode::EXIT_SUCCESS, $exitCode);
     }
 
     #[Test]
-    public function errorIsReturnedIfServiceThrowsException(): void
+    public function providedApiKeyIsDisabledByName(): void
+    {
+        $name = 'the key to delete';
+        $this->apiKeyService->expects($this->once())->method('disableByName')->with($name);
+        $this->apiKeyService->expects($this->never())->method('disableByKey');
+
+        $exitCode = $this->commandTester->execute([
+            'keyOrName' => $name,
+            '--by-name' => true,
+        ]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertStringContainsString('API key "the key to delete" properly disabled', $output);
+        self::assertEquals(ExitCode::EXIT_SUCCESS, $exitCode);
+    }
+
+    #[Test]
+    public function errorIsReturnedIfDisableByKeyThrowsException(): void
     {
         $apiKey = 'abcd1234';
         $expectedMessage = 'API key "abcd1234" does not exist.';
-        $this->apiKeyService->expects($this->once())->method('disable')->with($apiKey)->willThrowException(
+        $this->apiKeyService->expects($this->once())->method('disableByKey')->with($apiKey)->willThrowException(
             new InvalidArgumentException($expectedMessage),
         );
+        $this->apiKeyService->expects($this->never())->method('disableByName');
 
-        $this->commandTester->execute([
-            'apiKey' => $apiKey,
+        $exitCode = $this->commandTester->execute([
+            'keyOrName' => $apiKey,
         ]);
         $output = $this->commandTester->getDisplay();
 
         self::assertStringContainsString($expectedMessage, $output);
+        self::assertEquals(ExitCode::EXIT_FAILURE, $exitCode);
+    }
+
+    #[Test]
+    public function errorIsReturnedIfDisableByNameThrowsException(): void
+    {
+        $name = 'the key to delete';
+        $expectedMessage = 'API key "the key to delete" does not exist.';
+        $this->apiKeyService->expects($this->once())->method('disableByName')->with($name)->willThrowException(
+            new InvalidArgumentException($expectedMessage),
+        );
+        $this->apiKeyService->expects($this->never())->method('disableByKey');
+
+        $exitCode = $this->commandTester->execute([
+            'keyOrName' => $name,
+            '--by-name' => true,
+        ]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertStringContainsString($expectedMessage, $output);
+        self::assertEquals(ExitCode::EXIT_FAILURE, $exitCode);
+    }
+
+    #[Test]
+    public function warningIsReturnedIfNoArgumentIsProvidedInNonInteractiveMode(): void
+    {
+        $this->apiKeyService->expects($this->never())->method('disableByName');
+        $this->apiKeyService->expects($this->never())->method('disableByKey');
+        $this->apiKeyService->expects($this->never())->method('listKeys');
+
+        $exitCode = $this->commandTester->execute([], ['interactive' => false]);
+
+        self::assertEquals(ExitCode::EXIT_WARNING, $exitCode);
+    }
+
+    #[Test]
+    public function existingApiKeyNamesAreListedIfNoArgumentIsProvidedInInteractiveMode(): void
+    {
+        $name = 'the key to delete';
+        $this->apiKeyService->expects($this->once())->method('disableByName')->with($name);
+        $this->apiKeyService->expects($this->once())->method('listKeys')->willReturn([
+            ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'foo')),
+            ApiKey::fromMeta(ApiKeyMeta::fromParams(name: $name)),
+            ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'bar')),
+        ]);
+        $this->apiKeyService->expects($this->never())->method('disableByKey');
+
+        $this->commandTester->setInputs([$name]);
+        $exitCode = $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertStringContainsString('API key "the key to delete" properly disabled', $output);
+        self::assertEquals(ExitCode::EXIT_SUCCESS, $exitCode);
     }
 }

module/CLI/test/Command/Api/GenerateKeyCommandTest.php

@@ -10,6 +10,7 @@ use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\ApiKey\RoleResolverInterface;
 use Shlinkio\Shlink\CLI\Command\Api\GenerateKeyCommand;
+use Shlinkio\Shlink\CLI\Util\ExitCode;
 use Shlinkio\Shlink\Rest\ApiKey\Model\ApiKeyMeta;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
@@ -36,7 +37,7 @@ class GenerateKeyCommandTest extends TestCase
     public function noExpirationDateIsDefinedIfNotProvided(): void
     {
         $this->apiKeyService->expects($this->once())->method('create')->with(
-            $this->callback(fn (ApiKeyMeta $meta) => $meta->name === null && $meta->expirationDate === null),
+            $this->callback(fn (ApiKeyMeta $meta) => $meta->expirationDate === null),
         )->willReturn(ApiKey::create());
 
         $this->commandTester->execute([]);
@@ -64,8 +65,10 @@ class GenerateKeyCommandTest extends TestCase
             $this->callback(fn (ApiKeyMeta $meta) => $meta->name === 'Alice'),
         )->willReturn(ApiKey::create());
 
-        $this->commandTester->execute([
+        $exitCode = $this->commandTester->execute([
             '--name' => 'Alice',
         ]);
+
+        self::assertEquals(ExitCode::EXIT_SUCCESS, $exitCode);
     }
 }

module/CLI/test/Command/Api/InitialApiKeyCommandTest.php

@@ -27,8 +27,11 @@ class InitialApiKeyCommandTest extends TestCase
     }
 
     #[Test, DataProvider('provideParams')]
-    public function initialKeyIsCreatedWithProvidedValue(?ApiKey $result, bool $verbose, string $expectedOutput): void
-    {
+    public function initialKeyIsCreatedWithProvidedValue(
+        ApiKey|null $result,
+        bool $verbose,
+        string $expectedOutput,
+    ): void {
         $this->apiKeyService->expects($this->once())->method('createInitial')->with('the_key')->willReturn($result);
 
         $this->commandTester->execute(

module/CLI/test/Command/Api/ListKeysCommandTest.php

@@ -52,15 +52,15 @@ class ListKeysCommandTest extends TestCase
             ],
             false,
             <<<OUTPUT
-            +--------------------------------------+------+------------+---------------------------+-------+
-            | Key                                  | Name | Is enabled | Expiration date           | Roles |
-            +--------------------------------------+------+------------+---------------------------+-------+
-            | {$apiKey1} | -    | ---        | -                         | Admin |
-            +--------------------------------------+------+------------+---------------------------+-------+
-            | {$apiKey2} | -    | ---        | 2020-01-01T00:00:00+00:00 | Admin |
-            +--------------------------------------+------+------------+---------------------------+-------+
-            | {$apiKey3} | -    | +++        | -                         | Admin |
-            +--------------------------------------+------+------------+---------------------------+-------+
+            +--------------------------------------+------------+---------------------------+-------+
+            | Name                                 | Is enabled | Expiration date           | Roles |
+            +--------------------------------------+------------+---------------------------+-------+
+            | {$apiKey1->name} | ---        | -                         | Admin |
+            +--------------------------------------+------------+---------------------------+-------+
+            | {$apiKey2->name} | ---        | 2020-01-01T00:00:00+00:00 | Admin |
+            +--------------------------------------+------------+---------------------------+-------+
+            | {$apiKey3->name} | +++        | -                         | Admin |
+            +--------------------------------------+------------+---------------------------+-------+
 
             OUTPUT,
         ];
@@ -68,13 +68,13 @@ class ListKeysCommandTest extends TestCase
             [$apiKey1 = ApiKey::create()->disable(), $apiKey2 = ApiKey::create()],
             true,
             <<<OUTPUT
-            +--------------------------------------+------+-----------------+-------+
-            | Key                                  | Name | Expiration date | Roles |
-            +--------------------------------------+------+-----------------+-------+
-            | {$apiKey1} | -    | -               | Admin |
-            +--------------------------------------+------+-----------------+-------+
-            | {$apiKey2} | -    | -               | Admin |
-            +--------------------------------------+------+-----------------+-------+
+            +--------------------------------------+-----------------+-------+
+            | Name                                 | Expiration date | Roles |
+            +--------------------------------------+-----------------+-------+
+            | {$apiKey1->name} | -               | Admin |
+            +--------------------------------------+-----------------+-------+
+            | {$apiKey2->name} | -               | Admin |
+            +--------------------------------------+-----------------+-------+
 
             OUTPUT,
         ];
@@ -94,45 +94,45 @@ class ListKeysCommandTest extends TestCase
             ],
             true,
             <<<OUTPUT
-            +--------------------------------------+------+-----------------+--------------------------+
-            | Key                                  | Name | Expiration date | Roles                    |
-            +--------------------------------------+------+-----------------+--------------------------+
-            | {$apiKey1} | -    | -               | Admin                    |
-            +--------------------------------------+------+-----------------+--------------------------+
-            | {$apiKey2} | -    | -               | Author only              |
-            +--------------------------------------+------+-----------------+--------------------------+
-            | {$apiKey3} | -    | -               | Domain only: example.com |
-            +--------------------------------------+------+-----------------+--------------------------+
-            | {$apiKey4} | -    | -               | Admin                    |
-            +--------------------------------------+------+-----------------+--------------------------+
-            | {$apiKey5} | -    | -               | Author only              |
-            |                                      |      |                 | Domain only: example.com |
-            +--------------------------------------+------+-----------------+--------------------------+
-            | {$apiKey6} | -    | -               | Admin                    |
-            +--------------------------------------+------+-----------------+--------------------------+
+            +--------------------------------------+-----------------+--------------------------+
+            | Name                                 | Expiration date | Roles                    |
+            +--------------------------------------+-----------------+--------------------------+
+            | {$apiKey1->name} | -               | Admin                    |
+            +--------------------------------------+-----------------+--------------------------+
+            | {$apiKey2->name} | -               | Author only              |
+            +--------------------------------------+-----------------+--------------------------+
+            | {$apiKey3->name} | -               | Domain only: example.com |
+            +--------------------------------------+-----------------+--------------------------+
+            | {$apiKey4->name} | -               | Admin                    |
+            +--------------------------------------+-----------------+--------------------------+
+            | {$apiKey5->name} | -               | Author only              |
+            |                                      |                 | Domain only: example.com |
+            +--------------------------------------+-----------------+--------------------------+
+            | {$apiKey6->name} | -               | Admin                    |
+            +--------------------------------------+-----------------+--------------------------+
 
             OUTPUT,
         ];
         yield 'with names' => [
             [
-                $apiKey1 = ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'Alice')),
-                $apiKey2 = ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'Alice and Bob')),
+                ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'Alice')),
+                ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'Alice and Bob')),
                 $apiKey3 = ApiKey::fromMeta(ApiKeyMeta::fromParams(name: '')),
                 $apiKey4 = ApiKey::create(),
             ],
             true,
             <<<OUTPUT
-            +--------------------------------------+---------------+-----------------+-------+
-            | Key                                  | Name          | Expiration date | Roles |
-            +--------------------------------------+---------------+-----------------+-------+
-            | {$apiKey1} | Alice         | -               | Admin |
-            +--------------------------------------+---------------+-----------------+-------+
-            | {$apiKey2} | Alice and Bob | -               | Admin |
-            +--------------------------------------+---------------+-----------------+-------+
-            | {$apiKey3} |               | -               | Admin |
-            +--------------------------------------+---------------+-----------------+-------+
-            | {$apiKey4} | -             | -               | Admin |
-            +--------------------------------------+---------------+-----------------+-------+
+            +--------------------------------------+-----------------+-------+
+            | Name                                 | Expiration date | Roles |
+            +--------------------------------------+-----------------+-------+
+            | Alice                                | -               | Admin |
+            +--------------------------------------+-----------------+-------+
+            | Alice and Bob                        | -               | Admin |
+            +--------------------------------------+-----------------+-------+
+            | {$apiKey3->name} | -               | Admin |
+            +--------------------------------------+-----------------+-------+
+            | {$apiKey4->name} | -               | Admin |
+            +--------------------------------------+-----------------+-------+
 
             OUTPUT,
         ];

module/CLI/test/Command/Api/RenameApiKeyCommandTest.php

@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Api;
+
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\CLI\Command\Api\RenameApiKeyCommand;
+use Shlinkio\Shlink\Core\Model\Renaming;
+use Shlinkio\Shlink\Rest\ApiKey\Model\ApiKeyMeta;
+use Shlinkio\Shlink\Rest\Entity\ApiKey;
+use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
+use ShlinkioTest\Shlink\CLI\Util\CliTestUtils;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class RenameApiKeyCommandTest extends TestCase
+{
+    private CommandTester $commandTester;
+    private MockObject & ApiKeyServiceInterface $apiKeyService;
+
+    protected function setUp(): void
+    {
+        $this->apiKeyService = $this->createMock(ApiKeyServiceInterface::class);
+        $this->commandTester = CliTestUtils::testerForCommand(new RenameApiKeyCommand($this->apiKeyService));
+    }
+
+    #[Test]
+    public function oldNameIsRequestedIfNotProvided(): void
+    {
+        $oldName = 'old name';
+        $newName = 'new name';
+
+        $this->apiKeyService->expects($this->once())->method('listKeys')->willReturn([
+            ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'foo')),
+            ApiKey::fromMeta(ApiKeyMeta::fromParams(name: $oldName)),
+            ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'bar')),
+        ]);
+        $this->apiKeyService->expects($this->once())->method('renameApiKey')->with(
+            Renaming::fromNames($oldName, $newName),
+        );
+
+        $this->commandTester->setInputs([$oldName]);
+        $this->commandTester->execute([
+            'newName' => $newName,
+        ]);
+    }
+
+    #[Test]
+    public function newNameIsRequestedIfNotProvided(): void
+    {
+        $oldName = 'old name';
+        $newName = 'new name';
+
+        $this->apiKeyService->expects($this->never())->method('listKeys');
+        $this->apiKeyService->expects($this->once())->method('renameApiKey')->with(
+            Renaming::fromNames($oldName, $newName),
+        );
+
+        $this->commandTester->setInputs([$newName]);
+        $this->commandTester->execute([
+            'oldName' => $oldName,
+        ]);
+    }
+
+    #[Test]
+    public function apiIsRenamedWithProvidedNames(): void
+    {
+        $oldName = 'old name';
+        $newName = 'new name';
+
+        $this->apiKeyService->expects($this->never())->method('listKeys');
+        $this->apiKeyService->expects($this->once())->method('renameApiKey')->with(
+            Renaming::fromNames($oldName, $newName),
+        );
+
+        $this->commandTester->execute([
+            'oldName' => $oldName,
+            'newName' => $newName,
+        ]);
+    }
+}

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

@@ -31,7 +31,7 @@ class DomainRedirectsCommandTest extends TestCase
     }
 
     #[Test, DataProvider('provideDomains')]
-    public function onlyPlainQuestionsAreAskedForNewDomainsAndDomainsWithNoRedirects(?Domain $domain): void
+    public function onlyPlainQuestionsAreAskedForNewDomainsAndDomainsWithNoRedirects(Domain|null $domain): void
     {
         $domainAuthority = 'my-domain.com';
         $this->domainService->expects($this->once())->method('findByAuthority')->with($domainAuthority)->willReturn(

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

@@ -40,7 +40,7 @@ class GetDomainVisitsCommandTest extends TestCase
     public function outputIsProperlyGenerated(): void
     {
         $shortUrl = ShortUrl::createFake();
-        $visit = Visit::forValidShortUrl($shortUrl, new Visitor('bar', 'foo', '', ''))->locate(
+        $visit = Visit::forValidShortUrl($shortUrl, Visitor::fromParams('bar', 'foo', ''))->locate(
             VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
         );
         $domain = 's.test';

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

@@ -104,7 +104,7 @@ class CreateShortUrlCommandTest extends TestCase
     }
 
     #[Test, DataProvider('provideDomains')]
-    public function properlyProcessesProvidedDomain(array $input, ?string $expectedDomain): void
+    public function properlyProcessesProvidedDomain(array $input, string|null $expectedDomain): void
     {
         $this->urlShortener->expects($this->once())->method('shorten')->with(
             $this->callback(function (ShortUrlCreation $meta) use ($expectedDomain) {
@@ -128,8 +128,10 @@ class CreateShortUrlCommandTest extends TestCase
     }
 
     #[Test, DataProvider('provideFlags')]
-    public function urlValidationHasExpectedValueBasedOnProvidedFlags(array $options, ?bool $expectedCrawlable): void
-    {
+    public function urlValidationHasExpectedValueBasedOnProvidedFlags(
+        array $options,
+        bool|null $expectedCrawlable,
+    ): void {
         $shortUrl = ShortUrl::createFake();
         $this->urlShortener->expects($this->once())->method('shorten')->with(
             $this->callback(function (ShortUrlCreation $meta) use ($expectedCrawlable) {

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

@@ -74,7 +74,7 @@ class DeleteShortUrlCommandTest extends TestCase
         $identifier = ShortUrlIdentifier::fromShortCodeAndDomain($shortCode);
         $this->service->expects($this->exactly($expectedDeleteCalls))->method('deleteByShortCode')->with(
             $identifier,
-            $this->isType('bool'),
+            $this->isBool(),
         )->willReturnCallback(function ($_, bool $ignoreThreshold) use ($shortCode): void {
             if (!$ignoreThreshold) {
                 throw Exception\DeleteShortUrlException::fromVisitsThreshold(

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

@@ -93,7 +93,7 @@ class GetShortUrlVisitsCommandTest extends TestCase
     #[Test]
     public function outputIsProperlyGenerated(): void
     {
-        $visit = Visit::forValidShortUrl(ShortUrl::createFake(), new Visitor('bar', 'foo', '', ''))->locate(
+        $visit = Visit::forValidShortUrl(ShortUrl::createFake(), Visitor::fromParams('bar', 'foo', ''))->locate(
             VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
         );
         $shortCode = 'abc123';

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

@@ -16,7 +16,7 @@ use Shlinkio\Shlink\Core\ShortUrl\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifier;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlCreation;
 use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlsParams;
-use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlWithVisitsSummary;
+use Shlinkio\Shlink\Core\ShortUrl\Model\ShortUrlWithDeps;
 use Shlinkio\Shlink\Core\ShortUrl\Model\TagsMode;
 use Shlinkio\Shlink\Core\ShortUrl\ShortUrlListServiceInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Transformer\ShortUrlDataTransformer;
@@ -25,7 +25,6 @@ use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use ShlinkioTest\Shlink\CLI\Util\CliTestUtils;
 use Symfony\Component\Console\Tester\CommandTester;
 
-use function count;
 use function explode;
 
 class ListShortUrlsCommandTest extends TestCase
@@ -48,7 +47,7 @@ class ListShortUrlsCommandTest extends TestCase
         // The paginator will return more than one page
         $data = [];
         for ($i = 0; $i < 50; $i++) {
-            $data[] = ShortUrlWithVisitsSummary::fromShortUrl(ShortUrl::withLongUrl('https://url_' . $i));
+            $data[] = ShortUrlWithDeps::fromShortUrl(ShortUrl::withLongUrl('https://url_' . $i));
         }
 
         $this->shortUrlService->expects($this->exactly(3))->method('listShortUrls')->withAnyParameters()
@@ -70,11 +69,11 @@ class ListShortUrlsCommandTest extends TestCase
         // The paginator will return more than one page
         $data = [];
         for ($i = 0; $i < 30; $i++) {
-            $data[] = ShortUrlWithVisitsSummary::fromShortUrl(ShortUrl::withLongUrl('https://url_' . $i));
+            $data[] = ShortUrlWithDeps::fromShortUrl(ShortUrl::withLongUrl('https://url_' . $i));
         }
 
         $this->shortUrlService->expects($this->once())->method('listShortUrls')->with(
-            ShortUrlsParams::emptyInstance(),
+            ShortUrlsParams::empty(),
         )->willReturn(new Paginator(new ArrayAdapter($data)));
 
         $this->commandTester->setInputs(['n']);
@@ -105,105 +104,111 @@ class ListShortUrlsCommandTest extends TestCase
     #[Test, DataProvider('provideOptionalFlags')]
     public function provideOptionalFlagsMakesNewColumnsToBeIncluded(
         array $input,
-        array $expectedContents,
-        array $notExpectedContents,
-        ApiKey $apiKey,
+        string $expectedOutput,
+        ShortUrl $shortUrl,
     ): void {
         $this->shortUrlService->expects($this->once())->method('listShortUrls')->with(
-            ShortUrlsParams::emptyInstance(),
+            ShortUrlsParams::empty(),
         )->willReturn(new Paginator(new ArrayAdapter([
-            ShortUrlWithVisitsSummary::fromShortUrl(
-                ShortUrl::create(ShortUrlCreation::fromRawData([
-                    'longUrl' => 'https://foo.com',
-                    'tags' => ['foo', 'bar', 'baz'],
-                    'apiKey' => $apiKey,
-                ])),
-            ),
+            ShortUrlWithDeps::fromShortUrl($shortUrl),
         ])));
 
         $this->commandTester->setInputs(['y']);
         $this->commandTester->execute($input);
         $output = $this->commandTester->getDisplay();
 
-        if (count($expectedContents) === 0 && count($notExpectedContents) === 0) {
-            self::fail('No expectations were run');
-        }
-
-        foreach ($expectedContents as $column) {
-            self::assertStringContainsString($column, $output);
-        }
-        foreach ($notExpectedContents as $column) {
-            self::assertStringNotContainsString($column, $output);
-        }
+        self::assertStringContainsString($expectedOutput, $output);
     }
 
     public static function provideOptionalFlags(): iterable
     {
-        $apiKey = ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'my api key'));
-        $key = $apiKey->toString();
+        $shortUrl = ShortUrl::create(ShortUrlCreation::fromRawData([
+            'longUrl' => 'https://foo.com',
+            'tags' => ['foo', 'bar', 'baz'],
+            'apiKey' => ApiKey::fromMeta(ApiKeyMeta::fromParams(name: 'my api key')),
+        ]));
+        $shortCode = $shortUrl->getShortCode();
+        $created = $shortUrl->dateCreated()->toAtomString();
 
+        // phpcs:disable Generic.Files.LineLength
         yield 'tags only' => [
             ['--show-tags' => true],
-            ['| Tags    ', '| foo, bar, baz'],
-            ['| API Key    ', '| API Key Name |', $key, '| my api key', '| Domain', '| DEFAULT'],
-            $apiKey,
+            <<<OUTPUT
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------------+
+            | Short Code | Title | Short URL   | Long URL        | Date created              | Visits count | Tags          |
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------------+
+            | {$shortCode}      |       | http:/{$shortCode} | https://foo.com | {$created} | 0            | foo, bar, baz |
+            +------------+-------+-------------+-------------- Page 1 of 1 ------------------+--------------+---------------+
+            OUTPUT,
+            $shortUrl,
         ];
         yield 'domain only' => [
             ['--show-domain' => true],
-            ['| Domain', '| DEFAULT'],
-            ['| Tags    ', '| foo, bar, baz', '| API Key    ', '| API Key Name |', $key, '| my api key'],
-            $apiKey,
+            <<<OUTPUT
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------+
+            | Short Code | Title | Short URL   | Long URL        | Date created              | Visits count | Domain  |
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------+
+            | {$shortCode}      |       | http:/{$shortCode} | https://foo.com | {$created} | 0            | DEFAULT |
+            +------------+-------+-------------+----------- Page 1 of 1 ---------------------+--------------+---------+
+            OUTPUT,
+            $shortUrl,
         ];
         yield 'api key only' => [
             ['--show-api-key' => true],
-            ['| API Key    ', $key],
-            ['| Tags    ', '| foo, bar, baz', '| API Key Name |', '| my api key', '| Domain', '| DEFAULT'],
-            $apiKey,
-        ];
-        yield 'api key name only' => [
-            ['--show-api-key-name' => true],
-            ['| API Key Name |', '| my api key'],
-            ['| Tags    ', '| foo, bar, baz', '| API Key    ', $key],
-            $apiKey,
+            <<<OUTPUT
+            +------------+-------+-------------+-----------------+---------------------------+--------------+--------------+
+            | Short Code | Title | Short URL   | Long URL        | Date created              | Visits count | API Key Name |
+            +------------+-------+-------------+-----------------+---------------------------+--------------+--------------+
+            | {$shortCode}      |       | http:/{$shortCode} | https://foo.com | {$created} | 0            | my api key   |
+            +------------+-------+-------------+------------- Page 1 of 1 -------------------+--------------+--------------+
+            OUTPUT,
+            $shortUrl,
         ];
         yield 'tags and api key' => [
             ['--show-tags' => true, '--show-api-key' => true],
-            ['| API Key    ', '| Tags    ', '| foo, bar, baz', $key],
-            ['| API Key Name |', '| my api key'],
-            $apiKey,
+            <<<OUTPUT
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------------+--------------+
+            | Short Code | Title | Short URL   | Long URL        | Date created              | Visits count | Tags          | API Key Name |
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------------+--------------+
+            | {$shortCode}      |       | http:/{$shortCode} | https://foo.com | {$created} | 0            | foo, bar, baz | my api key   |
+            +------------+-------+-------------+-----------------+--- Page 1 of 1 -----------+--------------+---------------+--------------+
+            OUTPUT,
+            $shortUrl,
         ];
         yield 'tags and domain' => [
             ['--show-tags' => true, '--show-domain' => true],
-            ['| Tags    ', '| foo, bar, baz', '| Domain', '| DEFAULT'],
-            ['| API Key Name |', '| my api key'],
-            $apiKey,
+            <<<OUTPUT
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------------+---------+
+            | Short Code | Title | Short URL   | Long URL        | Date created              | Visits count | Tags          | Domain  |
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------------+---------+
+            | {$shortCode}      |       | http:/{$shortCode} | https://foo.com | {$created} | 0            | foo, bar, baz | DEFAULT |
+            +------------+-------+-------------+-----------------+- Page 1 of 1 -------------+--------------+---------------+---------+
+            OUTPUT,
+            $shortUrl,
         ];
         yield 'all' => [
-            ['--show-tags' => true, '--show-domain' => true, '--show-api-key' => true, '--show-api-key-name' => true],
-            [
-                '| API Key    ',
-                '| Tags    ',
-                '| API Key Name |',
-                '| foo, bar, baz',
-                $key,
-                '| my api key',
-                '| Domain',
-                '| DEFAULT',
-            ],
-            [],
-            $apiKey,
+            ['--show-tags' => true, '--show-domain' => true, '--show-api-key' => true],
+            <<<OUTPUT
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------------+---------+--------------+
+            | Short Code | Title | Short URL   | Long URL        | Date created              | Visits count | Tags          | Domain  | API Key Name |
+            +------------+-------+-------------+-----------------+---------------------------+--------------+---------------+---------+--------------+
+            | {$shortCode}      |       | http:/{$shortCode} | https://foo.com | {$created} | 0            | foo, bar, baz | DEFAULT | my api key   |
+            +------------+-------+-------------+-----------------+-------- Page 1 of 1 ------+--------------+---------------+---------+--------------+
+            OUTPUT,
+            $shortUrl,
         ];
+        // phpcs:enable
     }
 
     #[Test, DataProvider('provideArgs')]
     public function serviceIsInvokedWithProvidedArgs(
         array $commandArgs,
-        ?int $page,
-        ?string $searchTerm,
+        int|null $page,
+        string|null $searchTerm,
         array $tags,
         string $tagsMode,
-        ?string $startDate = null,
-        ?string $endDate = null,
+        string|null $startDate = null,
+        string|null $endDate = null,
     ): void {
         $this->shortUrlService->expects($this->once())->method('listShortUrls')->with(ShortUrlsParams::fromRawData([
             'page' => $page,
@@ -260,7 +265,7 @@ class ListShortUrlsCommandTest extends TestCase
     }
 
     #[Test, DataProvider('provideOrderBy')]
-    public function orderByIsProperlyComputed(array $commandArgs, ?string $expectedOrderBy): void
+    public function orderByIsProperlyComputed(array $commandArgs, string|null $expectedOrderBy): void
     {
         $this->shortUrlService->expects($this->once())->method('listShortUrls')->with(ShortUrlsParams::fromRawData([
             'orderBy' => $expectedOrderBy,

module/CLI/test/Command/Tag/GetTagVisitsCommandTest.php

@@ -40,7 +40,7 @@ class GetTagVisitsCommandTest extends TestCase
     public function outputIsProperlyGenerated(): void
     {
         $shortUrl = ShortUrl::createFake();
-        $visit = Visit::forValidShortUrl($shortUrl, new Visitor('bar', 'foo', '', ''))->locate(
+        $visit = Visit::forValidShortUrl($shortUrl, Visitor::fromParams('bar', 'foo', ''))->locate(
             VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
         );
         $tag = 'abc123';

module/CLI/test/Command/Tag/RenameTagCommandTest.php

@@ -9,8 +9,8 @@ use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Tag\RenameTagCommand;
 use Shlinkio\Shlink\Core\Exception\TagNotFoundException;
+use Shlinkio\Shlink\Core\Model\Renaming;
 use Shlinkio\Shlink\Core\Tag\Entity\Tag;
-use Shlinkio\Shlink\Core\Tag\Model\TagRenaming;
 use Shlinkio\Shlink\Core\Tag\TagServiceInterface;
 use ShlinkioTest\Shlink\CLI\Util\CliTestUtils;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -32,7 +32,7 @@ class RenameTagCommandTest extends TestCase
         $oldName = 'foo';
         $newName = 'bar';
         $this->tagService->expects($this->once())->method('renameTag')->with(
-            TagRenaming::fromNames($oldName, $newName),
+            Renaming::fromNames($oldName, $newName),
         )->willThrowException(TagNotFoundException::fromTag('foo'));
 
         $this->commandTester->execute([
@@ -50,7 +50,7 @@ class RenameTagCommandTest extends TestCase
         $oldName = 'foo';
         $newName = 'bar';
         $this->tagService->expects($this->once())->method('renameTag')->with(
-            TagRenaming::fromNames($oldName, $newName),
+            Renaming::fromNames($oldName, $newName),
         )->willReturn(new Tag($newName));
 
         $this->commandTester->execute([

module/CLI/test/Command/Visit/DownloadGeoLiteDbCommandTest.php

@@ -6,13 +6,15 @@ namespace ShlinkioTest\Shlink\CLI\Command\Visit;
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Visit\DownloadGeoLiteDbCommand;
-use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
-use Shlinkio\Shlink\CLI\GeoLite\GeolocationDbUpdaterInterface;
-use Shlinkio\Shlink\CLI\GeoLite\GeolocationResult;
 use Shlinkio\Shlink\CLI\Util\ExitCode;
+use Shlinkio\Shlink\Core\Exception\GeolocationDbUpdateFailedException;
+use Shlinkio\Shlink\Core\Geolocation\GeolocationDbUpdaterInterface;
+use Shlinkio\Shlink\Core\Geolocation\GeolocationDownloadProgressHandlerInterface;
+use Shlinkio\Shlink\Core\Geolocation\GeolocationResult;
 use ShlinkioTest\Shlink\CLI\Util\CliTestUtils;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -36,9 +38,9 @@ class DownloadGeoLiteDbCommandTest extends TestCase
         int $expectedExitCode,
     ): void {
         $this->dbUpdater->expects($this->once())->method('checkDbUpdate')->withAnyParameters()->willReturnCallback(
-            function (callable $beforeDownload, callable $handleProgress) use ($olderDbExists): void {
-                $beforeDownload($olderDbExists);
-                $handleProgress(100, 50);
+            function (GeolocationDownloadProgressHandlerInterface $handler) use ($olderDbExists): void {
+                $handler->beforeDownload($olderDbExists);
+                $handler->handleProgress(100, 50, $olderDbExists);
 
                 throw $olderDbExists
                     ? GeolocationDbUpdateFailedException::withOlderDb()
@@ -73,17 +75,18 @@ class DownloadGeoLiteDbCommandTest extends TestCase
     }
 
     #[Test]
-    public function warningIsPrintedWhenLicenseIsMissing(): void
+    #[TestWith([GeolocationResult::LICENSE_MISSING, 'It was not possible to download GeoLite2 db'])]
+    #[TestWith([GeolocationResult::MAX_ERRORS_REACHED, 'Max consecutive errors reached'])]
+    #[TestWith([GeolocationResult::UPDATE_IN_PROGRESS, 'A geolocation db is already being downloaded'])]
+    public function warningIsPrintedForSomeResults(GeolocationResult $result, string $expectedWarningMessage): void
     {
-        $this->dbUpdater->expects($this->once())->method('checkDbUpdate')->withAnyParameters()->willReturn(
-            GeolocationResult::LICENSE_MISSING,
-        );
+        $this->dbUpdater->expects($this->once())->method('checkDbUpdate')->withAnyParameters()->willReturn($result);
 
         $this->commandTester->execute([]);
         $output = $this->commandTester->getDisplay();
         $exitCode = $this->commandTester->getStatusCode();
 
-        self::assertStringContainsString('[WARNING] It was not possible to download GeoLite2 db', $output);
+        self::assertStringContainsString('[WARNING] ' . $expectedWarningMessage, $output);
         self::assertSame(ExitCode::EXIT_WARNING, $exitCode);
     }
 
@@ -105,8 +108,8 @@ class DownloadGeoLiteDbCommandTest extends TestCase
     public static function provideSuccessParams(): iterable
     {
         yield 'up to date db' => [fn () => GeolocationResult::CHECK_SKIPPED, '[INFO] GeoLite2 db file is up to date.'];
-        yield 'outdated db' => [function (callable $beforeDownload): GeolocationResult {
-            $beforeDownload(true);
+        yield 'outdated db' => [function (GeolocationDownloadProgressHandlerInterface $handler): GeolocationResult {
+            $handler->beforeDownload(true);
             return GeolocationResult::DB_CREATED;
         }, '[OK] GeoLite2 db file properly downloaded.'];
     }

module/CLI/test/Command/Visit/GetNonOrphanVisitsCommandTest.php

@@ -40,7 +40,7 @@ class GetNonOrphanVisitsCommandTest extends TestCase
     public function outputIsProperlyGenerated(): void
     {
         $shortUrl = ShortUrl::createFake();
-        $visit = Visit::forValidShortUrl($shortUrl, new Visitor('bar', 'foo', '', ''))->locate(
+        $visit = Visit::forValidShortUrl($shortUrl, Visitor::fromParams('bar', 'foo', ''))->locate(
             VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
         );
         $this->visitsHelper->expects($this->once())->method('nonOrphanVisits')->withAnyParameters()->willReturn(

module/CLI/test/Command/Visit/GetOrphanVisitsCommandTest.php

@@ -37,7 +37,7 @@ class GetOrphanVisitsCommandTest extends TestCase
     #[TestWith([['--type' => OrphanVisitType::BASE_URL->value], true])]
     public function outputIsProperlyGenerated(array $args, bool $includesType): void
     {
-        $visit = Visit::forBasePath(new Visitor('bar', 'foo', '', ''))->locate(
+        $visit = Visit::forBasePath(Visitor::fromParams('bar', 'foo', ''))->locate(
             VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
         );
         $this->visitsHelper->expects($this->once())->method('orphanVisits')->with($this->callback(