Merge pull request #1494 from shlinkio/develop

Release 3.2.0

.github/workflows/ci.yml

@@ -10,10 +10,10 @@ on:
 
 jobs:
   static-analysis:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0']
+        php-version: ['8.1']
         command: ['cs', 'stan', 'swagger:validate']
     steps:
       - name: Checkout code
@@ -23,16 +23,17 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.9.1
+          extensions: openswoole-4.11.1
           coverage: none
-      - run: composer install --no-interaction --prefer-dist
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist
       - run: composer ${{ matrix.command }}
 
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0', '8.1']
+        php-version: ['8.1']
         test-group: ['unit', 'api']
     steps:
       - name: Checkout code
@@ -45,13 +46,14 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.9.1
+          extensions: openswoole-4.11.1
           coverage: pcov
           ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist
       - run: composer test:${{ matrix.test-group }}:ci
       - uses: actions/upload-artifact@v2
-        if: ${{ matrix.php-version == '8.0' }}
+        if: ${{ matrix.php-version == '8.1' }}
         with:
           name: coverage-${{ matrix.test-group }}
           path: |
@@ -59,10 +61,10 @@ jobs:
             build/coverage-${{ matrix.test-group }}.cov
 
   db-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0', '8.1']
+        php-version: ['8.1']
         platform: ['sqlite:ci', 'mysql', 'maria', 'postgres', 'ms']
     env:
       LC_ALL: C
@@ -80,10 +82,11 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.9.1, pdo_sqlsrv-5.10.0
+          extensions: openswoole-4.11.1, pdo_sqlsrv-5.10.1
           coverage: pcov
           ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist
       - name: Create test database
         if: ${{ matrix.platform == 'ms' }}
         run: docker-compose exec -T shlink_db_ms /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Passw0rd!' -Q "CREATE DATABASE shlink_test;"
@@ -91,7 +94,7 @@ jobs:
         run: composer test:db:${{ matrix.platform }}
       - name: Upload code coverage
         uses: actions/upload-artifact@v2
-        if: ${{ matrix.php-version == '8.0' && matrix.platform == 'sqlite:ci' }}
+        if: ${{ matrix.php-version == '8.1' && matrix.platform == 'sqlite:ci' }}
         with:
           name: coverage-db
           path: |
@@ -102,10 +105,10 @@ jobs:
     needs:
       - tests
       - db-tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0', '8.1']
+        php-version: ['8.1']
         test-group: ['unit', 'db', 'api']
     steps:
       - name: Checkout code
@@ -115,10 +118,11 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.9.1
+          extensions: openswoole-4.11.1
           coverage: pcov
           ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist
       - uses: actions/download-artifact@v2
         with:
           path: build
@@ -133,10 +137,10 @@ jobs:
     needs:
       - tests
       - db-tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0']
+        php-version: ['8.1']
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -152,8 +156,8 @@ jobs:
       - run: mv build/coverage-unit/coverage-unit.cov build/coverage-unit.cov
       - run: mv build/coverage-db/coverage-db.cov build/coverage-db.cov
       - run: mv build/coverage-api/coverage-api.cov build/coverage-api.cov
-      - run: wget https://phar.phpunit.de/phpcov-8.2.0.phar
-      - run: php phpcov-8.2.0.phar merge build --clover build/clover.xml
+      - run: wget https://phar.phpunit.de/phpcov-8.2.1.phar
+      - run: php phpcov-8.2.1.phar merge build --clover build/clover.xml
       - name: Publish coverage
         uses: codecov/codecov-action@v1
         with:
@@ -163,7 +167,7 @@ jobs:
     needs:
       - mutation-tests
       - upload-coverage
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: geekyeggo/delete-artifact@v1
         with:
@@ -173,7 +177,7 @@ jobs:
             coverage-api
 
   build-docker-image:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

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

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

.github/workflows/publish-release.yml

@@ -7,10 +7,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0', '8.1']
+        php-version: ['8.1']
         swoole: ['yes', 'no']
     steps:
       - name: Checkout code
@@ -20,7 +20,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.9.1
+          extensions: openswoole-4.11.1
       - if: ${{ matrix.swoole == 'yes' }}
         run: ./build.sh ${GITHUB_REF#refs/tags/v}
       - if: ${{ matrix.swoole == 'no' }}
@@ -32,7 +32,7 @@ jobs:
 
   publish:
     needs: ['build']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -50,11 +50,11 @@ jobs:
 
   delete-artifacts:
     needs: ['publish']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: [ '8.0', '8.1' ]
-        swoole: [ 'yes', 'no' ]
+        php-version: ['8.1']
+        swoole: ['yes', 'no']
     steps:
       - uses: geekyeggo/delete-artifact@v1
         with:

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

@@ -7,10 +7,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        php-version: ['8.0']
+        php-version: ['8.1']
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -23,7 +23,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.9.1
+          extensions: openswoole-4.11.1
           coverage: none
       - run: composer install --no-interaction --prefer-dist
       - run: composer swagger:inline

CHANGELOG.md

@@ -4,6 +4,144 @@ 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).
 
+## [3.2.0] - 2022-08-05
+### Added
+* [#854](https://github.com/shlinkio/shlink/issues/854) Added support for multi-segment custom slugs.
+
+  The feature is disabled by default, but you can optionally opt in. If you do, you will be able to create short URLs with multiple segments in the custom slug, like `https://example.com/foo/bar/baz`.
+
+* [#1280](https://github.com/shlinkio/shlink/issues/1280) Added missing visit-related commands.
+
+  Now you can run `tag:visits`, `domain:visits`, `visit:orphan` or `visit:non-orphan` to get the corresponding list of visits from the command line.
+
+* [#962](https://github.com/shlinkio/shlink/issues/962) Added new real-time update for new short URLs.
+
+  You can now subscribe to the `https://shlink.io/new-short-url` topic on any of the supported async updates technologies in order to get notified when a short URL is created.
+
+* [#1367](https://github.com/shlinkio/shlink/issues/1367) Added support to publish real-time updates in redis pub/sub.
+
+  The publishing will happen in the same redis instance/cluster configured for caching.
+
+### Changed
+* [#1452](https://github.com/shlinkio/shlink/issues/1452) Updated to monolog 3
+* [#1485](https://github.com/shlinkio/shlink/issues/1485) Changed payload published in RabbitMQ for all visits events, in order to conform with the Async API spec.
+
+  Since this is a breaking change, also provided a new `RABBITMQ_LEGACY_VISITS_PUBLISHING=true` env var that can be provided in order to keep the old payload.
+
+  This env var is considered deprecated and will be removed in Shlink 4, when the legacy format will no longer be supported.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* [#1280](https://github.com/shlinkio/shlink/issues/1280) Dropped support for PHP 8.0
+
+### Fixed
+* [#1471](https://github.com/shlinkio/shlink/issues/1471) Fixed error when running `visit:locate` command with any extra parameter (like `--retry`).
+
+
+## [3.1.2] - 2022-06-04
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1448](https://github.com/shlinkio/shlink/issues/1448) Fixed HTML entities not being properly parsed when auto-resolving page titles.
+* [#1458](https://github.com/shlinkio/shlink/issues/1458) Fixed 500 error when filtering short URLs by ALL tags and search term.
+
+
+## [3.1.1] - 2022-05-09
+### Added
+* *Nothing*
+
+### Changed
+* [#1444](https://github.com/shlinkio/shlink/issues/1444) Updated docker image to openswoole 4.11.1, in an attempt to fix error.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1439](https://github.com/shlinkio/shlink/issues/1439) Fixed crash when trying to auto-resolve titles for URLs which serve large binary files.
+
+
+## [3.1.0] - 2022-04-23
+### Added
+* [#1294](https://github.com/shlinkio/shlink/issues/1294) Allowed to provide a specific domain when importing URLs from YOURLS.
+* [#1416](https://github.com/shlinkio/shlink/issues/1416) Added support to import URLs from Kutt.it.
+* [#1418](https://github.com/shlinkio/shlink/issues/1418) Added support to customize the timezone used by Shlink, falling back to the default one set in PHP config.
+
+  The timezone can be set via the `TIMEZONE` env var, or using the installer tool.
+
+* [#1309](https://github.com/shlinkio/shlink/issues/1309) Improved URL importing, ensuring individual errors do not make the whole process fail, and instead, failing URLs are skipped.
+* [#1162](https://github.com/shlinkio/shlink/issues/1162) Added new endpoint to get visits by domain.
+
+  The endpoint is `GET /domains/{domain}/visits`, and it has the same capabilities as any other visits endpoint, allowing pagination and filtering.
+
+### Changed
+* [#1359](https://github.com/shlinkio/shlink/issues/1359) Hidden database commands.
+* [#1385](https://github.com/shlinkio/shlink/issues/1385) Prevented a big error message from being logged when using Shlink without mercure.
+* [#1398](https://github.com/shlinkio/shlink/issues/1398) Increased required mutation score for unit tests to 85%.
+* [#1419](https://github.com/shlinkio/shlink/issues/1419) Input dates are now parsed to Shlink's configured timezone or default timezone before using them for database queries.
+* [#1428](https://github.com/shlinkio/shlink/issues/1428) Updated native dependencies in docker image and base image to PHP v8.1.5.
+
+### Deprecated
+* [#1340](https://github.com/shlinkio/shlink/issues/1340) Deprecated webhooks. New events will only be added to other real-time updates approaches, and webhooks will be completely removed in Shlink 4.0.0.
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1397](https://github.com/shlinkio/shlink/issues/1397) Fixed `db:create` command always reporting the schema exists if the `db:migrate` command has been run before by mistake.
+* [#1402](https://github.com/shlinkio/shlink/issues/1402) Fixed the base path getting appended with the default domain by mistake, causing multiple side effects in several places.
+
+
+## [3.0.3] - 2022-02-19
+### Added
+* *Nothing*
+
+### Changed
+* [#1382](https://github.com/shlinkio/shlink/issues/1382) Updated docker image to PHP 8.1.3.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1377](https://github.com/shlinkio/shlink/issues/1377) Fixed installer always setting delete threshold with value 1.
+* [#1379](https://github.com/shlinkio/shlink/issues/1379) Ensured API keys cannot be created with a domain-only role linked to default domain.
+
+
+## [3.0.2] - 2022-02-10
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1373](https://github.com/shlinkio/shlink/issues/1373) Fixed incorrect config import when updating from Shlink 2.x using SQLite.
+* [#1369](https://github.com/shlinkio/shlink/issues/1369) Fixed slow regexps in `.htaccess` file.
+
+
 ## [3.0.1] - 2022-02-04
 ### Added
 * *Nothing*
@@ -503,7 +641,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * *Nothing*
 
 ### Fixed
-* [#979](https://github.com/shlinkio/shlink/issues/979) Added missing `itemsPerPage` query param to swagger docs for short RULs list.
+* [#979](https://github.com/shlinkio/shlink/issues/979) Added missing `itemsPerPage` query param to swagger docs for short URLs list.
 * [#980](https://github.com/shlinkio/shlink/issues/980) Fixed value used for `Access-Control-Allow-Origin`, that could not work as expected when including an IP address.
 * [#947](https://github.com/shlinkio/shlink/issues/947) Fixed incorrect value returned in `Access-Control-Allow-Methods` header, which always contained all methods.
 
@@ -1151,7 +1289,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
     Endpoints and commands which create short URLs support providing the `domain` now (via query param or CLI flag). If not provided, the short URLs will still be "attached" to the default domain.
 
-    Custom slugs can be created on multiple domains, allowing to share links like `https://doma.in/my-compaign` and `https://example.com/my-campaign`, under the same shlink instance.
+    Custom slugs can be created on multiple domains, allowing to share links like `https://doma.in/my-campaign` and `https://example.com/my-campaign`, under the same shlink instance.
 
     When resolving a short URL to redirect end users, the following rules are applied:
 
@@ -1401,7 +1539,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ### Fixed
 * [#309](https://github.com/shlinkio/shlink/issues/309) Added missing favicon to prevent 404 errors logged when an error page is loaded in a browser.
-* [#310](https://github.com/shlinkio/shlink/issues/310) Fixed execution context not being properly detected, making `CloseDbConnectionMiddlware` to be always piped. Now the check is not even made, which simplifies everything.
+* [#310](https://github.com/shlinkio/shlink/issues/310) Fixed execution context not being properly detected, making `CloseDbConnectionMiddleware` to be always piped. Now the check is not even made, which simplifies everything.
 
 
 ## [1.15.0] - 2018-12-02
@@ -1466,7 +1604,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 
 ### Changed
 * [#241](https://github.com/shlinkio/shlink/issues/241) Fixed columns in `visit_locations` table, to be snake_case instead of camelCase.
-* [#228](https://github.com/shlinkio/shlink/issues/228) Updated how exceptions are serialized into logs, by using monlog's `PsrLogMessageProcessor`.
+* [#228](https://github.com/shlinkio/shlink/issues/228) Updated how exceptions are serialized into logs, by using monolog's `PsrLogMessageProcessor`.
 * [#225](https://github.com/shlinkio/shlink/issues/225) Performance and maintainability slightly improved by enforcing via code sniffer that all global namespace classes, functions and constants are explicitly imported.
 * [#196](https://github.com/shlinkio/shlink/issues/196) Reduced anemic model in entities, defining more expressive public APIs instead.
 * [#249](https://github.com/shlinkio/shlink/issues/249) Added [functional-php](https://github.com/lstrojny/functional-php) to ease collections handling.

CONTRIBUTING.md

@@ -46,9 +46,7 @@ This is a simplified version of the project structure:
 ```
 shlink
 ├── bin
-│   ├── cli
-│   ├── install
-│   └── update
+│   └── cli
 ├── config
 │   ├── autoload
 │   ├── params
@@ -75,11 +73,11 @@ shlink
 
 The purposes of every folder are:
 
-* `bin`: It contains the CLI tools. The `cli` one is the main entry point to run shlink from the command line, while `install` and `update` are helper tools used to install and update shlink when not using the docker image.
+* `bin`: It contains the CLI tools. The `cli` one is the main entry point to run shlink from the command line.
 * `config`: Contains application-wide configurations, which are later merged with the ones provided by every module.
 * `data`: Common runtime-generated git-ignored assets, like logs, caches, etc.
 * `docs`: Any project documentation is stored here, like API spec definitions or architectural decision records.
-* `module`: Contains a subfolder for every module in the project. Modules contain the source code, tests and configurations for every context in the project.
+* `module`: Contains a sub-folder for every module in the project. Modules contain the source code, tests and configurations for every context in the project.
 * `public`: Few assets (like `favicon.ico` or `robots.txt`) and the web entry point are stored here. This web entry point is not used when serving the app with openswoole.
 
 ## Project tests
@@ -125,12 +123,6 @@ Depending on the kind of contribution, maybe not all kinds of tests are needed,
 * Run `./indocker composer ci` to run all previous commands together. This command is run during the project's continuous integration.
 * Run `./indocker composer ci:parallel` to do the same as in previous case, but parallelizing non-conflicting tasks as much as possible.
 
-> Note: Due to some limitations in the tooling used by shlink, the testing databases need to exist beforehand, both for db and api tests (except sqlite).
->
-> However, they just need to be created empty, with no tables. Also, once created, they are automatically reset before every new execution.
->
-> The testing database is always called `shlink_test`. You can create it using the database client of your choice. [DBeaver](https://dbeaver.io/) is a good multi-platform desktop database client which supports all the engines supported by shlink.
-
 ## Pull request process
 
 **Important!**: Before starting to work on a pull request, make sure you always [open an issue](https://github.com/shlinkio/shlink/issues/new/choose) first.

Dockerfile

@@ -1,9 +1,9 @@
-FROM php:8.1.1-alpine3.15 as base
+FROM php:8.1.9-alpine3.16 as base
 
 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION ${SHLINK_VERSION}
-ENV OPENSWOOLE_VERSION 4.9.1
-ENV PDO_SQLSRV_VERSION 5.10.0
+ENV OPENSWOOLE_VERSION 4.11.1
+ENV PDO_SQLSRV_VERSION 5.10.1
 ENV MS_ODBC_SQL_VERSION 17.5.2.2
 ENV LC_ALL "C"
 

README.md

@@ -35,13 +35,14 @@ 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.0 or 8.1
-* The next PHP extensions: json, curl, pdo, intl, gd and gmp.
+* PHP 8.1
+* The next PHP extensions: json, curl, pdo, intl, gd and gmp/bcmath.
     * apcu extension is recommended if you don't plan to use openswoole.
     * xml extension is required if you want to generate QR codes in svg format.
     * sockets and bcmath extensions are required if you want to integrate with a RabbitMQ instance.
-* MySQL, MariaDB, PostgreSQL, Microsoft SQL Server or SQLite.
-* [Openswoole](https://openswoole.com/) or the web server of your choice with PHP integration (Apache or Nginx recommended).
+* MySQL, MariaDB, PostgreSQL, MicrosoftSQL or SQLite.
+    * You will also need the corresponding pdo variation for the database you are planning to use: `pdo_mysql`, `pdo_pgsql`, `pdo_sqlsrv` or `pdo_sqlite`.
+* The [openswoole](https://openswoole.com/) PHP extension (if you plan to serve Shlink with openswoole) or the web server of your choice with PHP integration (like Apache or Nginx).
 
 ### Download
 
@@ -65,7 +66,9 @@ In order to run Shlink, you will need a built version of the project. There are
 
     After that, you will have a dist file inside the `build` directory, that you need to decompress in the location of your choice.
 
-    > This is the process used when releasing new shlink versions. After tagging the new version with git, the Github release is automatically created by a [GitHub workflow](https://github.com/shlinkio/shlink/actions?query=workflow%3A%22Publish+release%22), attaching the generated dist file to it.
+    > **Note**
+    >
+    > This is the process used when releasing new Shlink versions. After tagging the new version with git, the GitHub release is automatically created by a [GitHub workflow](https://github.com/shlinkio/shlink/actions?query=workflow%3A%22Publish+release%22), attaching the generated dist file to it.
 
 ### Configure
 

UPGRADE.md

@@ -76,7 +76,7 @@ These routes have been removed, but have a direct replacement:
 * `/qr/{shortCode}[/{size}]` -> `/{shortCode}/qr-code[/{size}]`
 * `PUT /rest/v{version}/short-urls/{shortCode}` -> `PATCH /rest/v{version}/short-urls/{shortCode}`
 
-When using the old ones, a 404 status will me returned now.
+When using the old ones, a 404 status will be returned now.
 
 ### Removed command and route aliases
 

composer.json

@@ -12,70 +12,65 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-json": "*",
         "ext-pdo": "*",
         "akrabat/ip-address-middleware": "^2.1",
         "cakephp/chronos": "^2.3",
-        "doctrine/migrations": "^3.3",
-        "doctrine/orm": "^2.11",
+        "doctrine/migrations": "^3.5",
+        "doctrine/orm": "^2.12",
         "endroid/qr-code": "^4.4",
         "geoip2/geoip2": "^2.12",
         "guzzlehttp/guzzle": "^7.4",
         "happyr/doctrine-specification": "^2.0",
         "jaybizzle/crawler-detect": "^1.2.110",
         "laminas/laminas-config": "^3.7",
-        "laminas/laminas-config-aggregator": "^1.7",
-        "laminas/laminas-diactoros": "^2.8",
-        "laminas/laminas-inputfilter": "^2.13",
-        "laminas/laminas-servicemanager": "^3.10",
-        "laminas/laminas-stdlib": "^3.6",
+        "laminas/laminas-config-aggregator": "^1.8",
+        "laminas/laminas-diactoros": "^2.14",
+        "laminas/laminas-inputfilter": "^2.19",
+        "laminas/laminas-servicemanager": "^3.16",
+        "laminas/laminas-stdlib": "^3.11",
         "lcobucci/jwt": "^4.1",
-        "league/uri": "^6.4",
+        "league/uri": "^6.7",
         "lstrojny/functional-php": "^1.17",
-        "mezzio/mezzio": "^3.7",
-        "mezzio/mezzio-fastroute": "^3.3",
-        "mezzio/mezzio-problem-details": "^1.5",
-        "mezzio/mezzio-swoole": "^4.0",
-        "mlocati/ip-lib": "^1.17",
-        "monolog/monolog": "^2.3",
-        "nikolaposa/monolog-factory": "^3.1",
-        "ocramius/proxy-manager": "^2.11",
-        "pagerfanta/core": "^3.5",
-        "php-amqplib/php-amqplib": "^3.1",
+        "mezzio/mezzio": "^3.11",
+        "mezzio/mezzio-fastroute": "^3.5",
+        "mezzio/mezzio-problem-details": "^1.6",
+        "mezzio/mezzio-swoole": "^4.3",
+        "mlocati/ip-lib": "^1.18",
+        "ocramius/proxy-manager": "^2.14",
+        "pagerfanta/core": "^3.6",
         "php-middleware/request-id": "^4.1",
-        "predis/predis": "^1.1",
         "pugx/shortid-php": "^1.0",
-        "ramsey/uuid": "^4.2",
-        "shlinkio/shlink-common": "^4.4",
+        "ramsey/uuid": "^4.3",
+        "shlinkio/shlink-common": "^4.5",
         "shlinkio/shlink-config": "^1.6",
-        "shlinkio/shlink-event-dispatcher": "^2.3",
-        "shlinkio/shlink-importer": "^2.5",
-        "shlinkio/shlink-installer": "^7.0",
+        "shlinkio/shlink-event-dispatcher": "^2.4",
+        "shlinkio/shlink-importer": "^3.0",
+        "shlinkio/shlink-installer": "^8.0",
         "shlinkio/shlink-ip-geolocation": "^2.2",
-        "symfony/console": "^6.0",
-        "symfony/filesystem": "^6.0",
-        "symfony/lock": "^6.0",
-        "symfony/mercure": "^0.6",
-        "symfony/process": "^6.0",
-        "symfony/string": "^6.0"
+        "symfony/console": "^6.1",
+        "symfony/filesystem": "^6.1",
+        "symfony/lock": "^6.1",
+        "symfony/process": "^6.1",
+        "symfony/string": "^6.1"
     },
     "require-dev": {
-        "cebe/php-openapi": "^1.5",
+        "cebe/php-openapi": "^1.7",
         "devster/ubench": "^2.1",
         "dms/phpunit-arraysubset-asserts": "^0.3.0",
-        "infection/infection": "^0.26",
-        "openswoole/ide-helper": "~4.9.1",
+        "infection/infection": "^0.26.5",
+        "openswoole/ide-helper": "~4.11.1",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/phpstan": "^1.2",
-        "phpstan/phpstan-doctrine": "^1.0",
-        "phpstan/phpstan-symfony": "^1.0",
+        "phpstan/phpstan": "^1.8",
+        "phpstan/phpstan-doctrine": "^1.3",
+        "phpstan/phpstan-symfony": "^1.2",
         "phpunit/php-code-coverage": "^9.2",
         "phpunit/phpunit": "^9.5",
         "roave/security-advisories": "dev-master",
-        "shlinkio/php-coding-standard": "~2.2.0",
-        "shlinkio/shlink-test-utils": "^3.0",
-        "symfony/var-dumper": "^6.0",
+        "shlinkio/php-coding-standard": "~2.3.0",
+        "shlinkio/shlink-test-utils": "^3.0.1",
+        "symfony/var-dumper": "^6.1",
         "veewee/composer-run-parallel": "^1.1"
     },
     "autoload": {
@@ -139,7 +134,7 @@
         "test:api": "bin/test/run-api-tests.sh",
         "test:api:ci": "GENERATE_COVERAGE=yes composer test:api",
         "infect:ci:base": "infection --threads=4 --log-verbosity=default --only-covered --only-covering-test-cases --skip-initial-tests",
-        "infect:ci:unit": "@infect:ci:base --coverage=build/coverage-unit --min-msi=80",
+        "infect:ci:unit": "@infect:ci:base --coverage=build/coverage-unit --min-msi=84",
         "infect:ci:db": "@infect:ci:base --coverage=build/coverage-db --min-msi=95 --configuration=infection-db.json",
         "infect:ci:api": "@infect:ci:base --coverage=build/coverage-api --min-msi=80 --configuration=infection-api.json",
         "infect:ci": "@parallel infect:ci:unit infect:ci:db infect:ci:api",
@@ -176,7 +171,7 @@
         "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 Miscrosoft SQL Server 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 reports</>",
         "infect:ci": "<fg=blue;options=bold>Checks unit and db tests quality applying mutation testing with existing reports and logs</>",

config/autoload/app_options.local.php.dist

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'app_options' => [
+        'version' => 'latest',
+    ],
+
+];

config/autoload/delete_short_urls.global.php

@@ -7,7 +7,7 @@ namespace Shlinkio\Shlink;
 use Shlinkio\Shlink\Core\Config\EnvVars;
 
 return (static function (): array {
-    $threshold = EnvVars::DELETE_SHORT_URL_THRESHOLD()->loadFromEnv();
+    $threshold = EnvVars::DELETE_SHORT_URL_THRESHOLD->loadFromEnv();
 
     return [
 

config/autoload/entity-manager.global.php

@@ -8,7 +8,7 @@ use Shlinkio\Shlink\Core\Config\EnvVars;
 use function Functional\contains;
 
 return (static function (): array {
-    $driver = EnvVars::DB_DRIVER()->loadFromEnv();
+    $driver = EnvVars::DB_DRIVER->loadFromEnv();
     $isMysqlCompatible = contains(['maria', 'mysql'], $driver);
 
     $resolveDriver = static fn () => match ($driver) {
@@ -35,12 +35,12 @@ return (static function (): array {
         ],
         default => [
             'driver' => $resolveDriver(),
-            'dbname' => EnvVars::DB_NAME()->loadFromEnv('shlink'),
-            'user' => EnvVars::DB_USER()->loadFromEnv(),
-            'password' => EnvVars::DB_PASSWORD()->loadFromEnv(),
-            'host' => EnvVars::DB_HOST()->loadFromEnv(EnvVars::DB_UNIX_SOCKET()->loadFromEnv()),
-            'port' => EnvVars::DB_PORT()->loadFromEnv($resolveDefaultPort()),
-            'unix_socket' => $isMysqlCompatible ? EnvVars::DB_UNIX_SOCKET()->loadFromEnv() : null,
+            'dbname' => EnvVars::DB_NAME->loadFromEnv('shlink'),
+            'user' => EnvVars::DB_USER->loadFromEnv(),
+            'password' => EnvVars::DB_PASSWORD->loadFromEnv(),
+            'host' => EnvVars::DB_HOST->loadFromEnv(EnvVars::DB_UNIX_SOCKET->loadFromEnv()),
+            'port' => EnvVars::DB_PORT->loadFromEnv($resolveDefaultPort()),
+            'unix_socket' => $isMysqlCompatible ? EnvVars::DB_UNIX_SOCKET->loadFromEnv() : null,
             'charset' => $resolveCharset(),
         ],
     };

config/autoload/geolite2.global.php

@@ -9,7 +9,7 @@ return [
     'geolite2' => [
         'db_location' => __DIR__ . '/../../data/GeoLite2-City.mmdb',
         'temp_dir' => __DIR__ . '/../../data',
-        'license_key' => EnvVars::GEOLITE_LICENSE_KEY()->loadFromEnv(),
+        'license_key' => EnvVars::GEOLITE_LICENSE_KEY->loadFromEnv(),
     ],
 
 ];

config/autoload/installer.global.php

@@ -27,10 +27,12 @@ return [
             Option\Redirect\Regular404RedirectConfigOption::class,
             Option\Visit\VisitsThresholdConfigOption::class,
             Option\BasePathConfigOption::class,
+            Option\TimezoneConfigOption::class,
             Option\Worker\TaskWorkerNumConfigOption::class,
             Option\Worker\WebWorkerNumConfigOption::class,
             Option\Redis\RedisServersConfigOption::class,
             Option\Redis\RedisSentinelServiceConfigOption::class,
+            Option\Redis\RedisPubSubConfigOption::class,
             Option\UrlShortener\ShortCodeLengthOption::class,
             Option\Mercure\EnableMercureConfigOption::class,
             Option\Mercure\MercurePublicUrlConfigOption::class,
@@ -41,6 +43,7 @@ return [
             Option\UrlShortener\RedirectCacheLifeTimeConfigOption::class,
             Option\UrlShortener\AutoResolveTitlesConfigOption::class,
             Option\UrlShortener\AppendExtraPathConfigOption::class,
+            Option\UrlShortener\EnableMultiSegmentSlugsConfigOption::class,
             Option\Tracking\IpAnonymizationConfigOption::class,
             Option\Tracking\OrphanVisitsTrackingConfigOption::class,
             Option\Tracking\DisableTrackParamConfigOption::class,
@@ -63,13 +66,13 @@ return [
         ],
 
         'installation_commands' => [
-            InstallationCommand::DB_CREATE_SCHEMA => [
+            InstallationCommand::DB_CREATE_SCHEMA->value => [
                 'command' => 'bin/cli ' . Command\Db\CreateDatabaseCommand::NAME,
             ],
-            InstallationCommand::DB_MIGRATE => [
+            InstallationCommand::DB_MIGRATE->value => [
                 'command' => 'bin/cli ' . Command\Db\MigrateDatabaseCommand::NAME,
             ],
-            InstallationCommand::GEOLITE_DOWNLOAD_DB => [
+            InstallationCommand::GEOLITE_DOWNLOAD_DB->value => [
                 'command' => 'bin/cli ' . Command\Visit\DownloadGeoLiteDbCommand::NAME,
             ],
         ],

config/autoload/locks.global.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Predis\ClientInterface as PredisClient;
+use Shlinkio\Shlink\Common\Cache\RedisFactory;
 use Shlinkio\Shlink\Common\Logger\LoggerAwareDelegatorFactory;
 use Shlinkio\Shlink\Core\Config\EnvVars;
 use Symfony\Component\Lock;
@@ -24,7 +24,7 @@ return [
             LOCAL_LOCK_FACTORY => ConfigAbstractFactory::class,
         ],
         'aliases' => [
-            'lock_store' => EnvVars::REDIS_SERVERS()->existsInEnv() ? 'redis_lock_store' : 'local_lock_store',
+            'lock_store' => EnvVars::REDIS_SERVERS->existsInEnv() ? 'redis_lock_store' : 'local_lock_store',
 
             'redis_lock_store' => Lock\Store\RedisStore::class,
             'local_lock_store' => Lock\Store\FlockStore::class,
@@ -38,7 +38,7 @@ return [
 
     ConfigAbstractFactory::class => [
         Lock\Store\FlockStore::class => ['config.locks.locks_dir'],
-        Lock\Store\RedisStore::class => [PredisClient::class],
+        Lock\Store\RedisStore::class => [RedisFactory::SERVICE_NAME],
         Lock\LockFactory::class => ['lock_store'],
         LOCAL_LOCK_FACTORY => ['local_lock_store'],
     ],

config/autoload/logger.global.php

@@ -4,72 +4,36 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use Monolog\Formatter;
-use Monolog\Handler;
+use Monolog\Level;
 use Monolog\Logger;
-use Monolog\Processor;
-use MonologFactory\DiContainerLoggerFactory;
 use PhpMiddleware\RequestId;
 use Psr\Log\LoggerInterface;
+use Shlinkio\Shlink\Common\Logger\LoggerFactory;
+use Shlinkio\Shlink\Common\Logger\LoggerType;
 
-use const PHP_EOL;
-
-$processors = [
-    'exception_with_new_line' => [
-        'name' => Common\Logger\Processor\ExceptionWithNewLineProcessor::class,
-    ],
-    'psr3' => [
-        'name' => Processor\PsrLogMessageProcessor::class,
-    ],
-    'request_id' => RequestId\MonologProcessor::class,
-];
-$formatter = [
-    'name' => Formatter\LineFormatter::class,
-    'params' => [
-        'format' => '[%datetime%] [%extra.request_id%] %channel%.%level_name% - %message%' . PHP_EOL,
-        'allow_inline_line_breaks' => true,
-    ],
+$common = [
+    'level' => Level::Info->value,
+    'processors' => [RequestId\MonologProcessor::class],
+    'line_format' => '[%datetime%] [%extra.request_id%] %channel%.%level_name% - %message%',
 ];
 
 return [
 
     'logger' => [
         'Shlink' => [
-            'name' => 'Shlink',
-            'handlers' => [
-                'shlink_handler' => [
-                    'name' => Handler\RotatingFileHandler::class,
-                    'params' => [
-                        'level' => Logger::INFO,
-                        'filename' => 'data/log/shlink_log.log',
-                        'max_files' => 30,
-                        'file_permission' => 0666,
-                    ],
-                    'formatter' => $formatter,
-                ],
-            ],
-            'processors' => $processors,
+            'type' => LoggerType::FILE->value,
+            ...$common,
         ],
         'Access' => [
-            'name' => 'Access',
-            'handlers' => [
-                'access_handler' => [
-                    'name' => Handler\StreamHandler::class,
-                    'params' => [
-                        'level' => Logger::INFO,
-                        'stream' => 'php://stdout',
-                    ],
-                    'formatter' => $formatter,
-                ],
-            ],
-            'processors' => $processors,
+            'type' => LoggerType::STREAM->value,
+            ...$common,
         ],
     ],
 
     'dependencies' => [
         'factories' => [
-            'Logger_Shlink' => [DiContainerLoggerFactory::class, 'Shlink'],
-            'Logger_Access' => [DiContainerLoggerFactory::class, 'Access'],
+            'Logger_Shlink' => [LoggerFactory::class, 'Shlink'],
+            'Logger_Access' => [LoggerFactory::class, 'Access'],
         ],
         'aliases' => [
             'logger' => 'Logger_Shlink',

config/autoload/logger.local.php.dist

@@ -2,33 +2,18 @@
 
 declare(strict_types=1);
 
-use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
+use Monolog\Level;
+use Shlinkio\Shlink\Common\Logger\LoggerType;
 
 $isSwoole = extension_loaded('openswoole');
 
-// For swoole, send logs to standard output
-$handler = $isSwoole
-    ? [
-        'name' => StreamHandler::class,
-        'params' => [
-            'level' => Logger::DEBUG,
-            'stream' => 'php://stdout',
-        ],
-    ]
-    : [
-        'params' => [
-            'level' => Logger::DEBUG,
-        ],
-    ];
-
 return [
 
     'logger' => [
         'Shlink' => [
-            'handlers' => [
-                'shlink_handler' => $handler,
-            ],
+            // For swoole, send logs as stream
+            'type' => $isSwoole ? LoggerType::STREAM->value : LoggerType::FILE->value,
+            'level' => Level::Debug->value,
         ],
     ],
 

config/autoload/mercure.global.php

@@ -9,14 +9,14 @@ use Symfony\Component\Mercure\Hub;
 use Symfony\Component\Mercure\HubInterface;
 
 return (static function (): array {
-    $publicUrl = EnvVars::MERCURE_PUBLIC_HUB_URL()->loadFromEnv();
+    $publicUrl = EnvVars::MERCURE_PUBLIC_HUB_URL->loadFromEnv();
 
     return [
 
         'mercure' => [
             'public_hub_url' => $publicUrl,
-            'internal_hub_url' => EnvVars::MERCURE_INTERNAL_HUB_URL()->loadFromEnv($publicUrl),
-            'jwt_secret' => EnvVars::MERCURE_JWT_SECRET()->loadFromEnv(),
+            'internal_hub_url' => EnvVars::MERCURE_INTERNAL_HUB_URL->loadFromEnv($publicUrl),
+            'jwt_secret' => EnvVars::MERCURE_JWT_SECRET->loadFromEnv(),
             'jwt_issuer' => 'Shlink',
         ],
 

config/autoload/qr-codes.global.php

@@ -13,13 +13,13 @@ use const Shlinkio\Shlink\DEFAULT_QR_CODE_SIZE;
 return [
 
     'qr_codes' => [
-        'size' => (int) EnvVars::DEFAULT_QR_CODE_SIZE()->loadFromEnv(DEFAULT_QR_CODE_SIZE),
-        'margin' => (int) EnvVars::DEFAULT_QR_CODE_MARGIN()->loadFromEnv(DEFAULT_QR_CODE_MARGIN),
-        'format' => EnvVars::DEFAULT_QR_CODE_FORMAT()->loadFromEnv(DEFAULT_QR_CODE_FORMAT),
-        'error_correction' => EnvVars::DEFAULT_QR_CODE_ERROR_CORRECTION()->loadFromEnv(
+        'size' => (int) EnvVars::DEFAULT_QR_CODE_SIZE->loadFromEnv(DEFAULT_QR_CODE_SIZE),
+        'margin' => (int) EnvVars::DEFAULT_QR_CODE_MARGIN->loadFromEnv(DEFAULT_QR_CODE_MARGIN),
+        'format' => EnvVars::DEFAULT_QR_CODE_FORMAT->loadFromEnv(DEFAULT_QR_CODE_FORMAT),
+        'error_correction' => EnvVars::DEFAULT_QR_CODE_ERROR_CORRECTION->loadFromEnv(
             DEFAULT_QR_CODE_ERROR_CORRECTION,
         ),
-        'round_block_size' => (bool) EnvVars::DEFAULT_QR_CODE_ROUND_BLOCK_SIZE()->loadFromEnv(
+        'round_block_size' => (bool) EnvVars::DEFAULT_QR_CODE_ROUND_BLOCK_SIZE->loadFromEnv(
             DEFAULT_QR_CODE_ROUND_BLOCK_SIZE,
         ),
     ],

config/autoload/rabbit.global.php

@@ -2,46 +2,20 @@
 
 declare(strict_types=1);
 
-use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Laminas\ServiceManager\Proxy\LazyServiceFactory;
-use PhpAmqpLib\Connection\AMQPStreamConnection;
 use Shlinkio\Shlink\Core\Config\EnvVars;
 
 return [
 
     'rabbitmq' => [
-        'enabled' => (bool) EnvVars::RABBITMQ_ENABLED()->loadFromEnv(false),
-        'host' => EnvVars::RABBITMQ_HOST()->loadFromEnv(),
-        'port' => (int) EnvVars::RABBITMQ_PORT()->loadFromEnv('5672'),
-        'user' => EnvVars::RABBITMQ_USER()->loadFromEnv(),
-        'password' => EnvVars::RABBITMQ_PASSWORD()->loadFromEnv(),
-        'vhost' => EnvVars::RABBITMQ_VHOST()->loadFromEnv('/'),
-    ],
+        'enabled' => (bool) EnvVars::RABBITMQ_ENABLED->loadFromEnv(false),
+        'host' => EnvVars::RABBITMQ_HOST->loadFromEnv(),
+        'port' => (int) EnvVars::RABBITMQ_PORT->loadFromEnv('5672'),
+        'user' => EnvVars::RABBITMQ_USER->loadFromEnv(),
+        'password' => EnvVars::RABBITMQ_PASSWORD->loadFromEnv(),
+        'vhost' => EnvVars::RABBITMQ_VHOST->loadFromEnv('/'),
 
-    'dependencies' => [
-        'factories' => [
-            AMQPStreamConnection::class => ConfigAbstractFactory::class,
-        ],
-        'delegators' => [
-            AMQPStreamConnection::class => [
-                LazyServiceFactory::class,
-            ],
-        ],
-        'lazy_services' => [
-            'class_map' => [
-                AMQPStreamConnection::class => AMQPStreamConnection::class,
-            ],
-        ],
-    ],
-
-    ConfigAbstractFactory::class => [
-        AMQPStreamConnection::class => [
-            'config.rabbitmq.host',
-            'config.rabbitmq.port',
-            'config.rabbitmq.user',
-            'config.rabbitmq.password',
-            'config.rabbitmq.vhost',
-        ],
+        // Deprecated
+        'legacy_visits_publishing' => (bool) EnvVars::RABBITMQ_LEGACY_VISITS_PUBLISHING->loadFromEnv(false),
     ],
 
 ];

config/autoload/redirects.global.php

@@ -10,14 +10,14 @@ use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE;
 return [
 
     'not_found_redirects' => [
-        'invalid_short_url' => EnvVars::DEFAULT_INVALID_SHORT_URL_REDIRECT()->loadFromEnv(),
-        'regular_404' => EnvVars::DEFAULT_REGULAR_404_REDIRECT()->loadFromEnv(),
-        'base_url' => EnvVars::DEFAULT_BASE_URL_REDIRECT()->loadFromEnv(),
+        'invalid_short_url' => EnvVars::DEFAULT_INVALID_SHORT_URL_REDIRECT->loadFromEnv(),
+        'regular_404' => EnvVars::DEFAULT_REGULAR_404_REDIRECT->loadFromEnv(),
+        'base_url' => EnvVars::DEFAULT_BASE_URL_REDIRECT->loadFromEnv(),
     ],
 
     'redirects' => [
-        'redirect_status_code' => (int) EnvVars::REDIRECT_STATUS_CODE()->loadFromEnv(DEFAULT_REDIRECT_STATUS_CODE),
-        'redirect_cache_lifetime' => (int) EnvVars::REDIRECT_CACHE_LIFETIME()->loadFromEnv(
+        'redirect_status_code' => (int) EnvVars::REDIRECT_STATUS_CODE->loadFromEnv(DEFAULT_REDIRECT_STATUS_CODE),
+        'redirect_cache_lifetime' => (int) EnvVars::REDIRECT_CACHE_LIFETIME->loadFromEnv(
             DEFAULT_REDIRECT_CACHE_LIFETIME,
         ),
     ],

config/autoload/redis.global.php

@@ -5,17 +5,23 @@ declare(strict_types=1);
 use Shlinkio\Shlink\Core\Config\EnvVars;
 
 return (static function (): array {
-    $redisServers = EnvVars::REDIS_SERVERS()->loadFromEnv();
+    $redisServers = EnvVars::REDIS_SERVERS->loadFromEnv();
+    $pubSub = [
+        'redis' => [
+            'pub_sub_enabled' => $redisServers !== null && EnvVars::REDIS_PUB_SUB_ENABLED->loadFromEnv(false),
+        ],
+    ];
 
     return match ($redisServers) {
-        null => [],
+        null => $pubSub,
         default => [
             'cache' => [
                 'redis' => [
                     'servers' => $redisServers,
-                    'sentinel_service' => EnvVars::REDIS_SENTINEL_SERVICE()->loadFromEnv(),
+                    'sentinel_service' => EnvVars::REDIS_SENTINEL_SERVICE->loadFromEnv(),
                 ],
             ],
+            ...$pubSub,
         ],
     };
 })();

config/autoload/redis.local.php.local

@@ -7,12 +7,13 @@ return [
     'cache' => [
         'redis' => [
             'servers' => 'tcp://shlink_redis:6379',
-//            'servers' => [
-//                'tcp://shlink_redis:6379',
-//            ],
         ],
     ],
 
+    'redis' => [
+        'pub_sub_enabled' => true,
+    ],
+
     'dependencies' => [
         'aliases' => [
             // With this config, a user could alias 'lock_store' => 'redis_lock_store' to override the default

config/autoload/request_id.global.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Laminas\ServiceManager\Factory\InvokableFactory;
 use PhpMiddleware\RequestId;
+use Shlinkio\Shlink\Common\Logger\Processor\BackwardsCompatibleMonologProcessorDelegator;
 
 return [
 
@@ -20,6 +21,11 @@ return [
             RequestId\RequestIdMiddleware::class => ConfigAbstractFactory::class,
             RequestId\MonologProcessor::class => ConfigAbstractFactory::class,
         ],
+        'delegators' => [
+            RequestId\MonologProcessor::class => [
+                BackwardsCompatibleMonologProcessorDelegator::class,
+            ],
+        ],
     ],
 
     ConfigAbstractFactory::class => [

config/autoload/router.global.php

@@ -8,7 +8,7 @@ use Shlinkio\Shlink\Core\Config\EnvVars;
 return [
 
     'router' => [
-        'base_path' => EnvVars::BASE_PATH()->loadFromEnv(''),
+        'base_path' => EnvVars::BASE_PATH->loadFromEnv(''),
 
         'fastroute' => [
             FastRouteRouter::CONFIG_CACHE_ENABLED => true,

config/autoload/routes.config.php

@@ -0,0 +1,107 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink;
+
+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\Rest\Action;
+use Shlinkio\Shlink\Rest\ConfigProvider;
+use Shlinkio\Shlink\Rest\Middleware;
+use Shlinkio\Shlink\Rest\Middleware\Mercure\NotConfiguredMercureErrorHandler;
+
+use function sprintf;
+
+// The order of the routes defined here matters. Changing it might cause path conflicts
+return (static function (): array {
+    $contentNegotiationMiddleware = Middleware\ShortUrl\CreateShortUrlContentNegotiationMiddleware::class;
+    $dropDomainMiddleware = Middleware\ShortUrl\DropDefaultDomainFromRequestMiddleware::class;
+    $overrideDomainMiddleware = Middleware\ShortUrl\OverrideDomainMiddleware::class;
+    $multiSegment = (bool) EnvVars::MULTI_SEGMENT_SLUGS_ENABLED->loadFromEnv(false);
+
+    return [
+
+        'routes' => [
+            // Rest
+            ...ConfigProvider::applyRoutesPrefix([
+                Action\HealthAction::getRouteDef(),
+
+                // Visits
+                Action\Visit\ShortUrlVisitsAction::getRouteDef([$dropDomainMiddleware]),
+                Action\Visit\TagVisitsAction::getRouteDef(),
+                Action\Visit\DomainVisitsAction::getRouteDef(),
+                Action\Visit\GlobalVisitsAction::getRouteDef(),
+                Action\Visit\OrphanVisitsAction::getRouteDef(),
+                Action\Visit\NonOrphanVisitsAction::getRouteDef(),
+
+                // Short URLs
+                Action\ShortUrl\CreateShortUrlAction::getRouteDef([
+                    $contentNegotiationMiddleware,
+                    $dropDomainMiddleware,
+                    $overrideDomainMiddleware,
+                    Middleware\ShortUrl\DefaultShortCodesLengthMiddleware::class,
+                ]),
+                Action\ShortUrl\SingleStepCreateShortUrlAction::getRouteDef([
+                    $contentNegotiationMiddleware,
+                    $overrideDomainMiddleware,
+                ]),
+                Action\ShortUrl\EditShortUrlAction::getRouteDef([$dropDomainMiddleware]),
+                Action\ShortUrl\DeleteShortUrlAction::getRouteDef([$dropDomainMiddleware]),
+                Action\ShortUrl\ResolveShortUrlAction::getRouteDef([$dropDomainMiddleware]),
+                Action\ShortUrl\ListShortUrlsAction::getRouteDef(),
+
+                // Tags
+                Action\Tag\ListTagsAction::getRouteDef(),
+                Action\Tag\TagsStatsAction::getRouteDef(),
+                Action\Tag\DeleteTagsAction::getRouteDef(),
+                Action\Tag\UpdateTagAction::getRouteDef(),
+
+                // Domains
+                Action\Domain\ListDomainsAction::getRouteDef(),
+                Action\Domain\DomainRedirectsAction::getRouteDef(),
+
+                Action\MercureInfoAction::getRouteDef([NotConfiguredMercureErrorHandler::class]),
+            ], $multiSegment),
+
+            // Non-rest
+            [
+                'name' => CoreAction\RobotsAction::class,
+                'path' => '/robots.txt',
+                'middleware' => [
+                    CoreAction\RobotsAction::class,
+                ],
+                'allowed_methods' => [RequestMethodInterface::METHOD_GET],
+            ],
+            [
+                'name' => CoreAction\PixelAction::class,
+                'path' => sprintf('/{shortCode%s}/track', $multiSegment ? ':.+' : ''),
+                'middleware' => [
+                    IpAddress::class,
+                    CoreAction\PixelAction::class,
+                ],
+                'allowed_methods' => [RequestMethodInterface::METHOD_GET],
+            ],
+            [
+                'name' => CoreAction\QrCodeAction::class,
+                'path' => sprintf('/{shortCode%s}/qr-code', $multiSegment ? ':.+' : ''),
+                'middleware' => [
+                    CoreAction\QrCodeAction::class,
+                ],
+                'allowed_methods' => [RequestMethodInterface::METHOD_GET],
+            ],
+            [
+                'name' => CoreAction\RedirectAction::class,
+                'path' => sprintf('/{shortCode%s}', $multiSegment ? ':.+' : ''),
+                'middleware' => [
+                    IpAddress::class,
+                    CoreAction\RedirectAction::class,
+                ],
+                'allowed_methods' => [RequestMethodInterface::METHOD_GET],
+            ],
+        ],
+
+    ];
+})();

config/autoload/swoole.global.php

@@ -6,8 +6,8 @@ use Shlinkio\Shlink\Core\Config\EnvVars;
 
 use const Shlinkio\Shlink\MIN_TASK_WORKERS;
 
-return (static function () {
-    $taskWorkers = (int) EnvVars::TASK_WORKER_NUM()->loadFromEnv(16);
+return (static function (): array {
+    $taskWorkers = (int) EnvVars::TASK_WORKER_NUM->loadFromEnv(16);
 
     return [
 
@@ -17,11 +17,11 @@ return (static function () {
 
             'swoole-http-server' => [
                 'host' => '0.0.0.0',
-                'port' => (int) EnvVars::PORT()->loadFromEnv(8080),
+                'port' => (int) EnvVars::PORT->loadFromEnv(8080),
                 'process-name' => 'shlink',
 
                 'options' => [
-                    'worker_num' => (int) EnvVars::WEB_WORKER_NUM()->loadFromEnv(16),
+                    'worker_num' => (int) EnvVars::WEB_WORKER_NUM->loadFromEnv(16),
                     'task_worker_num' => max($taskWorkers, MIN_TASK_WORKERS),
                 ],
             ],

config/autoload/tracking.global.php

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

config/autoload/url-shortener.global.php

@@ -9,20 +9,21 @@ use const Shlinkio\Shlink\MIN_SHORT_CODES_LENGTH;
 
 return (static function (): array {
     $shortCodesLength = max(
-        (int) EnvVars::DEFAULT_SHORT_CODES_LENGTH()->loadFromEnv(DEFAULT_SHORT_CODES_LENGTH),
+        (int) EnvVars::DEFAULT_SHORT_CODES_LENGTH->loadFromEnv(DEFAULT_SHORT_CODES_LENGTH),
         MIN_SHORT_CODES_LENGTH,
     );
 
     return [
 
         'url_shortener' => [
-            'domain' => [
-                'schema' => ((bool) EnvVars::IS_HTTPS_ENABLED()->loadFromEnv(true)) ? 'https' : 'http',
-                'hostname' => EnvVars::DEFAULT_DOMAIN()->loadFromEnv(''),
+            'domain' => [ // TODO Refactor this structure to url_shortener.schema and url_shortener.default_domain
+                'schema' => ((bool) EnvVars::IS_HTTPS_ENABLED->loadFromEnv(true)) ? 'https' : 'http',
+                'hostname' => EnvVars::DEFAULT_DOMAIN->loadFromEnv(''),
             ],
             'default_short_codes_length' => $shortCodesLength,
-            'auto_resolve_titles' => (bool) EnvVars::AUTO_RESOLVE_TITLES()->loadFromEnv(false),
-            'append_extra_path' => (bool) EnvVars::REDIRECT_APPEND_EXTRA_PATH()->loadFromEnv(false),
+            'auto_resolve_titles' => (bool) EnvVars::AUTO_RESOLVE_TITLES->loadFromEnv(false),
+            'append_extra_path' => (bool) EnvVars::REDIRECT_APPEND_EXTRA_PATH->loadFromEnv(false),
+            'multi_segment_slugs_enabled' => (bool) EnvVars::MULTI_SEGMENT_SLUGS_ENABLED->loadFromEnv(false),
         ],
 
     ];

config/autoload/webhooks.global.php

@@ -4,15 +4,16 @@ declare(strict_types=1);
 
 use Shlinkio\Shlink\Core\Config\EnvVars;
 
+// Deprecated. Webhooks are no longer supported. To be removed in Shlink 4.0.0
 return (static function (): array {
-    $webhooks = EnvVars::VISITS_WEBHOOKS()->loadFromEnv();
+    $webhooks = EnvVars::VISITS_WEBHOOKS->loadFromEnv();
 
     return [
 
         'visits_webhooks' => [
             'webhooks' => $webhooks === null ? [] : explode(',', $webhooks),
             'notify_orphan_visits_to_webhooks' =>
-                (bool) EnvVars::NOTIFY_ORPHAN_VISITS_TO_WEBHOOKS()->loadFromEnv(false),
+                (bool) EnvVars::NOTIFY_ORPHAN_VISITS_TO_WEBHOOKS->loadFromEnv(false),
         ],
 
     ];

config/cli-app.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Application as CliApp;
 
-return (static function () {
+return (static function (): CliApp {
     /** @var ContainerInterface $container */
     $container = include __DIR__ . '/container.php';
     return $container->get(CliApp::class);

config/config.php

@@ -43,6 +43,8 @@ return (new ConfigAggregator\ConfigAggregator([
     $isTestEnv
         ? new ConfigAggregator\PhpFileProvider('config/test/*.global.php')
         : new ConfigAggregator\ArrayProvider([]),
+    // Routes have to be loaded last
+    new ConfigAggregator\PhpFileProvider('config/autoload/routes.config.php'),
 ], 'data/cache/app_config.php', [
     Core\Config\BasePathPrefixer::class,
 ]))->getMergedConfig();

config/constants.php

@@ -19,3 +19,4 @@ const DEFAULT_QR_CODE_FORMAT = 'png';
 const DEFAULT_QR_CODE_ERROR_CORRECTION = 'l';
 const DEFAULT_QR_CODE_ROUND_BLOCK_SIZE = true;
 const MIN_TASK_WORKERS = 4;
+const MIGRATIONS_TABLE = 'migrations';

config/container.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Laminas\ServiceManager\ServiceManager;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Symfony\Component\Lock;
 
 use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;
@@ -11,6 +12,9 @@ chdir(dirname(__DIR__));
 
 require 'vendor/autoload.php';
 
+// This is one of the first files loaded. Configure the timezone here
+date_default_timezone_set(EnvVars::TIMEZONE->loadFromEnv(date_default_timezone_get()));
+
 // This class alias tricks the ConfigAbstractFactory to return Lock\Factory instances even with a different service name
 // It needs to be placed here as individual config files will not be loaded once config is cached
 if (! class_exists(LOCAL_LOCK_FACTORY)) {
@@ -18,7 +22,7 @@ if (! class_exists(LOCAL_LOCK_FACTORY)) {
 }
 
 // Build container
-return (function () {
+return (static function (): ServiceManager {
     $config = require __DIR__ . '/config.php';
     $container = new ServiceManager($config['dependencies']);
     $container->setService('config', $config);

config/entity-manager.php

@@ -3,9 +3,10 @@
 declare(strict_types=1);
 
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Psr\Container\ContainerInterface;
 
-return (static function () {
+return (static function (): EntityManagerInterface {
     /** @var ContainerInterface $container */
     $container = include __DIR__ . '/container.php';
     return $container->get(EntityManager::class);

config/test/bootstrap_db_tests.php

@@ -8,5 +8,5 @@ use Psr\Container\ContainerInterface;
 
 /** @var ContainerInterface $container */
 $container = require __DIR__ . '/../container.php';
-$container->get(Helper\TestHelper::class)->createTestDb();
+$container->get(Helper\TestHelper::class)->createTestDb(['bin/cli', 'db:create'], ['bin/cli', 'db:migrate']);
 DbTest\DatabaseTestCase::setEntityManager($container->get('em'));

config/test/test_config.global.php

@@ -8,8 +8,7 @@ use GuzzleHttp\Client;
 use Laminas\ConfigAggregator\ConfigAggregator;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Laminas\ServiceManager\Factory\InvokableFactory;
-use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
+use Monolog\Level;
 use PHPUnit\Runner\Version;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -20,6 +19,7 @@ use SebastianBergmann\CodeCoverage\Filter;
 use SebastianBergmann\CodeCoverage\Report\Html\Facade as Html;
 use SebastianBergmann\CodeCoverage\Report\PHP;
 use SebastianBergmann\CodeCoverage\Report\Xml\Facade as Xml;
+use Shlinkio\Shlink\Common\Logger\LoggerType;
 
 use function Laminas\Stratigility\middleware;
 use function Shlinkio\Shlink\Config\env;
@@ -76,16 +76,10 @@ $buildDbConnection = static function (): array {
     };
 };
 
-$buildTestLoggerConfig = fn (string $handlerName, string $filename) => [
-    'handlers' => [
-        $handlerName => [
-            'name' => StreamHandler::class,
-            'params' => [
-                'level' => Logger::DEBUG,
-                'stream' => sprintf('data/log/api-tests/%s', $filename),
-            ],
-        ],
-    ],
+$buildTestLoggerConfig = static fn (string $filename) => [
+    'level' => Level::Debug->value,
+    'type' => LoggerType::STREAM->value,
+    'destination' => sprintf('data/log/api-tests/%s', $filename),
 ];
 
 return [
@@ -183,8 +177,8 @@ return [
     ],
 
     'logger' => [
-        'Shlink' => $buildTestLoggerConfig('shlink_handler', 'shlink.log'),
-        'Access' => $buildTestLoggerConfig('access_handler', 'access.log'),
+        'Shlink' => $buildTestLoggerConfig('shlink.log'),
+        'Access' => $buildTestLoggerConfig('access.log'),
     ],
 
 ];

data/infra/examples/nginx-vhost.conf

@@ -11,7 +11,7 @@ server {
 
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/var/run/php/php8.0-fpm.sock;
+        fastcgi_pass unix:/var/run/php/php8.1-fpm.sock;
         fastcgi_index index.php;
         include fastcgi.conf;
     }

data/infra/php.Dockerfile

@@ -1,15 +1,14 @@
-FROM php:8.1.1-fpm-alpine3.15
+FROM php:8.1.9-fpm-alpine3.16
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.21
-ENV PDO_SQLSRV_VERSION 5.10.0
+ENV PDO_SQLSRV_VERSION 5.10.1
 ENV MS_ODBC_SQL_VERSION 17.5.2.2
 
 RUN apk update
 
 # Install common php extensions
 RUN docker-php-ext-install pdo_mysql
-RUN docker-php-ext-install iconv
 RUN docker-php-ext-install calendar
 
 RUN apk add --no-cache oniguruma-dev

data/infra/swoole.Dockerfile

@@ -1,17 +1,16 @@
-FROM php:8.1.1-alpine3.15
+FROM php:8.1.9-alpine3.16
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.21
 ENV INOTIFY_VERSION 3.0.0
-ENV OPENSWOOLE_VERSION 4.9.1
-ENV PDO_SQLSRV_VERSION 5.10.0
+ENV OPENSWOOLE_VERSION 4.11.1
+ENV PDO_SQLSRV_VERSION 5.10.1
 ENV MS_ODBC_SQL_VERSION 17.5.2.2
 
 RUN apk update
 
 # Install common php extensions
 RUN docker-php-ext-install pdo_mysql
-RUN docker-php-ext-install iconv
 RUN docker-php-ext-install calendar
 
 RUN apk add --no-cache oniguruma-dev

data/migrations/Version20210207100807.php

@@ -8,8 +8,8 @@ use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
-use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\Visit\Model\VisitType;
 
 final class Version20210207100807 extends AbstractMigration
 {
@@ -27,7 +27,7 @@ final class Version20210207100807 extends AbstractMigration
         ]);
         $visits->addColumn('type', Types::STRING, [
             'length' => 255,
-            'default' => Visit::TYPE_VALID_SHORT_URL,
+            'default' => VisitType::VALID_SHORT_URL->value,
         ]);
     }
 

docker/config/shlink_in_docker.local.php

@@ -4,22 +4,13 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
+use Shlinkio\Shlink\Common\Logger\LoggerType;
 
 return [
 
     'logger' => [
         'Shlink' => [
-            'handlers' => [
-                'shlink_handler' => [
-                    'name' => StreamHandler::class,
-                    'params' => [
-                        'level' => Logger::INFO,
-                        'stream' => 'php://stdout',
-                    ],
-                ],
-            ],
+            'type' => LoggerType::STREAM->value,
         ],
     ],
 

docs/adr/2021-01-17-support-restrictions-and-permissions-in-api-keys.md

@@ -16,7 +16,7 @@ The intention is to implement a system that allows adding to API keys as many of
 
 Supporting more restrictions in the future is also desirable.
 
-## Considered option
+## Considered options
 
 * Using an ACL/RBAC library, and checking roles in a middleware.
 * Using a service that, provided an API key, tells if certain resource is reachable while it also allows building queries dynamically.

docs/adr/2021-02-07-track-visits-to-base-url-invalid-short-url-and-regular-404.md

@@ -11,7 +11,7 @@ However, it does not track visits to any of those, just to valid short URLs.
 
 The intention is to change that, and allow users to track the cases mentioned above.
 
-## Considered option
+## Considered options
 
 * Create a new table to track visits o this kind.
 * Reuse the existing `visits` table, by making `short_url_id` nullable and adding a couple of other fields.

docs/adr/2021-08-05-migrate-to-a-new-caching-library.md

@@ -13,7 +13,7 @@ However, after the creation of the caching PSRs ([PSR-6 - Cache](https://www.php
 
 Also, Shlink needs support for Redis clusters and Redis sentinels, which is not supported by `doctrine/cache` Redis adapters.
 
-## Considered option
+## Considered options
 
 After some research, the only packages that seem to support the capabilities required by Shlink and also seem healthy, are these:
 

docs/adr/2022-01-15-update-env-vars-behavior-to-have-precedence-over-installer-options.md

@@ -11,7 +11,7 @@ It is potentially possible to combine both, but if you do so, you will find out
 
 A [Twitter survey](https://twitter.com/shlinkio/status/1480614855006732289) has also showed up all participants also found the behavior should be the opposite.
 
-## Considered option
+## Considered options
 
 * Move the logic to read env vars to another config file which always overrides installer options.
 * Move the logic to read env vars to a config post-processor which overrides config dynamically, only if the appropriate env var had been defined.

docs/adr/2022-08-05-support-multi-segment-custom-slugs.md

@@ -0,0 +1,42 @@
+# Support multi-segment custom slugs
+
+* Status: Accepted
+* Date: 2022-08-05
+
+## Context and problem statement
+
+There's a new requirement to support multi-segment custom slugs (as in `https://exam.ple/foo/bar/baz`).
+
+The internal router does not support this at the moment, as it only matches the shortCode in one of the segments.
+
+## Considered options
+
+* Tweak the internal router, so that it is capable of matching multiple segments for the slug, in every route that requires it.
+* Define a new set of routes with a short prefix that allows configuring multi-segment in those, without touching the existing routes.
+* Let the router fail, and use a middleware to fall back to the proper route (similar to what was done for the extra path forwarding feature).
+
+## Decision outcome
+
+Even though I was initially inclined to use a fallback middleware, that has turned out to be harder than anticipated, because there are several possible routes where the slug is used, and we would still need some kind of router to determine which one matches.
+
+Because of that, the selected approach has been to tweak the existing router, so that it can match multiple segments, and moving the configuration of routes to a common place so that they can be defined in the proper order that prevents conflicts.
+
+## Pros and Cons of the Options
+
+### Tweaking the router
+
+* Bad: It requires routes to be defined in a specific order, and remember it in the future if more routes are added.
+* Good: It initially requires fewer changes.
+* Good: Once routes are defined in the proper order, all the internal logic works out of the box.
+
+### Defining new routes
+
+* Bad: The end-user experience gets affected.
+* Bad: Probably a lot of side effects would happen when it comes to assembling short URLs.
+* Bad: Routing needs to be configured twice, resolving the same logic.
+* Bad: It turns out to still conflict with some routes, even with the prefix, which defeats what looked like its main benefit.
+
+### Let routing fail and fall back in middleware
+
+* Good: Does not require changing routes configuration, which means less side effects.
+* Bad: Since many routes can potentially end up in the middleware, there's still the need to have some kind of routing logic.

docs/adr/README.md

@@ -2,6 +2,7 @@
 
 Here listed you will find the different architectural decisions taken in the project, including all the reasoning behind it, options considered, and final outcome.
 
+* [2022-08-05 Support multi-segment custom slugs](2022-08-05-support-multi-segment-custom-slugs.md)
 * [2022-01-15 Update env vars behavior to have precedence over installer options](2022-01-15-update-env-vars-behavior-to-have-precedence-over-installer-options.md)
 * [2021-08-05 Migrate to a new caching library](2021-08-05-migrate-to-a-new-caching-library.md)
 * [2021-02-07 Track visits to 'base_url', 'invalid_short_url' and 'regular_404'](2021-02-07-track-visits-to-base-url-invalid-short-url-and-regular-404.md)

docs/async-api/async-api.json

@@ -1,8 +1,8 @@
 {
-    "asyncapi": "2.0.0",
+    "asyncapi": "2.4.0",
     "info": {
         "title": "Shlink",
-        "version": "2.0.0",
+        "version": "3.0.0",
         "description": "Shlink, the self-hosted URL shortener",
         "license": {
             "name": "MIT",
@@ -75,6 +75,23 @@
                     }
                 }
             }
+        },
+        "https://shlink.io/new-short-url": {
+            "subscribe": {
+                "summary": "Receive information about any new short URL.",
+                "operationId": "newshortUrl",
+                "message": {
+                    "payload": {
+                        "type": "object",
+                        "additionalProperties": false,
+                        "properties": {
+                            "shortUrl": {
+                                "$ref": "#/components/schemas/ShortUrl"
+                            }
+                        }
+                    }
+                }
+            }
         }
     },
     "components": {
@@ -101,7 +118,7 @@
                     },
                     "visitsCount": {
                         "type": "integer",
-                        "description": "The number of visits that this short URL has recieved."
+                        "description": "The number of visits that this short URL has received."
                     },
                     "tags": {
                         "type": "array",

docs/swagger/definitions/ShortUrl.json

@@ -33,7 +33,7 @@
         },
         "visitsCount": {
             "type": "integer",
-            "description": "The number of visits that this short URL has recieved."
+            "description": "The number of visits that this short URL has received."
         },
         "tags": {
             "type": "array",

docs/swagger/examples/short-url-not-found.json

@@ -1,7 +1,7 @@
 {
     "value": {
-        "detail":"No URL found with short code \"abc123\"",
-        "title":"Short URL not found",
+        "detail": "No URL found with short code \"abc123\"",
+        "title": "Short URL not found",
         "type": "INVALID_SHORTCODE",
         "status": 404,
         "shortCode": "abc123"

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

@@ -312,7 +312,7 @@
                                         },
                                         "threshold": {
                                             "type": "number",
-                                            "description": "The amount of visits currently configured as threshold to allow deleting short UYRLs or not"
+                                            "description": "The amount of visits currently configured as threshold to allow deleting short URLs or not"
                                         }
                                     }
                                 }

docs/swagger/paths/v2_domains_{domain}_visits.json

@@ -0,0 +1,172 @@
+{
+    "get": {
+        "operationId": "getDomainVisits",
+        "tags": [
+            "Visits"
+        ],
+        "summary": "List visits for domain",
+        "description": "Get the list of visits on any short URL which belongs to provided domain.",
+        "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
+            {
+                "name": "domain",
+                "in": "path",
+                "description": "The domain from which we want to get the visits, or **DEFAULT** keyword for default domain.",
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "startDate",
+                "in": "query",
+                "description": "The date (in ISO-8601 format) from which we want to get visits.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "endDate",
+                "in": "query",
+                "description": "The date (in ISO-8601 format) until which we want to get visits.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "page",
+                "in": "query",
+                "description": "The page to display. Defaults to 1",
+                "required": false,
+                "schema": {
+                    "type": "number"
+                }
+            },
+            {
+                "name": "itemsPerPage",
+                "in": "query",
+                "description": "The amount of items to return on every page. Defaults to all the items",
+                "required": false,
+                "schema": {
+                    "type": "number"
+                }
+            },
+            {
+                "name": "excludeBots",
+                "in": "query",
+                "description": "Tells if visits from potential bots should be excluded from the result set",
+                "required": false,
+                "schema": {
+                    "type": "string",
+                    "enum": ["true"]
+                }
+            }
+        ],
+        "security": [
+            {
+                "ApiKey": []
+            }
+        ],
+        "responses": {
+            "200": {
+                "description": "List of visits.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "visits": {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "../definitions/Visit.json"
+                                            }
+                                        },
+                                        "pagination": {
+                                            "$ref": "../definitions/Pagination.json"
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "example": {
+                            "visits": {
+                                "data": [
+                                    {
+                                        "referer": "https://twitter.com",
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0",
+                                        "visitLocation": null,
+                                        "potentialBot": false
+                                    },
+                                    {
+                                        "referer": "https://t.co",
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
+                                        "visitLocation": {
+                                            "cityName": "Cupertino",
+                                            "countryCode": "US",
+                                            "countryName": "United States",
+                                            "latitude": 37.3042,
+                                            "longitude": -122.0946,
+                                            "regionName": "California",
+                                            "timezone": "America/Los_Angeles"
+                                        },
+                                        "potentialBot": false
+                                    },
+                                    {
+                                        "referer": null,
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "some_web_crawler/1.4",
+                                        "visitLocation": null,
+                                        "potentialBot": true
+                                    }
+                                ],
+                                "pagination": {
+                                    "currentPage": 5,
+                                    "pagesCount": 12,
+                                    "itemsPerPage": 10,
+                                    "itemsInCurrentPage": 10,
+                                    "totalItems": 115
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "404": {
+                "description": "The domain does not exist.",
+                "content": {
+                    "application/problem+json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        },
+                        "example": {
+                            "detail": "Domain with authority \"example.com\" could not be found",
+                            "title": "Domain not found",
+                            "type": "DOMAIN_NOT_FOUND",
+                            "status": 404,
+                            "authority": "example.com"
+                        }
+                    }
+                }
+            },
+            "default": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/problem+json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -53,7 +53,7 @@
             {
                 "name": "errorCorrection",
                 "in": "query",
-                "description": "The error correction level to apply to the the QR code: **[L]**ow, **[M]**edium, **[Q]**uartile or **[H]**igh. See [docs](https://www.qrcode.com/en/about/error_correction.html).",
+                "description": "The error correction level to apply to the QR code: **[L]**ow, **[M]**edium, **[Q]**uartile or **[H]**igh. See [docs](https://www.qrcode.com/en/about/error_correction.html).",
                 "required": false,
                 "schema": {
                     "type": "string",

docs/swagger/swagger.json

@@ -3,7 +3,7 @@
     "info": {
         "title": "Shlink",
         "description": "Shlink, the self-hosted URL shortener",
-        "version": "1.0"
+        "version": "2.0"
     },
 
     "externalDocs": {
@@ -95,6 +95,9 @@
         "/rest/v{version}/tags/{tag}/visits": {
             "$ref": "paths/v2_tags_{tag}_visits.json"
         },
+        "/rest/v{version}/domains/{domain}/visits": {
+            "$ref": "paths/v2_domains_{domain}_visits.json"
+        },
         "/rest/v{version}/visits/orphan": {
             "$ref": "paths/v2_visits_orphan.json"
         },

migrations.php

@@ -2,13 +2,15 @@
 
 declare(strict_types=1);
 
+use const Shlinkio\Shlink\MIGRATIONS_TABLE;
+
 return [
 
     'migrations_paths' => [
         'ShlinkMigrations' => 'data/migrations',
     ],
     'table_storage' => [
-        'table_name' => 'migrations',
+        'table_name' => MIGRATIONS_TABLE,
     ],
     'custom_template' => 'data/migrations_template.txt',
 

module/CLI/config/cli.config.php

@@ -11,11 +11,13 @@ return [
             Command\ShortUrl\CreateShortUrlCommand::NAME => Command\ShortUrl\CreateShortUrlCommand::class,
             Command\ShortUrl\ResolveUrlCommand::NAME => Command\ShortUrl\ResolveUrlCommand::class,
             Command\ShortUrl\ListShortUrlsCommand::NAME => Command\ShortUrl\ListShortUrlsCommand::class,
-            Command\ShortUrl\GetVisitsCommand::NAME => Command\ShortUrl\GetVisitsCommand::class,
+            Command\ShortUrl\GetShortUrlVisitsCommand::NAME => Command\ShortUrl\GetShortUrlVisitsCommand::class,
             Command\ShortUrl\DeleteShortUrlCommand::NAME => Command\ShortUrl\DeleteShortUrlCommand::class,
 
             Command\Visit\LocateVisitsCommand::NAME => Command\Visit\LocateVisitsCommand::class,
             Command\Visit\DownloadGeoLiteDbCommand::NAME => Command\Visit\DownloadGeoLiteDbCommand::class,
+            Command\Visit\GetOrphanVisitsCommand::NAME => Command\Visit\GetOrphanVisitsCommand::class,
+            Command\Visit\GetNonOrphanVisitsCommand::NAME => Command\Visit\GetNonOrphanVisitsCommand::class,
 
             Command\Api\GenerateKeyCommand::NAME => Command\Api\GenerateKeyCommand::class,
             Command\Api\DisableKeyCommand::NAME => Command\Api\DisableKeyCommand::class,
@@ -24,9 +26,11 @@ return [
             Command\Tag\ListTagsCommand::NAME => Command\Tag\ListTagsCommand::class,
             Command\Tag\RenameTagCommand::NAME => Command\Tag\RenameTagCommand::class,
             Command\Tag\DeleteTagsCommand::NAME => Command\Tag\DeleteTagsCommand::class,
+            Command\Tag\GetTagVisitsCommand::NAME => Command\Tag\GetTagVisitsCommand::class,
 
             Command\Domain\ListDomainsCommand::NAME => Command\Domain\ListDomainsCommand::class,
             Command\Domain\DomainRedirectsCommand::NAME => Command\Domain\DomainRedirectsCommand::class,
+            Command\Domain\GetDomainVisitsCommand::NAME => Command\Domain\GetDomainVisitsCommand::class,
 
             Command\Db\CreateDatabaseCommand::NAME => Command\Db\CreateDatabaseCommand::class,
             Command\Db\MigrateDatabaseCommand::NAME => Command\Db\MigrateDatabaseCommand::class,

module/CLI/config/dependencies.config.php

@@ -11,6 +11,7 @@ use Laminas\ServiceManager\Factory\InvokableFactory;
 use Shlinkio\Shlink\Common\Doctrine\NoDbNameConnectionFactory;
 use Shlinkio\Shlink\Core\Domain\DomainService;
 use Shlinkio\Shlink\Core\Options\TrackingOptions;
+use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Service;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifier;
 use Shlinkio\Shlink\Core\ShortUrl\Transformer\ShortUrlDataTransformer;
@@ -42,11 +43,13 @@ return [
             Command\ShortUrl\CreateShortUrlCommand::class => ConfigAbstractFactory::class,
             Command\ShortUrl\ResolveUrlCommand::class => ConfigAbstractFactory::class,
             Command\ShortUrl\ListShortUrlsCommand::class => ConfigAbstractFactory::class,
-            Command\ShortUrl\GetVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\GetShortUrlVisitsCommand::class => ConfigAbstractFactory::class,
             Command\ShortUrl\DeleteShortUrlCommand::class => ConfigAbstractFactory::class,
 
             Command\Visit\DownloadGeoLiteDbCommand::class => ConfigAbstractFactory::class,
             Command\Visit\LocateVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\Visit\GetOrphanVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\Visit\GetNonOrphanVisitsCommand::class => ConfigAbstractFactory::class,
 
             Command\Api\GenerateKeyCommand::class => ConfigAbstractFactory::class,
             Command\Api\DisableKeyCommand::class => ConfigAbstractFactory::class,
@@ -55,12 +58,14 @@ return [
             Command\Tag\ListTagsCommand::class => ConfigAbstractFactory::class,
             Command\Tag\RenameTagCommand::class => ConfigAbstractFactory::class,
             Command\Tag\DeleteTagsCommand::class => ConfigAbstractFactory::class,
+            Command\Tag\GetTagVisitsCommand::class => ConfigAbstractFactory::class,
 
             Command\Db\CreateDatabaseCommand::class => ConfigAbstractFactory::class,
             Command\Db\MigrateDatabaseCommand::class => ConfigAbstractFactory::class,
 
             Command\Domain\ListDomainsCommand::class => ConfigAbstractFactory::class,
             Command\Domain\DomainRedirectsCommand::class => ConfigAbstractFactory::class,
+            Command\Domain\GetDomainVisitsCommand::class => ConfigAbstractFactory::class,
         ],
     ],
 
@@ -72,20 +77,19 @@ return [
             TrackingOptions::class,
         ],
         Util\ProcessRunner::class => [SymfonyCli\Helper\ProcessHelper::class],
-        ApiKey\RoleResolver::class => [DomainService::class],
+        ApiKey\RoleResolver::class => [DomainService::class, 'config.url_shortener.domain.hostname'],
 
         Command\ShortUrl\CreateShortUrlCommand::class => [
             Service\UrlShortener::class,
             ShortUrlStringifier::class,
-            'config.url_shortener.default_short_codes_length',
-            'config.url_shortener.domain.hostname',
+            UrlShortenerOptions::class,
         ],
         Command\ShortUrl\ResolveUrlCommand::class => [Service\ShortUrl\ShortUrlResolver::class],
         Command\ShortUrl\ListShortUrlsCommand::class => [
             Service\ShortUrlService::class,
             ShortUrlDataTransformer::class,
         ],
-        Command\ShortUrl\GetVisitsCommand::class => [Visit\VisitsStatsHelper::class],
+        Command\ShortUrl\GetShortUrlVisitsCommand::class => [Visit\VisitsStatsHelper::class],
         Command\ShortUrl\DeleteShortUrlCommand::class => [Service\ShortUrl\DeleteShortUrlService::class],
 
         Command\Visit\DownloadGeoLiteDbCommand::class => [Util\GeolocationDbUpdater::class],
@@ -94,6 +98,8 @@ return [
             IpLocationResolverInterface::class,
             LockFactory::class,
         ],
+        Command\Visit\GetOrphanVisitsCommand::class => [Visit\VisitsStatsHelper::class],
+        Command\Visit\GetNonOrphanVisitsCommand::class => [Visit\VisitsStatsHelper::class, ShortUrlStringifier::class],
 
         Command\Api\GenerateKeyCommand::class => [ApiKeyService::class, ApiKey\RoleResolver::class],
         Command\Api\DisableKeyCommand::class => [ApiKeyService::class],
@@ -102,9 +108,11 @@ return [
         Command\Tag\ListTagsCommand::class => [TagService::class],
         Command\Tag\RenameTagCommand::class => [TagService::class],
         Command\Tag\DeleteTagsCommand::class => [TagService::class],
+        Command\Tag\GetTagVisitsCommand::class => [Visit\VisitsStatsHelper::class, ShortUrlStringifier::class],
 
         Command\Domain\ListDomainsCommand::class => [DomainService::class],
         Command\Domain\DomainRedirectsCommand::class => [DomainService::class],
+        Command\Domain\GetDomainVisitsCommand::class => [Visit\VisitsStatsHelper::class, ShortUrlStringifier::class],
 
         Command\Db\CreateDatabaseCommand::class => [
             LockFactory::class,

module/CLI/src/ApiKey/RoleResolver.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\ApiKey;
 
+use Shlinkio\Shlink\CLI\Exception\InvalidRoleConfigException;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Rest\ApiKey\Model\RoleDefinition;
 use Symfony\Component\Console\Input\InputInterface;
@@ -12,24 +13,33 @@ use function is_string;
 
 class RoleResolver implements RoleResolverInterface
 {
-    public function __construct(private DomainServiceInterface $domainService)
+    public function __construct(private DomainServiceInterface $domainService, private string $defaultDomain)
     {
     }
 
     public function determineRoles(InputInterface $input): array
     {
-        $domainAuthority = $input->getOption('domain-only');
-        $author = $input->getOption('author-only');
+        $domainAuthority = $input->getOption(self::DOMAIN_ONLY_PARAM);
+        $author = $input->getOption(self::AUTHOR_ONLY_PARAM);
 
         $roleDefinitions = [];
         if ($author) {
             $roleDefinitions[] = RoleDefinition::forAuthoredShortUrls();
         }
         if (is_string($domainAuthority)) {
-            $domain = $this->domainService->getOrCreate($domainAuthority);
-            $roleDefinitions[] = RoleDefinition::forDomain($domain);
+            $roleDefinitions[] = $this->resolveRoleForAuthority($domainAuthority);
         }
 
         return $roleDefinitions;
     }
+
+    private function resolveRoleForAuthority(string $domainAuthority): RoleDefinition
+    {
+        if ($domainAuthority === $this->defaultDomain) {
+            throw InvalidRoleConfigException::forDomainOnlyWithDefaultDomain();
+        }
+
+        $domain = $this->domainService->getOrCreate($domainAuthority);
+        return RoleDefinition::forDomain($domain);
+    }
 }

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

@@ -73,13 +73,16 @@ class GenerateKeyCommand extends Command
                 $authorOnly,
                 'a',
                 InputOption::VALUE_NONE,
-                sprintf('Adds the "%s" role to the new API key.', Role::AUTHORED_SHORT_URLS),
+                sprintf('Adds the "%s" role to the new API key.', Role::AUTHORED_SHORT_URLS->value),
             )
             ->addOption(
                 $domainOnly,
                 'd',
                 InputOption::VALUE_REQUIRED,
-                sprintf('Adds the "%s" role to the new API key, with the domain provided.', Role::DOMAIN_SPECIFIC),
+                sprintf(
+                    'Adds the "%s" role to the new API key, with the domain provided.',
+                    Role::DOMAIN_SPECIFIC->value,
+                ),
             )
             ->setHelp($help);
     }
@@ -99,7 +102,7 @@ class GenerateKeyCommand extends Command
         if (! $apiKey->isAdmin()) {
             ShlinkTable::default($io)->render(
                 ['Role name', 'Role metadata'],
-                $apiKey->mapRoles(fn (string $name, array $meta) => [$name, arrayToString($meta, 0)]),
+                $apiKey->mapRoles(fn (Role $role, array $meta) => [$role->value, arrayToString($meta, 0)]),
                 null,
                 'Roles',
             );

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

@@ -60,10 +60,10 @@ class ListKeysCommand extends Command
             }
             $rowData[] = $expiration?->toAtomString() ?? '-';
             $rowData[] = $apiKey->isAdmin() ? 'Admin' : implode("\n", $apiKey->mapRoles(
-                fn (string $roleName, array $meta) =>
+                fn (Role $role, array $meta) =>
                     empty($meta)
-                        ? Role::toFriendlyName($roleName)
-                        : sprintf('%s: %s', Role::toFriendlyName($roleName), Role::domainAuthorityFromMeta($meta)),
+                        ? Role::toFriendlyName($role)
+                        : sprintf('%s: %s', Role::toFriendlyName($role), Role::domainAuthorityFromMeta($meta)),
             ));
 
             return $rowData;

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\Db;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\ProcessRunnerInterface;
 use Symfony\Component\Console\Input\InputInterface;
@@ -14,6 +15,9 @@ use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Process\PhpExecutableFinder;
 
 use function Functional\contains;
+use function Functional\filter;
+
+use const Shlinkio\Shlink\MIGRATIONS_TABLE;
 
 class CreateDatabaseCommand extends AbstractDatabaseCommand
 {
@@ -35,6 +39,7 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
     {
         $this
             ->setName(self::NAME)
+            ->setHidden()
             ->setDescription(
                 'Creates the database needed for shlink to work. It will do nothing if the database already exists',
             );
@@ -61,7 +66,7 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
 
     private function checkDbExists(): void
     {
-        if ($this->regularConn->getDatabasePlatform()->getName() === 'sqlite') {
+        if ($this->regularConn->getDriver()->getDatabasePlatform() instanceof SqlitePlatform) {
             return;
         }
 
@@ -69,7 +74,7 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
         // Otherwise, it will fail to connect and will not be able to create the new database
         $schemaManager = $this->noDbNameConn->createSchemaManager();
         $databases = $schemaManager->listDatabases();
-        $shlinkDatabase = $this->regularConn->getDatabase();
+        $shlinkDatabase = $this->regularConn->getParams()['dbname'] ?? null;
 
         if ($shlinkDatabase !== null && ! contains($databases, $shlinkDatabase)) {
             $schemaManager->createDatabase($shlinkDatabase);
@@ -79,8 +84,9 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
     private function schemaExists(): bool
     {
         // If at least one of the shlink tables exist, we will consider the database exists somehow.
-        // Any inconsistency should be taken care by the migrations
+        // We exclude the migrations table, in case db:migrate was run first by mistake.
+        // Any other inconsistency will be taken care by the migrations.
         $schemaManager = $this->regularConn->createSchemaManager();
-        return ! empty($schemaManager->listTableNames());
+        return ! empty(filter($schemaManager->listTableNames(), fn (string $table) => $table !== MIGRATIONS_TABLE));
     }
 }

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

@@ -19,6 +19,7 @@ class MigrateDatabaseCommand extends AbstractDatabaseCommand
     {
         $this
             ->setName(self::NAME)
+            ->setHidden()
             ->setDescription('Runs database migrations, which will ensure the shlink database is up to date.');
     }
 

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

@@ -53,7 +53,7 @@ class DomainRedirectsCommand extends Command
 
         /** @var string[] $availableDomains */
         $availableDomains = invoke(
-            filter($this->domainService->listDomains(), static fn (DomainItem $item) => ! $item->isDefault()),
+            filter($this->domainService->listDomains(), static fn (DomainItem $item) => ! $item->isDefault),
             'toString',
         );
         if (empty($availableDomains)) {

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

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Domain;
+
+use Shlinkio\Shlink\CLI\Command\Visit\AbstractVisitsListCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+
+class GetDomainVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'domain:visits';
+
+    public function __construct(
+        VisitsStatsHelperInterface $visitsHelper,
+        private readonly ShortUrlStringifierInterface $shortUrlStringifier,
+    ) {
+        parent::__construct($visitsHelper);
+    }
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the list of visits for provided domain.')
+            ->addArgument('domain', InputArgument::REQUIRED, 'The domain which visits we want to get.');
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        $domain = $input->getArgument('domain');
+        return $this->visitsHelper->visitsForDomain($domain, new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        $shortUrl = $visit->getShortUrl();
+        return $shortUrl === null ? [] : ['shortUrl' => $this->shortUrlStringifier->stringify($shortUrl)];
+    }
+}

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

@@ -48,12 +48,12 @@ class ListDomainsCommand extends Command
         $table->render(
             $showRedirects ? [...$commonFields, '"Not found" redirects'] : $commonFields,
             map($domains, function (DomainItem $domain) use ($showRedirects) {
-                $commonValues = [$domain->toString(), $domain->isDefault() ? 'Yes' : 'No'];
+                $commonValues = [$domain->toString(), $domain->isDefault ? 'Yes' : 'No'];
 
                 return $showRedirects
                     ? [
                         ...$commonValues,
-                        $this->notFoundRedirectsToString($domain->notFoundRedirectConfig()),
+                        $this->notFoundRedirectsToString($domain->notFoundRedirectConfig),
                       ]
                     : $commonValues;
             }),

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

@@ -5,9 +5,11 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
+use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
 use Shlinkio\Shlink\Core\Validation\ShortUrlInputFilter;
@@ -19,6 +21,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 use function array_map;
+use function explode;
 use function Functional\curry;
 use function Functional\flatten;
 use function Functional\unique;
@@ -29,14 +32,15 @@ class CreateShortUrlCommand extends Command
     public const NAME = 'short-url:create';
 
     private ?SymfonyStyle $io;
+    private string $defaultDomain;
 
     public function __construct(
-        private UrlShortenerInterface $urlShortener,
-        private ShortUrlStringifierInterface $stringifier,
-        private int $defaultShortCodeLength,
-        private string $defaultDomain,
+        private readonly UrlShortenerInterface $urlShortener,
+        private readonly ShortUrlStringifierInterface $stringifier,
+        private readonly UrlShortenerOptions $options,
     ) {
         parent::__construct();
+        $this->defaultDomain = $this->options->domain()['hostname'] ?? '';
     }
 
     protected function configure(): void
@@ -150,11 +154,11 @@ class CreateShortUrlCommand extends Command
             return ExitCodes::EXIT_FAILURE;
         }
 
-        $explodeWithComma = curry('explode')(',');
+        $explodeWithComma = curry(explode(...))(',');
         $tags = unique(flatten(array_map($explodeWithComma, $input->getOption('tags'))));
         $customSlug = $input->getOption('custom-slug');
         $maxVisits = $input->getOption('max-visits');
-        $shortCodeLength = $input->getOption('short-code-length') ?? $this->defaultShortCodeLength;
+        $shortCodeLength = $input->getOption('short-code-length') ?? $this->options->defaultShortCodesLength();
         $doValidateUrl = $input->getOption('validate-url');
 
         try {
@@ -171,6 +175,7 @@ class CreateShortUrlCommand extends Command
                 ShortUrlInputFilter::TAGS => $tags,
                 ShortUrlInputFilter::CRAWLABLE => $input->getOption('crawlable'),
                 ShortUrlInputFilter::FORWARD_QUERY => !$input->getOption('no-forward-query'),
+                EnvVars::MULTI_SEGMENT_SLUGS_ENABLED->value => $this->options->multiSegmentSlugsEnabled(),
             ]));
 
             $io->writeln([

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

@@ -81,6 +81,6 @@ class DeleteShortUrlCommand extends Command
     private function runDelete(SymfonyStyle $io, ShortUrlIdentifier $identifier, bool $ignoreThreshold): void
     {
         $this->deleteShortUrlService->deleteByShortCode($identifier, $ignoreThreshold);
-        $io->success(sprintf('Short URL with short code "%s" successfully deleted.', $identifier->shortCode()));
+        $io->success(sprintf('Short URL with short code "%s" successfully deleted.', $identifier->shortCode));
     }
 }

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

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
+
+use Shlinkio\Shlink\CLI\Command\Visit\AbstractVisitsListCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+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;
+
+class GetShortUrlVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'short-url:visits';
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the detailed visits information for provided short code')
+            ->addArgument('shortCode', InputArgument::REQUIRED, 'The short code which visits we want to get.')
+            ->addOption('domain', 'd', InputOption::VALUE_REQUIRED, 'The domain for the short code.');
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output): void
+    {
+        $shortCode = $input->getArgument('shortCode');
+        if (! empty($shortCode)) {
+            return;
+        }
+
+        $io = new SymfonyStyle($input, $output);
+        $shortCode = $io->ask('A short code was not provided. Which short code do you want to use?');
+        if (! empty($shortCode)) {
+            $input->setArgument('shortCode', $shortCode);
+        }
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        $identifier = ShortUrlIdentifier::fromCli($input);
+        return $this->visitsHelper->visitsForShortUrl($identifier, new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        return [];
+    }
+}

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

@@ -1,88 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
-
-use Shlinkio\Shlink\CLI\Command\Util\AbstractWithDateRangeCommand;
-use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\CLI\Util\ShlinkTable;
-use Shlinkio\Shlink\Core\Entity\Visit;
-use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
-use Shlinkio\Shlink\Core\Model\VisitsParams;
-use Shlinkio\Shlink\Core\Visit\Model\UnknownVisitLocation;
-use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
-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 Functional\map;
-use function Functional\select_keys;
-use function Shlinkio\Shlink\Common\buildDateRange;
-use function sprintf;
-
-class GetVisitsCommand extends AbstractWithDateRangeCommand
-{
-    public const NAME = 'short-url:visits';
-
-    public function __construct(private VisitsStatsHelperInterface $visitsHelper)
-    {
-        parent::__construct();
-    }
-
-    protected function doConfigure(): void
-    {
-        $this
-            ->setName(self::NAME)
-            ->setDescription('Returns the detailed visits information for provided short code')
-            ->addArgument('shortCode', InputArgument::REQUIRED, 'The short code which visits we want to get.')
-            ->addOption('domain', 'd', InputOption::VALUE_REQUIRED, 'The domain for the short code.');
-    }
-
-    protected function getStartDateDesc(string $optionName): string
-    {
-        return sprintf('Allows to filter visits, returning only those older than "%s".', $optionName);
-    }
-
-    protected function getEndDateDesc(string $optionName): string
-    {
-        return sprintf('Allows to filter visits, returning only those newer than "%s".', $optionName);
-    }
-
-    protected function interact(InputInterface $input, OutputInterface $output): void
-    {
-        $shortCode = $input->getArgument('shortCode');
-        if (! empty($shortCode)) {
-            return;
-        }
-
-        $io = new SymfonyStyle($input, $output);
-        $shortCode = $io->ask('A short code was not provided. Which short code do you want to use?');
-        if (! empty($shortCode)) {
-            $input->setArgument('shortCode', $shortCode);
-        }
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): ?int
-    {
-        $identifier = ShortUrlIdentifier::fromCli($input);
-        $startDate = $this->getStartDateOption($input, $output);
-        $endDate = $this->getEndDateOption($input, $output);
-
-        $paginator = $this->visitsHelper->visitsForShortUrl(
-            $identifier,
-            new VisitsParams(buildDateRange($startDate, $endDate)),
-        );
-
-        $rows = map($paginator->getCurrentPageResults(), function (Visit $visit) {
-            $rowData = $visit->jsonSerialize();
-            $rowData['country'] = ($visit->getVisitLocation() ?? new UnknownVisitLocation())->getCountryName();
-            return select_keys($rowData, ['referer', 'date', 'userAgent', 'country']);
-        });
-        ShlinkTable::default($output)->render(['Referer', 'Date', 'User agent', 'Country'], $rows);
-
-        return ExitCodes::EXIT_SUCCESS;
-    }
-}

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

@@ -13,6 +13,7 @@ use Shlinkio\Shlink\Common\Rest\DataTransformerInterface;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Model\ShortUrlsParams;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
+use Shlinkio\Shlink\Core\ShortUrl\Model\TagsMode;
 use Shlinkio\Shlink\Core\Validation\ShortUrlsParamsInputFilter;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -120,9 +121,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
         $page = (int) $input->getOption('page');
         $searchTerm = $input->getOption('search-term');
         $tags = $input->getOption('tags');
-        $tagsMode = $input->getOption('including-all-tags') === true
-            ? ShortUrlsParams::TAGS_MODE_ALL
-            : ShortUrlsParams::TAGS_MODE_ANY;
+        $tagsMode = $input->getOption('including-all-tags') === true ? TagsMode::ALL->value : TagsMode::ANY->value;
         $tags = ! empty($tags) ? explode(',', $tags) : [];
         $all = $input->getOption('all');
         $startDate = $this->getStartDateOption($input, $output);
@@ -209,7 +208,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
         }
         if ($input->getOption('show-api-key')) {
             $columnsMap['API Key'] = static fn (array $_, ShortUrl $shortUrl): string =>
-                (string) $shortUrl->authorApiKey();
+                $shortUrl->authorApiKey()?->__toString() ?? '';
         }
         if ($input->getOption('show-api-key-name')) {
             $columnsMap['API Key Name'] = static fn (array $_, ShortUrl $shortUrl): ?string =>

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

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Tag;
+
+use Shlinkio\Shlink\CLI\Command\Visit\AbstractVisitsListCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+
+class GetTagVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'tag:visits';
+
+    public function __construct(
+        VisitsStatsHelperInterface $visitsHelper,
+        private readonly ShortUrlStringifierInterface $shortUrlStringifier,
+    ) {
+        parent::__construct($visitsHelper);
+    }
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the list of visits for provided tag.')
+            ->addArgument('tag', InputArgument::REQUIRED, 'The tag which visits we want to get.');
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        $tag = $input->getArgument('tag');
+        return $this->visitsHelper->visitsForTag($tag, new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        $shortUrl = $visit->getShortUrl();
+        return $shortUrl === null ? [] : ['shortUrl' => $this->shortUrlStringifier->stringify($shortUrl)];
+    }
+}

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

@@ -46,7 +46,7 @@ class ListTagsCommand extends Command
 
         return map(
             $tags,
-            static fn (TagInfo $tagInfo) => [$tagInfo->tag(), $tagInfo->shortUrlsCount(), $tagInfo->visitsCount()],
+            static fn (TagInfo $tagInfo) => [$tagInfo->tag, $tagInfo->shortUrlsCount, $tagInfo->visitsCount],
         );
     }
 }

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

@@ -19,7 +19,7 @@ class RenameTagCommand extends Command
 {
     public const NAME = 'tag:rename';
 
-    public function __construct(private TagServiceInterface $tagService)
+    public function __construct(private readonly TagServiceInterface $tagService)
     {
         parent::__construct();
     }

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

@@ -14,7 +14,7 @@ use function sprintf;
 
 abstract class AbstractLockedCommand extends Command
 {
-    public function __construct(private LockFactory $locker)
+    public function __construct(private readonly LockFactory $locker)
     {
         parent::__construct();
     }
@@ -22,11 +22,11 @@ abstract class AbstractLockedCommand extends Command
     final protected function execute(InputInterface $input, OutputInterface $output): ?int
     {
         $lockConfig = $this->getLockConfig();
-        $lock = $this->locker->createLock($lockConfig->lockName(), $lockConfig->ttl(), $lockConfig->isBlocking());
+        $lock = $this->locker->createLock($lockConfig->lockName, $lockConfig->ttl, $lockConfig->isBlocking);
 
-        if (! $lock->acquire($lockConfig->isBlocking())) {
+        if (! $lock->acquire($lockConfig->isBlocking)) {
             $output->writeln(
-                sprintf('<comment>Command "%s" is already in progress. Skipping.</comment>', $lockConfig->lockName()),
+                sprintf('<comment>Command "%s" is already in progress. Skipping.</comment>', $lockConfig->lockName),
             );
             return ExitCodes::EXIT_WARNING;
         }

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

@@ -9,9 +9,9 @@ final class LockedCommandConfig
     public const DEFAULT_TTL = 600.0; // 10 minutes
 
     private function __construct(
-        private string $lockName,
-        private bool $isBlocking,
-        private float $ttl = self::DEFAULT_TTL,
+        public readonly string $lockName,
+        public readonly bool $isBlocking,
+        public readonly float $ttl = self::DEFAULT_TTL,
     ) {
     }
 
@@ -24,19 +24,4 @@ final class LockedCommandConfig
     {
         return new self($lockName, false);
     }
-
-    public function lockName(): string
-    {
-        return $this->lockName;
-    }
-
-    public function isBlocking(): bool
-    {
-        return $this->isBlocking;
-    }
-
-    public function ttl(): float
-    {
-        return $this->ttl;
-    }
 }

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

@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Visit;
+
+use Shlinkio\Shlink\CLI\Command\Util\AbstractWithDateRangeCommand;
+use Shlinkio\Shlink\CLI\Util\ExitCodes;
+use Shlinkio\Shlink\CLI\Util\ShlinkTable;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+use function array_keys;
+use function Functional\map;
+use function Functional\select_keys;
+use function Shlinkio\Shlink\Common\buildDateRange;
+use function Shlinkio\Shlink\Core\camelCaseToHumanFriendly;
+use function sprintf;
+
+abstract class AbstractVisitsListCommand extends AbstractWithDateRangeCommand
+{
+    public function __construct(protected readonly VisitsStatsHelperInterface $visitsHelper)
+    {
+        parent::__construct();
+    }
+
+    final protected function getStartDateDesc(string $optionName): string
+    {
+        return sprintf('Allows to filter visits, returning only those older than "%s".', $optionName);
+    }
+
+    final protected function getEndDateDesc(string $optionName): string
+    {
+        return sprintf('Allows to filter visits, returning only those newer than "%s".', $optionName);
+    }
+
+    final protected function execute(InputInterface $input, OutputInterface $output): ?int
+    {
+        $startDate = $this->getStartDateOption($input, $output);
+        $endDate = $this->getEndDateOption($input, $output);
+        $paginator = $this->getVisitsPaginator($input, buildDateRange($startDate, $endDate));
+        [$rows, $headers] = $this->resolveRowsAndHeaders($paginator);
+
+        ShlinkTable::default($output)->render($headers, $rows);
+
+        return ExitCodes::EXIT_SUCCESS;
+    }
+
+    private function resolveRowsAndHeaders(Paginator $paginator): array
+    {
+        $extraKeys = [];
+        $rows = map($paginator->getCurrentPageResults(), function (Visit $visit) use (&$extraKeys) {
+            $extraFields = $this->mapExtraFields($visit);
+            $extraKeys = array_keys($extraFields);
+
+            $rowData = [
+                ...$visit->jsonSerialize(),
+                'country' => $visit->getVisitLocation()?->getCountryName() ?? 'Unknown',
+                'city' => $visit->getVisitLocation()?->getCityName() ?? 'Unknown',
+                ...$extraFields,
+            ];
+
+            return select_keys($rowData, ['referer', 'date', 'userAgent', 'country', 'city', ...$extraKeys]);
+        });
+        $extra = map($extraKeys, camelCaseToHumanFriendly(...));
+
+        return [
+            $rows,
+            ['Referer', 'Date', 'User agent', 'Country', 'City', ...$extra],
+        ];
+    }
+
+    abstract protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator;
+
+    /**
+     * @return array<string, string>
+     */
+    abstract protected function mapExtraFields(Visit $visit): array;
+}

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

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Visit;
+
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Symfony\Component\Console\Input\InputInterface;
+
+class GetNonOrphanVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'visit:non-orphan';
+
+    public function __construct(
+        VisitsStatsHelperInterface $visitsHelper,
+        private readonly ShortUrlStringifierInterface $shortUrlStringifier,
+    ) {
+        parent::__construct($visitsHelper);
+    }
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the list of non-orphan visits.');
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        return $this->visitsHelper->nonOrphanVisits(new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        $shortUrl = $visit->getShortUrl();
+        return $shortUrl === null ? [] : ['shortUrl' => $this->shortUrlStringifier->stringify($shortUrl)];
+    }
+}

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

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Visit;
+
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Common\Util\DateRange;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Model\VisitsParams;
+use Symfony\Component\Console\Input\InputInterface;
+
+class GetOrphanVisitsCommand extends AbstractVisitsListCommand
+{
+    public const NAME = 'visit:orphan';
+
+    protected function doConfigure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Returns the list of orphan visits.');
+    }
+
+    protected function getVisitsPaginator(InputInterface $input, DateRange $dateRange): Paginator
+    {
+        return $this->visitsHelper->orphanVisits(new VisitsParams($dateRange));
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    protected function mapExtraFields(Visit $visit): array
+    {
+        return ['type' => $visit->type()->value];
+    }
+}

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

@@ -17,6 +17,7 @@ use Shlinkio\Shlink\IpGeolocation\Exception\WrongIpException;
 use Shlinkio\Shlink\IpGeolocation\Model\Location;
 use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 use Symfony\Component\Console\Exception\RuntimeException;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -80,12 +81,12 @@ class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocat
             );
         }
 
-        if ($all && $retry && ! $this->warnAndVerifyContinue($input)) {
+        if ($all && $retry && ! $this->warnAndVerifyContinue()) {
             throw new RuntimeException('Execution aborted');
         }
     }
 
-    private function warnAndVerifyContinue(InputInterface $input): bool
+    private function warnAndVerifyContinue(): bool
     {
         $this->io->warning([
             'You are about to process the location of all existing visits your short URLs received.',
@@ -103,7 +104,7 @@ class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocat
         $all = $retry && $input->getOption('all');
 
         try {
-            $this->checkDbUpdate($input);
+            $this->checkDbUpdate();
 
             if ($all) {
                 $this->visitLocator->locateAllVisits($this);
@@ -166,7 +167,7 @@ class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocat
         $this->io->writeln($message);
     }
 
-    private function checkDbUpdate(InputInterface $input): void
+    private function checkDbUpdate(): void
     {
         $cliApp = $this->getApplication();
         if ($cliApp === null) {
@@ -174,7 +175,7 @@ class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocat
         }
 
         $downloadDbCommand = $cliApp->find(DownloadGeoLiteDbCommand::NAME);
-        $exitCode = $downloadDbCommand->run($input, $this->io);
+        $exitCode = $downloadDbCommand->run(new ArrayInput([]), $this->io);
 
         if ($exitCode === ExitCodes::EXIT_FAILURE) {
             throw new RuntimeException('It is not possible to locate visits without a GeoLite2 db file.');

module/CLI/src/Exception/GeolocationDbUpdateFailedException.php

@@ -13,7 +13,7 @@ class GeolocationDbUpdateFailedException extends RuntimeException implements Exc
 {
     private bool $olderDbExists;
 
-    private function __construct(string $message, int $code = 0, ?Throwable $previous = null)
+    private function __construct(string $message, int $code, ?Throwable $previous)
     {
         parent::__construct($message, $code, $previous);
     }
@@ -47,7 +47,7 @@ class GeolocationDbUpdateFailedException extends RuntimeException implements Exc
         $e = new self(sprintf(
             'Build epoch with value "%s" from existing geolocation database, could not be parsed to integer.',
             $buildEpoch,
-        ));
+        ), 0, null);
         $e->olderDbExists = true;
 
         return $e;

module/CLI/src/Exception/InvalidRoleConfigException.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Exception;
+
+use InvalidArgumentException;
+use Shlinkio\Shlink\Rest\ApiKey\Role;
+
+use function sprintf;
+
+class InvalidRoleConfigException extends InvalidArgumentException implements ExceptionInterface
+{
+    public static function forDomainOnlyWithDefaultDomain(): self
+    {
+        return new self(sprintf(
+            'You cannot create an API key with the "%s" role attached to the default domain. '
+            . 'The role is currently limited to non-default domains.',
+            Role::DOMAIN_SPECIFIC->value,
+        ));
+    }
+}

module/CLI/src/Util/GeolocationDbUpdater.php

@@ -66,9 +66,8 @@ class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
     {
         $buildTimestamp = $this->resolveBuildTimestamp($meta);
         $buildDate = Chronos::createFromTimestamp($buildTimestamp);
-        $now = Chronos::now();
 
-        return $now->gt($buildDate->addDays(35));
+        return Chronos::now()->gt($buildDate->addDays(35));
     }
 
     private function resolveBuildTimestamp(Metadata $meta): int

module/CLI/src/Util/ShlinkTable.php

@@ -15,7 +15,7 @@ final class ShlinkTable
     private const DEFAULT_STYLE_NAME = 'default';
     private const TABLE_TITLE_STYLE = '<options=bold> %s </>';
 
-    private function __construct(private Table $baseTable, private bool $withRowSeparators)
+    private function __construct(private readonly Table $baseTable, private readonly bool $withRowSeparators)
     {
     }
 

module/CLI/test/ApiKey/RoleResolverTest.php

@@ -8,6 +8,7 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\ApiKey\RoleResolver;
+use Shlinkio\Shlink\CLI\Exception\InvalidRoleConfigException;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Core\Entity\Domain;
 use Shlinkio\Shlink\Rest\ApiKey\Model\RoleDefinition;
@@ -23,7 +24,7 @@ class RoleResolverTest extends TestCase
     protected function setUp(): void
     {
         $this->domainService = $this->prophesize(DomainServiceInterface::class);
-        $this->resolver = new RoleResolver($this->domainService->reveal());
+        $this->resolver = new RoleResolver($this->domainService->reveal(), 'default.com');
     }
 
     /**
@@ -94,4 +95,16 @@ class RoleResolverTest extends TestCase
             1,
         ];
     }
+
+    /** @test */
+    public function exceptionIsThrownWhenTryingToAddDomainOnlyLinkedToDefaultDomain(): void
+    {
+        $input = $this->prophesize(InputInterface::class);
+        $input->getOption(RoleResolver::DOMAIN_ONLY_PARAM)->willReturn('default.com');
+        $input->getOption(RoleResolver::AUTHOR_ONLY_PARAM)->willReturn(null);
+
+        $this->expectException(InvalidRoleConfigException::class);
+
+        $this->resolver->determineRoles($input->reveal());
+    }
 }

module/CLI/test/Command/Db/CreateDatabaseCommandTest.php

@@ -5,7 +5,9 @@ declare(strict_types=1);
 namespace ShlinkioTest\Shlink\CLI\Command\Db;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -19,6 +21,8 @@ use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Lock\LockInterface;
 use Symfony\Component\Process\PhpExecutableFinder;
 
+use const Shlinkio\Shlink\MIGRATIONS_TABLE;
+
 class CreateDatabaseCommandTest extends TestCase
 {
     use CliTestUtilsTrait;
@@ -27,7 +31,7 @@ class CreateDatabaseCommandTest extends TestCase
     private ObjectProphecy $processHelper;
     private ObjectProphecy $regularConn;
     private ObjectProphecy $schemaManager;
-    private ObjectProphecy $databasePlatform;
+    private ObjectProphecy $driver;
 
     public function setUp(): void
     {
@@ -43,11 +47,12 @@ class CreateDatabaseCommandTest extends TestCase
 
         $this->processHelper = $this->prophesize(ProcessRunnerInterface::class);
         $this->schemaManager = $this->prophesize(AbstractSchemaManager::class);
-        $this->databasePlatform = $this->prophesize(AbstractPlatform::class);
 
         $this->regularConn = $this->prophesize(Connection::class);
         $this->regularConn->createSchemaManager()->willReturn($this->schemaManager->reveal());
-        $this->regularConn->getDatabasePlatform()->willReturn($this->databasePlatform->reveal());
+        $this->driver = $this->prophesize(Driver::class);
+        $this->regularConn->getDriver()->willReturn($this->driver->reveal());
+        $this->driver->getDatabasePlatform()->willReturn($this->prophesize(AbstractPlatform::class)->reveal());
         $noDbNameConn = $this->prophesize(Connection::class);
         $noDbNameConn->createSchemaManager()->willReturn($this->schemaManager->reveal());
 
@@ -66,7 +71,7 @@ class CreateDatabaseCommandTest extends TestCase
     public function successMessageIsPrintedIfDatabaseAlreadyExists(): void
     {
         $shlinkDatabase = 'shlink_database';
-        $getDatabase = $this->regularConn->getDatabase()->willReturn($shlinkDatabase);
+        $getDatabase = $this->regularConn->getParams()->willReturn(['dbname' => $shlinkDatabase]);
         $listDatabases = $this->schemaManager->listDatabases()->willReturn(['foo', $shlinkDatabase, 'bar']);
         $createDatabase = $this->schemaManager->createDatabase($shlinkDatabase)->will(function (): void {
         });
@@ -86,11 +91,11 @@ class CreateDatabaseCommandTest extends TestCase
     public function databaseIsCreatedIfItDoesNotExist(): void
     {
         $shlinkDatabase = 'shlink_database';
-        $getDatabase = $this->regularConn->getDatabase()->willReturn($shlinkDatabase);
+        $getDatabase = $this->regularConn->getParams()->willReturn(['dbname' => $shlinkDatabase]);
         $listDatabases = $this->schemaManager->listDatabases()->willReturn(['foo', 'bar']);
         $createDatabase = $this->schemaManager->createDatabase($shlinkDatabase)->will(function (): void {
         });
-        $listTables = $this->schemaManager->listTableNames()->willReturn(['foo_table', 'bar_table']);
+        $listTables = $this->schemaManager->listTableNames()->willReturn(['foo_table', 'bar_table', MIGRATIONS_TABLE]);
 
         $this->commandTester->execute([]);
 
@@ -100,15 +105,18 @@ class CreateDatabaseCommandTest extends TestCase
         $listTables->shouldHaveBeenCalledOnce();
     }
 
-    /** @test */
-    public function tablesAreCreatedIfDatabaseIsEmpty(): void
+    /**
+     * @test
+     * @dataProvider provideEmptyDatabase
+     */
+    public function tablesAreCreatedIfDatabaseIsEmpty(array $tables): void
     {
         $shlinkDatabase = 'shlink_database';
-        $getDatabase = $this->regularConn->getDatabase()->willReturn($shlinkDatabase);
+        $getDatabase = $this->regularConn->getParams()->willReturn(['dbname' => $shlinkDatabase]);
         $listDatabases = $this->schemaManager->listDatabases()->willReturn(['foo', $shlinkDatabase, 'bar']);
         $createDatabase = $this->schemaManager->createDatabase($shlinkDatabase)->will(function (): void {
         });
-        $listTables = $this->schemaManager->listTableNames()->willReturn([]);
+        $listTables = $this->schemaManager->listTableNames()->willReturn($tables);
         $runCommand = $this->processHelper->run(Argument::type(OutputInterface::class), [
             '/usr/local/bin/php',
             CreateDatabaseCommand::DOCTRINE_SCRIPT,
@@ -128,13 +136,19 @@ class CreateDatabaseCommandTest extends TestCase
         $runCommand->shouldHaveBeenCalledOnce();
     }
 
+    public function provideEmptyDatabase(): iterable
+    {
+        yield 'no tables' => [[]];
+        yield 'migrations table' => [[MIGRATIONS_TABLE]];
+    }
+
     /** @test */
     public function databaseCheckIsSkippedForSqlite(): void
     {
-        $this->databasePlatform->getName()->willReturn('sqlite');
+        $this->driver->getDatabasePlatform()->willReturn($this->prophesize(SqlitePlatform::class)->reveal());
 
         $shlinkDatabase = 'shlink_database';
-        $getDatabase = $this->regularConn->getDatabase()->willReturn($shlinkDatabase);
+        $getDatabase = $this->regularConn->getParams()->willReturn(['dbname' => $shlinkDatabase]);
         $listDatabases = $this->schemaManager->listDatabases()->willReturn(['foo', 'bar']);
         $createDatabase = $this->schemaManager->createDatabase($shlinkDatabase)->will(function (): void {
         });

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

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Domain;
+
+use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Domain\GetDomainVisitsCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class GetDomainVisitsCommandTest extends TestCase
+{
+    use CliTestUtilsTrait;
+
+    private CommandTester $commandTester;
+    private ObjectProphecy $visitsHelper;
+    private ObjectProphecy $stringifier;
+
+    protected function setUp(): void
+    {
+        $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
+        $this->stringifier = $this->prophesize(ShortUrlStringifierInterface::class);
+
+        $this->commandTester = $this->testerForCommand(
+            new GetDomainVisitsCommand($this->visitsHelper->reveal(), $this->stringifier->reveal()),
+        );
+    }
+
+    /** @test */
+    public function outputIsProperlyGenerated(): void
+    {
+        $shortUrl = ShortUrl::createEmpty();
+        $visit = Visit::forValidShortUrl($shortUrl, new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
+        $domain = 'doma.in';
+        $getVisits = $this->visitsHelper->visitsForDomain($domain, Argument::any())->willReturn(
+            new Paginator(new ArrayAdapter([$visit])),
+        );
+        $stringify = $this->stringifier->stringify($shortUrl)->willReturn('the_short_url');
+
+        $this->commandTester->execute(['domain' => $domain]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | Referer | Date                      | User agent | Country | City   | Short Url     |
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid | the_short_url |
+            +---------+---------------------------+------------+---------+--------+---------------+
+
+            OUTPUT,
+            $output,
+        );
+        $getVisits->shouldHaveBeenCalledOnce();
+        $stringify->shouldHaveBeenCalledOnce();
+    }
+}

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

@@ -14,6 +14,7 @@ use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
+use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
 use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
@@ -38,8 +39,7 @@ class CreateShortUrlCommandTest extends TestCase
         $command = new CreateShortUrlCommand(
             $this->urlShortener->reveal(),
             $this->stringifier->reveal(),
-            5,
-            self::DEFAULT_DOMAIN,
+            new UrlShortenerOptions(['defaultShortCodesLength' => 5, 'domain' => ['hostname' => self::DEFAULT_DOMAIN]]),
         );
         $this->commandTester = $this->testerForCommand($command);
     }

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

@@ -36,10 +36,11 @@ class DeleteShortUrlCommandTest extends TestCase
     public function successMessageIsPrintedIfUrlIsProperlyDeleted(): void
     {
         $shortCode = 'abc123';
-        $deleteByShortCode = $this->service->deleteByShortCode(new ShortUrlIdentifier($shortCode), false)->will(
-            function (): void {
-            },
-        );
+        $deleteByShortCode = $this->service->deleteByShortCode(
+            ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
+            false,
+        )->will(function (): void {
+        });
 
         $this->commandTester->execute(['shortCode' => $shortCode]);
         $output = $this->commandTester->getDisplay();
@@ -55,7 +56,7 @@ class DeleteShortUrlCommandTest extends TestCase
     public function invalidShortCodePrintsMessage(): void
     {
         $shortCode = 'abc123';
-        $identifier = new ShortUrlIdentifier($shortCode);
+        $identifier = ShortUrlIdentifier::fromShortCodeAndDomain($shortCode);
         $deleteByShortCode = $this->service->deleteByShortCode($identifier, false)->willThrow(
             Exception\ShortUrlNotFoundException::fromNotFound($identifier),
         );
@@ -77,7 +78,7 @@ class DeleteShortUrlCommandTest extends TestCase
         string $expectedMessage,
     ): void {
         $shortCode = 'abc123';
-        $identifier = new ShortUrlIdentifier($shortCode);
+        $identifier = ShortUrlIdentifier::fromShortCodeAndDomain($shortCode);
         $deleteByShortCode = $this->service->deleteByShortCode($identifier, Argument::type('bool'))->will(
             function (array $args) use ($shortCode): void {
                 $ignoreThreshold = array_pop($args);
@@ -114,12 +115,13 @@ class DeleteShortUrlCommandTest extends TestCase
     public function deleteIsNotRetriedWhenThresholdIsReachedAndQuestionIsDeclined(): void
     {
         $shortCode = 'abc123';
-        $deleteByShortCode = $this->service->deleteByShortCode(new ShortUrlIdentifier($shortCode), false)->willThrow(
-            Exception\DeleteShortUrlException::fromVisitsThreshold(
-                10,
-                ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
-            ),
-        );
+        $deleteByShortCode = $this->service->deleteByShortCode(
+            ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
+            false,
+        )->willThrow(Exception\DeleteShortUrlException::fromVisitsThreshold(
+            10,
+            ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
+        ));
         $this->commandTester->setInputs(['no']);
 
         $this->commandTester->execute(['shortCode' => $shortCode]);

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

@@ -9,7 +9,7 @@ use Pagerfanta\Adapter\ArrayAdapter;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\ShortUrl\GetVisitsCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\GetShortUrlVisitsCommand;
 use Shlinkio\Shlink\Common\Paginator\Paginator;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
@@ -23,9 +23,10 @@ use Shlinkio\Shlink\IpGeolocation\Model\Location;
 use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
 use Symfony\Component\Console\Tester\CommandTester;
 
+use function Shlinkio\Shlink\Common\buildDateRange;
 use function sprintf;
 
-class GetVisitsCommandTest extends TestCase
+class GetShortUrlVisitsCommandTest extends TestCase
 {
     use CliTestUtilsTrait;
 
@@ -35,7 +36,7 @@ class GetVisitsCommandTest extends TestCase
     public function setUp(): void
     {
         $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
-        $command = new GetVisitsCommand($this->visitsHelper->reveal());
+        $command = new GetShortUrlVisitsCommand($this->visitsHelper->reveal());
         $this->commandTester = $this->testerForCommand($command);
     }
 
@@ -44,8 +45,8 @@ class GetVisitsCommandTest extends TestCase
     {
         $shortCode = 'abc123';
         $this->visitsHelper->visitsForShortUrl(
-            new ShortUrlIdentifier($shortCode),
-            new VisitsParams(DateRange::emptyInstance()),
+            ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
+            new VisitsParams(DateRange::allTime()),
         )
             ->willReturn(new Paginator(new ArrayAdapter([])))
             ->shouldBeCalledOnce();
@@ -60,8 +61,8 @@ class GetVisitsCommandTest extends TestCase
         $startDate = '2016-01-01';
         $endDate = '2016-02-01';
         $this->visitsHelper->visitsForShortUrl(
-            new ShortUrlIdentifier($shortCode),
-            new VisitsParams(DateRange::withStartAndEndDate(Chronos::parse($startDate), Chronos::parse($endDate))),
+            ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
+            new VisitsParams(buildDateRange(Chronos::parse($startDate), Chronos::parse($endDate))),
         )
             ->willReturn(new Paginator(new ArrayAdapter([])))
             ->shouldBeCalledOnce();
@@ -79,8 +80,8 @@ class GetVisitsCommandTest extends TestCase
         $shortCode = 'abc123';
         $startDate = 'foo';
         $info = $this->visitsHelper->visitsForShortUrl(
-            new ShortUrlIdentifier($shortCode),
-            new VisitsParams(DateRange::emptyInstance()),
+            ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
+            new VisitsParams(DateRange::allTime()),
         )->willReturn(new Paginator(new ArrayAdapter([])));
 
         $this->commandTester->execute([
@@ -99,19 +100,30 @@ class GetVisitsCommandTest extends TestCase
     /** @test */
     public function outputIsProperlyGenerated(): void
     {
+        $visit = Visit::forValidShortUrl(ShortUrl::createEmpty(), new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
         $shortCode = 'abc123';
-        $this->visitsHelper->visitsForShortUrl(new ShortUrlIdentifier($shortCode), Argument::any())->willReturn(
-            new Paginator(new ArrayAdapter([
-                Visit::forValidShortUrl(ShortUrl::createEmpty(), new Visitor('bar', 'foo', '', ''))->locate(
-                    VisitLocation::fromGeolocation(new Location('', 'Spain', '', '', 0, 0, '')),
-                ),
-            ])),
+        $this->visitsHelper->visitsForShortUrl(
+            ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
+            Argument::any(),
+        )->willReturn(
+            new Paginator(new ArrayAdapter([$visit])),
         )->shouldBeCalledOnce();
 
         $this->commandTester->execute(['shortCode' => $shortCode]);
         $output = $this->commandTester->getDisplay();
-        self::assertStringContainsString('foo', $output);
-        self::assertStringContainsString('Spain', $output);
-        self::assertStringContainsString('bar', $output);
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+
+            | Referer | Date                      | User agent | Country | City   |
+            +---------+---------------------------+------------+---------+--------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid |
+            +---------+---------------------------+------------+---------+--------+
+
+            OUTPUT,
+            $output,
+        );
     }
 }

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

@@ -16,6 +16,7 @@ use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
 use Shlinkio\Shlink\Core\Model\ShortUrlsParams;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifier;
+use Shlinkio\Shlink\Core\ShortUrl\Model\TagsMode;
 use Shlinkio\Shlink\Core\ShortUrl\Transformer\ShortUrlDataTransformer;
 use Shlinkio\Shlink\Rest\ApiKey\Model\ApiKeyMeta;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
@@ -205,23 +206,23 @@ class ListShortUrlsCommandTest extends TestCase
 
     public function provideArgs(): iterable
     {
-        yield [[], 1, null, [], ShortUrlsParams::TAGS_MODE_ANY];
-        yield [['--page' => $page = 3], $page, null, [], ShortUrlsParams::TAGS_MODE_ANY];
-        yield [['--including-all-tags' => true], 1, null, [], ShortUrlsParams::TAGS_MODE_ALL];
-        yield [['--search-term' => $searchTerm = 'search this'], 1, $searchTerm, [], ShortUrlsParams::TAGS_MODE_ANY];
+        yield [[], 1, null, [], TagsMode::ANY->value];
+        yield [['--page' => $page = 3], $page, null, [], TagsMode::ANY->value];
+        yield [['--including-all-tags' => true], 1, null, [], TagsMode::ALL->value];
+        yield [['--search-term' => $searchTerm = 'search this'], 1, $searchTerm, [], TagsMode::ANY->value];
         yield [
             ['--page' => $page = 3, '--search-term' => $searchTerm = 'search this', '--tags' => $tags = 'foo,bar'],
             $page,
             $searchTerm,
             explode(',', $tags),
-            ShortUrlsParams::TAGS_MODE_ANY,
+            TagsMode::ANY->value,
         ];
         yield [
             ['--start-date' => $startDate = '2019-01-01'],
             1,
             null,
             [],
-            ShortUrlsParams::TAGS_MODE_ANY,
+            TagsMode::ANY->value,
             $startDate,
         ];
         yield [
@@ -229,7 +230,7 @@ class ListShortUrlsCommandTest extends TestCase
             1,
             null,
             [],
-            ShortUrlsParams::TAGS_MODE_ANY,
+            TagsMode::ANY->value,
             null,
             $endDate,
         ];
@@ -238,7 +239,7 @@ class ListShortUrlsCommandTest extends TestCase
             1,
             null,
             [],
-            ShortUrlsParams::TAGS_MODE_ANY,
+            TagsMode::ANY->value,
             $startDate,
             $endDate,
         ];
@@ -276,7 +277,7 @@ class ListShortUrlsCommandTest extends TestCase
             'page' => 1,
             'searchTerm' => null,
             'tags' => [],
-            'tagsMode' => ShortUrlsParams::TAGS_MODE_ANY,
+            'tagsMode' => TagsMode::ANY->value,
             'startDate' => null,
             'endDate' => null,
             'orderBy' => null,

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

@@ -37,8 +37,9 @@ class ResolveUrlCommandTest extends TestCase
         $shortCode = 'abc123';
         $expectedUrl = 'http://domain.com/foo/bar';
         $shortUrl = ShortUrl::withLongUrl($expectedUrl);
-        $this->urlResolver->resolveShortUrl(new ShortUrlIdentifier($shortCode))->willReturn($shortUrl)
-                                                                               ->shouldBeCalledOnce();
+        $this->urlResolver->resolveShortUrl(ShortUrlIdentifier::fromShortCodeAndDomain($shortCode))->willReturn(
+            $shortUrl,
+        )->shouldBeCalledOnce();
 
         $this->commandTester->execute(['shortCode' => $shortCode]);
         $output = $this->commandTester->getDisplay();
@@ -48,8 +49,8 @@ class ResolveUrlCommandTest extends TestCase
     /** @test */
     public function incorrectShortCodeOutputsErrorMessage(): void
     {
-        $identifier = new ShortUrlIdentifier('abc123');
-        $shortCode = $identifier->shortCode();
+        $identifier = ShortUrlIdentifier::fromShortCodeAndDomain('abc123');
+        $shortCode = $identifier->shortCode;
 
         $this->urlResolver->resolveShortUrl($identifier)
             ->willThrow(ShortUrlNotFoundException::fromNotFound($identifier))

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

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Tag;
+
+use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Tag\GetTagVisitsCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class GetTagVisitsCommandTest extends TestCase
+{
+    use CliTestUtilsTrait;
+
+    private CommandTester $commandTester;
+    private ObjectProphecy $visitsHelper;
+    private ObjectProphecy $stringifier;
+
+    protected function setUp(): void
+    {
+        $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
+        $this->stringifier = $this->prophesize(ShortUrlStringifierInterface::class);
+
+        $this->commandTester = $this->testerForCommand(
+            new GetTagVisitsCommand($this->visitsHelper->reveal(), $this->stringifier->reveal()),
+        );
+    }
+
+    /** @test */
+    public function outputIsProperlyGenerated(): void
+    {
+        $shortUrl = ShortUrl::createEmpty();
+        $visit = Visit::forValidShortUrl($shortUrl, new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
+        $tag = 'abc123';
+        $getVisits = $this->visitsHelper->visitsForTag($tag, Argument::any())->willReturn(
+            new Paginator(new ArrayAdapter([$visit])),
+        );
+        $stringify = $this->stringifier->stringify($shortUrl)->willReturn('the_short_url');
+
+        $this->commandTester->execute(['tag' => $tag]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | Referer | Date                      | User agent | Country | City   | Short Url     |
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid | the_short_url |
+            +---------+---------------------------+------------+---------+--------+---------------+
+
+            OUTPUT,
+            $output,
+        );
+        $getVisits->shouldHaveBeenCalledOnce();
+        $stringify->shouldHaveBeenCalledOnce();
+    }
+}

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

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Visit;
+
+use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Visit\GetNonOrphanVisitsCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class GetNonOrphanVisitsCommandTest extends TestCase
+{
+    use CliTestUtilsTrait;
+
+    private CommandTester $commandTester;
+    private ObjectProphecy $visitsHelper;
+    private ObjectProphecy $stringifier;
+
+    protected function setUp(): void
+    {
+        $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
+        $this->stringifier = $this->prophesize(ShortUrlStringifierInterface::class);
+
+        $this->commandTester = $this->testerForCommand(
+            new GetNonOrphanVisitsCommand($this->visitsHelper->reveal(), $this->stringifier->reveal()),
+        );
+    }
+
+    /** @test */
+    public function outputIsProperlyGenerated(): void
+    {
+        $shortUrl = ShortUrl::createEmpty();
+        $visit = Visit::forValidShortUrl($shortUrl, new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
+        $getVisits = $this->visitsHelper->nonOrphanVisits(Argument::any())->willReturn(
+            new Paginator(new ArrayAdapter([$visit])),
+        );
+        $stringify = $this->stringifier->stringify($shortUrl)->willReturn('the_short_url');
+
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | Referer | Date                      | User agent | Country | City   | Short Url     |
+            +---------+---------------------------+------------+---------+--------+---------------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid | the_short_url |
+            +---------+---------------------------+------------+---------+--------+---------------+
+
+            OUTPUT,
+            $output,
+        );
+        $getVisits->shouldHaveBeenCalledOnce();
+        $stringify->shouldHaveBeenCalledOnce();
+    }
+}

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

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Visit;
+
+use Pagerfanta\Adapter\ArrayAdapter;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Visit\GetOrphanVisitsCommand;
+use Shlinkio\Shlink\Common\Paginator\Paginator;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\VisitLocation;
+use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\Visit\VisitsStatsHelperInterface;
+use Shlinkio\Shlink\IpGeolocation\Model\Location;
+use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class GetOrphanVisitsCommandTest extends TestCase
+{
+    use CliTestUtilsTrait;
+
+    private CommandTester $commandTester;
+    private ObjectProphecy $visitsHelper;
+
+    protected function setUp(): void
+    {
+        $this->visitsHelper = $this->prophesize(VisitsStatsHelperInterface::class);
+        $this->commandTester = $this->testerForCommand(new GetOrphanVisitsCommand($this->visitsHelper->reveal()));
+    }
+
+    /** @test */
+    public function outputIsProperlyGenerated(): void
+    {
+        $visit = Visit::forBasePath(new Visitor('bar', 'foo', '', ''))->locate(
+            VisitLocation::fromGeolocation(new Location('', 'Spain', '', 'Madrid', 0, 0, '')),
+        );
+        $getVisits = $this->visitsHelper->orphanVisits(Argument::any())->willReturn(
+            new Paginator(new ArrayAdapter([$visit])),
+        );
+
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertEquals(
+            <<<OUTPUT
+            +---------+---------------------------+------------+---------+--------+----------+
+            | Referer | Date                      | User agent | Country | City   | Type     |
+            +---------+---------------------------+------------+---------+--------+----------+
+            | foo     | {$visit->getDate()->toAtomString()} | bar        | Spain   | Madrid | base_url |
+            +---------+---------------------------+------------+---------+--------+----------+
+
+            OUTPUT,
+            $output,
+        );
+        $getVisits->shouldHaveBeenCalledOnce();
+    }
+}

module/CLI/test/Exception/InvalidRoleConfigExceptionTest.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Exception;
+
+use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\CLI\Exception\InvalidRoleConfigException;
+use Shlinkio\Shlink\Rest\ApiKey\Role;
+
+use function sprintf;
+
+class InvalidRoleConfigExceptionTest extends TestCase
+{
+    /** @test */
+    public function forDomainOnlyWithDefaultDomainGeneratesExpectedException(): void
+    {
+        $e = InvalidRoleConfigException::forDomainOnlyWithDefaultDomain();
+
+        self::assertEquals(sprintf(
+            'You cannot create an API key with the "%s" role attached to the default domain. '
+            . 'The role is currently limited to non-default domains.',
+            Role::DOMAIN_SPECIFIC->value,
+        ), $e->getMessage());
+    }
+}

module/CLI/test/Util/GeolocationDbUpdaterTest.php

@@ -30,6 +30,7 @@ class GeolocationDbUpdaterTest extends TestCase
     private ObjectProphecy $dbUpdater;
     private ObjectProphecy $geoLiteDbReader;
     private TrackingOptions $trackingOptions;
+    private ObjectProphecy $lock;
 
     public function setUp(): void
     {
@@ -38,11 +39,11 @@ class GeolocationDbUpdaterTest extends TestCase
         $this->trackingOptions = new TrackingOptions();
 
         $locker = $this->prophesize(Lock\LockFactory::class);
-        $lock = $this->prophesize(Lock\LockInterface::class);
-        $lock->acquire(true)->willReturn(true);
-        $lock->release()->will(function (): void {
+        $this->lock = $this->prophesize(Lock\LockInterface::class);
+        $this->lock->acquire(true)->willReturn(true);
+        $this->lock->release()->will(function (): void {
         });
-        $locker->createLock(Argument::type('string'))->willReturn($lock->reveal());
+        $locker->createLock(Argument::type('string'))->willReturn($this->lock->reveal());
 
         $this->geolocationDbUpdater = new GeolocationDbUpdater(
             $this->dbUpdater->reveal(),
@@ -75,6 +76,8 @@ class GeolocationDbUpdaterTest extends TestCase
         $fileExists->shouldHaveBeenCalledOnce();
         $getMeta->shouldNotHaveBeenCalled();
         $download->shouldHaveBeenCalledOnce();
+        $this->lock->acquire(true)->shouldHaveBeenCalledOnce();
+        $this->lock->release()->shouldHaveBeenCalledOnce();
     }
 
     /**

module/Core/config/dependencies.config.php

@@ -27,6 +27,7 @@ return [
             Options\UrlShortenerOptions::class => ConfigAbstractFactory::class,
             Options\TrackingOptions::class => ConfigAbstractFactory::class,
             Options\QrCodeOptions::class => ConfigAbstractFactory::class,
+            Options\RabbitMqOptions::class => ConfigAbstractFactory::class,
             Options\WebhookOptions::class => ConfigAbstractFactory::class,
 
             Service\UrlShortener::class => ConfigAbstractFactory::class,
@@ -63,7 +64,7 @@ return [
             ShortUrl\Transformer\ShortUrlDataTransformer::class => ConfigAbstractFactory::class,
             ShortUrl\Middleware\ExtraPathRedirectMiddleware::class => ConfigAbstractFactory::class,
 
-            Mercure\MercureUpdatesGenerator::class => ConfigAbstractFactory::class,
+            EventDispatcher\PublishingUpdatesGenerator::class => ConfigAbstractFactory::class,
 
             Importer\ImportedLinksProcessor::class => ConfigAbstractFactory::class,
 
@@ -91,6 +92,7 @@ return [
         Options\UrlShortenerOptions::class => ['config.url_shortener'],
         Options\TrackingOptions::class => ['config.tracking'],
         Options\QrCodeOptions::class => ['config.qr_codes'],
+        Options\RabbitMqOptions::class => ['config.rabbitmq'],
         Options\WebhookOptions::class => ['config.visits_webhooks'],
 
         Service\UrlShortener::class => [
@@ -98,6 +100,7 @@ return [
             'em',
             ShortUrl\Resolver\PersistenceShortUrlRelationResolver::class,
             Service\ShortUrl\ShortCodeUniquenessHelper::class,
+            EventDispatcherInterface::class,
         ],
         Visit\VisitsTracker::class => [
             'em',
@@ -157,7 +160,7 @@ return [
             Options\UrlShortenerOptions::class,
         ],
 
-        Mercure\MercureUpdatesGenerator::class => [
+        EventDispatcher\PublishingUpdatesGenerator::class => [
             ShortUrl\Transformer\ShortUrlDataTransformer::class,
             Visit\Transformer\OrphanVisitDataTransformer::class,
         ],

module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.Visit.php

@@ -6,9 +6,11 @@ namespace Shlinkio\Shlink\Core;
 
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
+use Doctrine\ORM\Mapping\Builder\FieldBuilder;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Shlinkio\Shlink\Common\Doctrine\Type\ChronosDateTimeType;
 use Shlinkio\Shlink\Core\Model\Visitor;
+use Shlinkio\Shlink\Core\Visit\Model\VisitType;
 
 return static function (ClassMetadata $metadata, array $emConfig): void {
     $builder = new ClassMetadataBuilder($metadata);
@@ -61,10 +63,13 @@ return static function (ClassMetadata $metadata, array $emConfig): void {
             ->nullable()
             ->build();
 
-    $builder->createField('type', Types::STRING)
-            ->columnName('type')
-            ->length(255)
-            ->build();
+    (new FieldBuilder($builder, [
+        'fieldName' => 'type',
+        'type' => Types::STRING,
+        'enumType' => VisitType::class,
+    ]))->columnName('type')
+       ->length(255)
+       ->build();
 
     $builder->createField('potentialBot', Types::BOOLEAN)
             ->columnName('potential_bot')