Merge pull request #1203 from shlinkio/develop

Release 2.9.1
Merge pull request #1202 from acelaya-forks/feature/fix-use-https
2026-03-06 07:13:11 +08:00 · 2021-10-11 09:03:16 +02:00 · 2021-10-11 09:01:38 +02:00 · 2021-10-11 08:47:41 +02:00 · 2021-10-11 08:46:40 +02:00 · 2021-10-10 22:45:17 +02:00
193 changed files with 3625 additions and 950 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: swoole-4.7.1
          coverage: none
      - run: composer install --no-interaction --prefer-dist
      - run: composer cs
@@ -39,7 +39,7 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: swoole-4.7.1
          coverage: none
      - run: composer install --no-interaction --prefer-dist
      - run: composer stan
@@ -48,7 +48,8 @@ jobs:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: ['8.0']
+        php-version: ['8.0', '8.1']
+    continue-on-error: ${{ matrix.php-version == '8.1' }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -57,10 +58,13 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: swoole-4.7.1
          coverage: pcov
          ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
+      - if: ${{ matrix.php-version == '8.1' }}
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
+      - if: ${{ matrix.php-version != '8.1' }}
+        run: composer install --no-interaction --prefer-dist
      - run: composer test:unit:ci
      - uses: actions/upload-artifact@v2
        if: ${{ matrix.php-version == '8.0' }}
@@ -74,7 +78,8 @@ jobs:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: ['8.0']
+        php-version: ['8.0', '8.1']
+    continue-on-error: ${{ matrix.php-version == '8.1' }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -83,10 +88,13 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: swoole-4.7.1
          coverage: pcov
          ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
+      - if: ${{ matrix.php-version == '8.1' }}
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
+      - if: ${{ matrix.php-version != '8.1' }}
+        run: composer install --no-interaction --prefer-dist
      - run: composer test:db:sqlite:ci
      - uses: actions/upload-artifact@v2
        if: ${{ matrix.php-version == '8.0' }}
@@ -100,7 +108,8 @@ jobs:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: ['8.0']
+        php-version: ['8.0', '8.1']
+    continue-on-error: ${{ matrix.php-version == '8.1' }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -111,16 +120,20 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: swoole-4.7.1
          coverage: none
-      - run: composer install --no-interaction --prefer-dist
+      - if: ${{ matrix.php-version == '8.1' }}
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
+      - if: ${{ matrix.php-version != '8.1' }}
+        run: composer install --no-interaction --prefer-dist
      - run: composer test:db:mysql

  db-tests-maria:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: ['8.0']
+        php-version: ['8.0', '8.1']
+    continue-on-error: ${{ matrix.php-version == '8.1' }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -131,16 +144,20 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: swoole-4.7.1
          coverage: none
-      - run: composer install --no-interaction --prefer-dist
+      - if: ${{ matrix.php-version == '8.1' }}
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
+      - if: ${{ matrix.php-version != '8.1' }}
+        run: composer install --no-interaction --prefer-dist
      - run: composer test:db:maria

  db-tests-postgres:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: ['8.0']
+        php-version: ['8.0', '8.1']
+    continue-on-error: ${{ matrix.php-version == '8.1' }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -151,16 +168,20 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: swoole-4.7.1
          coverage: none
-      - run: composer install --no-interaction --prefer-dist
+      - if: ${{ matrix.php-version == '8.1' }}
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
+      - if: ${{ matrix.php-version != '8.1' }}
+        run: composer install --no-interaction --prefer-dist
      - run: composer test:db:postgres

  db-tests-ms:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: ['8.0']
+        php-version: ['8.0', '8.1']
+    continue-on-error: ${{ matrix.php-version == '8.1' }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -169,13 +190,25 @@ jobs:
      - name: Start database server
        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_ms
      - name: Use PHP
+        if: ${{ matrix.php-version == '8.1' }}
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7, pdo_sqlsrv-5.9.0
+          extensions: swoole-4.7.1, pdo_sqlsrv-5.10.0beta1
          coverage: none
-      - run: composer install --no-interaction --prefer-dist
+      - name: Use PHP
+        if: ${{ matrix.php-version != '8.1' }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer
+          extensions: swoole-4.7.1, pdo_sqlsrv-5.9.0
+          coverage: none
+      - if: ${{ matrix.php-version == '8.1' }}
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
+      - if: ${{ matrix.php-version != '8.1' }}
+        run: composer install --no-interaction --prefer-dist
      - name: Create test database
        run: docker-compose exec -T shlink_db_ms /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Passw0rd!' -Q "CREATE DATABASE shlink_test;"
      - run: composer test:db:ms
@@ -184,7 +217,8 @@ jobs:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: ['8.0']
+        php-version: ['8.0', '8.1']
+    continue-on-error: ${{ matrix.php-version == '8.1' }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -195,10 +229,13 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: swoole-4.7.1
          coverage: pcov
          ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
+      - if: ${{ matrix.php-version == '8.1' }}
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
+      - if: ${{ matrix.php-version != '8.1' }}
+        run: composer install --no-interaction --prefer-dist
      - run: bin/test/run-api-tests.sh
      - uses: actions/upload-artifact@v2
        if: ${{ matrix.php-version == '8.0' }}
@@ -216,8 +253,9 @@ jobs:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: ['8.0']
+        php-version: ['8.0', '8.1']
        test-group: ['unit', 'db']
+    continue-on-error: ${{ matrix.php-version == '8.1' }}
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -226,10 +264,13 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: swoole-4.7.1
          coverage: pcov
          ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
+      - if: ${{ matrix.php-version == '8.1' }}
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
+      - if: ${{ matrix.php-version != '8.1' }}
+        run: composer install --no-interaction --prefer-dist
      - uses: actions/download-artifact@v2
        with:
          path: build
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,18 +4,9 @@ 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).

-## [Unreleased]
+## [2.9.1] - 2021-10-11
 ### Added
-* [#1089](https://github.com/shlinkio/shlink/issues/1089) Added new `ENABLE_PERIODIC_VISIT_LOCATE` env var to docker image which schedules the `visit:locate` command every hour when provided with value `true`.
-* [#1082](https://github.com/shlinkio/shlink/issues/1082) Added support for error correction level on QR codes.
-
-    Now, when calling the `GET /{shorCode}/qr-code` URL, you can pass the `errorCorrection` query param with values `L` for Low, `M` for Medium, `Q` for Quartile or `H` for High.
-
-* [#1080](https://github.com/shlinkio/shlink/issues/1080) Added support to redirect to URLs as soon as the path starts with a valid short code, appending the rest of the path to the redirected long URL.
-
-    With this, if you have the `https://example.com/abc123` short URL redirecting to `https://www.twitter.com`, a visit to `https://example.com/abc123/shlinkio` will take you to `https://www.twitter.com/shlinkio`.
-
-    This behavior needs to be actively opted in, via installer config options or env vars.
+* *Nothing*

 ### Changed
 * *Nothing*
@@ -23,12 +14,138 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 ### Deprecated
 * *Nothing*

+### Removed
+* *Nothing*
+
+### Fixed
+* [#1201](https://github.com/shlinkio/shlink/issues/1201) Fixed crash when using the new `USE_HTTPS`, as it's boolean raw value was being used instead of resolving "https" or "http".
+
+
+## [2.9.0] - 2021-10-10
+### Added
+* [#1015](https://github.com/shlinkio/shlink/issues/1015) Shlink now accepts configuration via env vars even when not using docker.
+
+  The config generated with the installing tool still has precedence over the env vars, so it cannot be combined. Either you use the tool, or use env vars.
+
+* [#1149](https://github.com/shlinkio/shlink/issues/1149) Allowed to set custom defaults for the QR codes.
+* [#1112](https://github.com/shlinkio/shlink/issues/1112) Added new option to define if the query string should be forwarded on a per-short URL basis.
+
+  The new `forwardQuery=true|false` param can be provided during short URL creation or edition, via REST API or CLI command, allowing to override the default behavior which makes the query string to always be forwarded.
+
+* [#1105](https://github.com/shlinkio/shlink/issues/1105) Added support to define placeholders on not-found redirects, so that the redirected URL receives the originally visited path and/or domain.
+
+  Currently, `{DOMAIN}` and `{ORIGINAL_PATH}` placeholders are supported, and they can be used both in the redirected URL's path or query.
+
+  When they are used in the query, the values are URL encoded.
+
+* [#1119](https://github.com/shlinkio/shlink/issues/1119) Added support to provide redis sentinel when using redis cache.
+* [#1016](https://github.com/shlinkio/shlink/issues/1016) Added new option to send orphan visits to webhooks, via `NOTIFY_ORPHAN_VISITS_TO_WEBHOOKS` env var or installer tool.
+
+  The option is disabled by default, as the payload is backwards incompatible. You will need to adapt your webhooks to treat the `shortUrl` property as optional before enabling this option.
+
+* [#1104](https://github.com/shlinkio/shlink/issues/1104) Added ability to disable tracking based on IP addresses.
+
+  IP addresses can be provided in the form of fixed addresses, CIDR blocks, or wildcard patterns (192.168.*.*).
+
+### Changed
+* [#1142](https://github.com/shlinkio/shlink/issues/1142) Replaced `doctrine/cache` package with `symfony/cache`.
+* [#1157](https://github.com/shlinkio/shlink/issues/1157) All routes now support CORS, not only rest ones.
+* [#1144](https://github.com/shlinkio/shlink/issues/1144) Added experimental builds under PHP 8.1.
+
+### Deprecated
+* [#1164](https://github.com/shlinkio/shlink/issues/1164) Deprecated `SHORT_DOMAIN_HOST` and `SHORT_DOMAIN_SCHEMA` env vars. Use `DEFAULT_DOMAIN` and `USE_HTTPS=true|false` instead.
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1165](https://github.com/shlinkio/shlink/issues/1165) Fixed warning displayed when trying to locate visits and there are none pending.
+* [#1172](https://github.com/shlinkio/shlink/pull/1172) Removed unneeded explicitly defined volumes in docker image.
+
+
+## [2.8.1] - 2021-08-15
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1155](https://github.com/shlinkio/shlink/issues/1155) Fixed numeric query params in long URLs being replaced by `0`.
+
+
+## [2.8.0] - 2021-08-04
+### Added
+* [#1089](https://github.com/shlinkio/shlink/issues/1089) Added new `ENABLE_PERIODIC_VISIT_LOCATE` env var to docker image which schedules the `visit:locate` command every hour when provided with value `true`.
+* [#1082](https://github.com/shlinkio/shlink/issues/1082) Added support for error correction level on QR codes.
+
+  Now, when calling the `GET /{shorCode}/qr-code` URL, you can pass the `errorCorrection` query param with values `L` for Low, `M` for Medium, `Q` for Quartile or `H` for High.
+
+* [#1080](https://github.com/shlinkio/shlink/issues/1080) Added support to redirect to URLs as soon as the path starts with a valid short code, appending the rest of the path to the redirected long URL.
+
+  With this, if you have the `https://example.com/abc123` short URL redirecting to `https://www.twitter.com`, a visit to `https://example.com/abc123/shlinkio` will take you to `https://www.twitter.com/shlinkio`.
+
+  This behavior needs to be actively opted in, via installer config options or env vars.
+
+* [#943](https://github.com/shlinkio/shlink/issues/943) Added support to define different "not-found" redirects for every domain handled by Shlink.
+
+  Shlink will continue to allow defining the default values via env vars or config, but afterwards, you can use the `domain:redirects` command or the `PATCH /domains/redirects` REST endpoint to define specific values for every single domain.
+
+### Changed
+* [#1118](https://github.com/shlinkio/shlink/issues/1118) Increased phpstan required level to 8.
+* [#1127](https://github.com/shlinkio/shlink/issues/1127) Updated to infection 0.24.
+* [#1139](https://github.com/shlinkio/shlink/issues/1139) Updated project dependencies, including base docker image to use PHP 8.0.9 and Alpine 3.14.
+
+### Deprecated
+* *Nothing*
+
 ### Removed
 * [#1046](https://github.com/shlinkio/shlink/issues/1046) Dropped support for PHP 7.4.

 ### Fixed
+* [#1098](https://github.com/shlinkio/shlink/issues/1098) Fixed errors when using Redis for caching, caused by some third party lib bug that was fixed on dependencies update.
+
+
+## [2.7.3] - 2021-08-02
+### Added
 * *Nothing*

+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1135](https://github.com/shlinkio/shlink/issues/1135) Fixed error when importing short URLs with no visits from another Shlink instance.
+* [#1136](https://github.com/shlinkio/shlink/issues/1136) Fixed error when fetching tag/short-url/orphan visits for a page lower than 1.
+
+
+## [2.7.2] - 2021-07-30
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1128](https://github.com/shlinkio/shlink/issues/1128) Increased memory limit reserved for the docker image, preventing it from crashing on GeoLite db download.
+

 ## [2.7.1] - 2021-05-30
 ### Added
--- a/26
+++ b/26
@@ -1,10 +1,10 @@
-FROM php:8.0.6-alpine3.13 as base
+FROM php:8.0.9-alpine3.14 as base

 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION ${SHLINK_VERSION}
-ENV SWOOLE_VERSION 4.6.7
+ENV SWOOLE_VERSION 4.7.1
 ENV PDO_SQLSRV_VERSION 5.9.0
-ENV MS_ODBC_SQL_VERSION 17.5.2.1
+ENV MS_ODBC_SQL_VERSION 17.5.2.2
 ENV LC_ALL "C"

 WORKDIR /etc/shlink
@@ -68,23 +68,19 @@ RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink
 # Expose default swoole port
 EXPOSE 8080

-# Expose params config dir, since the user is expected to provide custom config from there
-VOLUME /etc/shlink/config/params
-# Expose data dir to allow persistent runtime data and SQLite db
-VOLUME /etc/shlink/data
-
 # Copy config specific for the image
 COPY docker/docker-entrypoint.sh docker-entrypoint.sh
 COPY docker/config/shlink_in_docker.local.php config/autoload/shlink_in_docker.local.php
 COPY docker/config/php.ini ${PHP_INI_DIR}/conf.d/

 # Change the ownership of /etc/shlink/data to be writable, then change the user to non-root
-RUN chown 1001 /etc/shlink/data
-RUN chown 1001 /etc/shlink/data/locks
-RUN chown 1001 /etc/shlink/data/proxies
-RUN chown 1001 /etc/shlink/data/cache
-RUN chown 1001 /etc/shlink/data/log
-
-USER 1001
+# FIXME Disabled for now, as it conflicts with ENABLE_PERIODIC_VISIT_LOCATE, which is used to configure a cron as root.
+#       Ref: https://github.com/shlinkio/shlink/issues/1132
+#RUN chown 1001 /etc/shlink/data
+#RUN chown 1001 /etc/shlink/data/locks
+#RUN chown 1001 /etc/shlink/data/proxies
+#RUN chown 1001 /etc/shlink/data/cache
+#RUN chown 1001 /etc/shlink/data/log
+#USER 1001

 ENTRYPOINT ["/bin/sh", "./docker-entrypoint.sh"]
--- a/bin/cli
+++ b/bin/cli
@@ -3,5 +3,8 @@

 declare(strict_types=1);

-$run = require __DIR__ . '/../config/run.php';
-$run(true);
+use Symfony\Component\Console\Application;
+
+/** @var Application $app */
+$app = require __DIR__ . '/../config/cli-app.php';
+$app->run();
--- a/composer.json
+++ b/composer.json
@@ -16,64 +16,66 @@
        "ext-json": "*",
        "ext-pdo": "*",
        "akrabat/ip-address-middleware": "^2.0",
-        "cakephp/chronos": "^2.0",
+        "cakephp/chronos": "^2.2",
        "cocur/slugify": "^4.0",
-        "doctrine/cache": "^1.9",
-        "doctrine/migrations": "^3.1.1",
-        "doctrine/orm": "^2.8.4",
-        "endroid/qr-code": "^4.0",
-        "geoip2/geoip2": "^2.9",
-        "guzzlehttp/guzzle": "^7.0",
+        "doctrine/migrations": "^3.2",
+        "doctrine/orm": "^2.9",
+        "endroid/qr-code": "^4.2",
+        "geoip2/geoip2": "^2.11",
+        "guzzlehttp/guzzle": "^7.3",
        "happyr/doctrine-specification": "^2.0",
        "jaybizzle/crawler-detect": "^1.2",
-        "laminas/laminas-config": "^3.3",
-        "laminas/laminas-config-aggregator": "^1.1",
-        "laminas/laminas-diactoros": "^2.1.3",
-        "laminas/laminas-inputfilter": "^2.10",
-        "laminas/laminas-servicemanager": "^3.6",
-        "laminas/laminas-stdlib": "^3.2",
-        "lcobucci/jwt": "^4.0",
-        "league/uri": "^6.2",
+        "laminas/laminas-config": "^3.5",
+        "laminas/laminas-config-aggregator": "^1.5",
+        "laminas/laminas-diactoros": "^2.6",
+        "laminas/laminas-inputfilter": "^2.12",
+        "laminas/laminas-servicemanager": "^3.7",
+        "laminas/laminas-stdlib": "^3.5",
+        "lcobucci/jwt": "^4.1",
+        "league/uri": "^6.4",
        "lstrojny/functional-php": "^1.17",
-        "mezzio/mezzio": "^3.3",
-        "mezzio/mezzio-fastroute": "^3.1",
-        "mezzio/mezzio-problem-details": "^1.3",
+        "mezzio/mezzio": "^3.5",
+        "mezzio/mezzio-fastroute": "^3.2",
+        "mezzio/mezzio-problem-details": "^1.4",
        "mezzio/mezzio-swoole": "^3.3",
-        "monolog/monolog": "^2.0",
+        "monolog/monolog": "^2.3",
        "nikolaposa/monolog-factory": "^3.1",
        "ocramius/proxy-manager": "^2.11",
-        "pagerfanta/core": "^2.5",
+        "pagerfanta/core": "^2.7",
        "php-middleware/request-id": "^4.1",
        "predis/predis": "^1.1",
        "pugx/shortid-php": "^0.7",
        "ramsey/uuid": "^3.9",
-        "shlinkio/shlink-common": "^3.7",
-        "shlinkio/shlink-config": "^1.0",
+        "rlanvin/php-ip": "3.0.0-rc2",
+        "shlinkio/shlink-common": "^4.0",
+        "shlinkio/shlink-config": "^1.2",
        "shlinkio/shlink-event-dispatcher": "^2.1",
-        "shlinkio/shlink-importer": "^2.3",
-        "shlinkio/shlink-installer": "dev-develop#fa6a4ca as 6.1",
+        "shlinkio/shlink-importer": "^2.3.1",
+        "shlinkio/shlink-installer": "^6.2",
        "shlinkio/shlink-ip-geolocation": "^2.0",
-        "symfony/console": "^5.1",
-        "symfony/filesystem": "^5.1",
-        "symfony/lock": "^5.1",
-        "symfony/mercure": "^0.5.1",
-        "symfony/process": "^5.1",
-        "symfony/string": "^5.1"
+        "symfony/console": "^5.3",
+        "symfony/filesystem": "^5.3",
+        "symfony/lock": "^5.3",
+        "symfony/mercure": "^0.5.3",
+        "symfony/process": "^5.3",
+        "symfony/string": "^5.3"
    },
    "require-dev": {
        "devster/ubench": "^2.1",
-        "dms/phpunit-arraysubset-asserts": "^0.2.1",
+        "dms/phpunit-arraysubset-asserts": "^0.3.0",
        "eaglewu/swoole-ide-helper": "dev-master",
-        "infection/infection": "^0.21.0",
+        "infection/infection": "^0.25.0",
        "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/phpstan": "^0.12.64",
+        "phpstan/phpstan": "^0.12.94",
+        "phpstan/phpstan-doctrine": "^0.12.42",
+        "phpstan/phpstan-symfony": "^0.12.41",
        "phpunit/php-code-coverage": "^9.2",
        "phpunit/phpunit": "^9.5",
        "roave/security-advisories": "dev-master",
-        "shlinkio/php-coding-standard": "~2.1.1",
-        "shlinkio/shlink-test-utils": "^2.1",
-        "symfony/var-dumper": "^5.2",
-        "veewee/composer-run-parallel": "^0.1.0"
+        "shlinkio/php-coding-standard": "~2.2.0",
+        "shlinkio/shlink-test-utils": "^2.2",
+        "symfony/var-dumper": "^5.3",
+        "veewee/composer-run-parallel": "^1.0"
    },
    "autoload": {
        "psr-4": {
@@ -82,6 +84,7 @@
            "Shlinkio\\Shlink\\Core\\": "module/Core/src"
        },
        "files": [
+            "config/constants.php",
            "module/Core/functions/functions.php"
        ]
    },
@@ -112,7 +115,7 @@
        ],
        "cs": "phpcs",
        "cs:fix": "phpcbf",
-        "stan": "phpstan analyse module/*/src/ module/*/config config docker/config data/migrations --level=6",
+        "stan": "APP_ENV=test php vendor/bin/phpstan analyse module/*/src module/*/config config docker/config data/migrations --level=8",
        "test": [
            "@test:unit",
            "@test:db",
@@ -134,7 +137,7 @@
        "test:db:postgres": "DB_DRIVER=postgres composer test:db:sqlite",
        "test:db:ms": "DB_DRIVER=mssql composer test:db:sqlite",
        "test:api": "bin/test/run-api-tests.sh",
-        "infect:ci:base": "infection --threads=4 --log-verbosity=default --only-covered --skip-initial-tests",
+        "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:db": "@infect:ci:base --coverage=build/coverage-db --min-msi=95 --configuration=infection-db.json",
        "infect:ci": "@parallel infect:ci:unit infect:ci:db",
--- a/config/autoload/delete_short_urls.global.php
+++ b/config/autoload/delete_short_urls.global.php
@@ -4,11 +4,15 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink;

+use function Shlinkio\Shlink\Common\env;
+
+use const Shlinkio\Shlink\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
+
 return [

    'delete_short_urls' => [
-        'visits_threshold' => 15,
        'check_visits_threshold' => true,
+        'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', DEFAULT_DELETE_SHORT_URL_THRESHOLD),
    ],

 ];
--- a/config/autoload/entity-manager.global.php
+++ b/config/autoload/entity-manager.global.php
@@ -2,24 +2,52 @@

 declare(strict_types=1);

-namespace Shlinkio\Shlink\Common;
-
 use Happyr\DoctrineSpecification\Repository\EntitySpecificationRepository;

-return [
+use function Functional\contains;
+use function Shlinkio\Shlink\Common\env;

-    'entity_manager' => [
-        'orm' => [
-            'proxies_dir' => 'data/proxies',
-            'load_mappings_using_functional_style' => true,
-            'default_repository_classname' => EntitySpecificationRepository::class,
+return (static function (): array {
+    $driver = env('DB_DRIVER');
+    $isMysqlCompatible = contains(['maria', 'mysql'], $driver);
+
+    $resolveDriver = static fn () => match ($driver) {
+        'postgres' => 'pdo_pgsql',
+        'mssql' => 'pdo_sqlsrv',
+        default => 'pdo_mysql',
+    };
+    $resolveDefaultPort = static fn () => match ($driver) {
+        'postgres' => '5432',
+        'mssql' => '1433',
+        default => '3306',
+    };
+    $resolveConnection = static fn () => match (true) {
+        $driver === null || $driver === 'sqlite' => [
+            'driver' => 'pdo_sqlite',
+            'path' => 'data/database.sqlite',
        ],
-        'connection' => [
-            'user' => '',
-            'password' => '',
-            'dbname' => 'shlink',
+        default => [
+            'driver' => $resolveDriver(),
+            'dbname' => env('DB_NAME', 'shlink'),
+            'user' => env('DB_USER'),
+            'password' => env('DB_PASSWORD'),
+            'host' => env('DB_HOST', $driver === 'postgres' ? env('DB_UNIX_SOCKET') : null),
+            'port' => env('DB_PORT', $resolveDefaultPort()),
+            'unix_socket' => $isMysqlCompatible ? env('DB_UNIX_SOCKET') : null,
            'charset' => 'utf8',
        ],
-    ],
+    };

-];
+    return [
+
+        'entity_manager' => [
+            'orm' => [
+                'proxies_dir' => 'data/proxies',
+                'load_mappings_using_functional_style' => true,
+                'default_repository_classname' => EntitySpecificationRepository::class,
+            ],
+            'connection' => $resolveConnection(),
+        ],
+
+    ];
+})();
--- a/config/autoload/entity-manager.local.php.dist
+++ b/config/autoload/entity-manager.local.php.dist
@@ -10,6 +10,8 @@ return [
            'password' => 'root',
            'driver' => 'pdo_mysql',
            'host' => 'shlink_db',
+            'dbname' => 'shlink',
+            'charset' => 'utf8',
        ],
    ],

--- a/config/autoload/geolite2.global.php
+++ b/config/autoload/geolite2.global.php
@@ -2,12 +2,14 @@

 declare(strict_types=1);

+use function Shlinkio\Shlink\Common\env;
+
 return [

    'geolite2' => [
        'db_location' => __DIR__ . '/../../data/GeoLite2-City.mmdb',
        'temp_dir' => __DIR__ . '/../../data',
-        'license_key' => 'G4Lm0C60yJsnkdPi', // Deprecated. Remove hardcoded license on v3
+        'license_key' => env('GEOLITE_LICENSE_KEY', 'G4Lm0C60yJsnkdPi'), // Deprecated. Remove hardcoded license on v3
    ],

 ];
--- a/config/autoload/installer.global.php
+++ b/config/autoload/installer.global.php
@@ -24,6 +24,7 @@ return [
            Option\UrlShortener\ShortDomainSchemaConfigOption::class,
            Option\UrlShortener\ValidateUrlConfigOption::class,
            Option\Visit\VisitsWebhooksConfigOption::class,
+            Option\Visit\OrphanVisitsWebhooksConfigOption::class,
            Option\Redirect\BaseUrlRedirectConfigOption::class,
            Option\Redirect\InvalidShortUrlRedirectConfigOption::class,
            Option\Redirect\Regular404RedirectConfigOption::class,
@@ -46,10 +47,15 @@ return [
            Option\Tracking\IpAnonymizationConfigOption::class,
            Option\Tracking\OrphanVisitsTrackingConfigOption::class,
            Option\Tracking\DisableTrackParamConfigOption::class,
+            Option\Tracking\DisableTrackingFromConfigOption::class,
            Option\Tracking\DisableTrackingConfigOption::class,
            Option\Tracking\DisableIpTrackingConfigOption::class,
            Option\Tracking\DisableReferrerTrackingConfigOption::class,
            Option\Tracking\DisableUaTrackingConfigOption::class,
+            Option\QrCode\DefaultSizeConfigOption::class,
+            Option\QrCode\DefaultMarginConfigOption::class,
+            Option\QrCode\DefaultFormatConfigOption::class,
+            Option\QrCode\DefaultErrorCorrectionConfigOption::class,
        ],

        'installation_commands' => [
--- a/config/autoload/locks.global.php
+++ b/config/autoload/locks.global.php
@@ -3,12 +3,13 @@
 declare(strict_types=1);

 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Shlinkio\Shlink\Common\Cache\RedisFactory;
-use Shlinkio\Shlink\Common\Lock\RetryLockStoreDelegatorFactory;
+use Predis\ClientInterface as PredisClient;
 use Shlinkio\Shlink\Common\Logger\LoggerAwareDelegatorFactory;
 use Symfony\Component\Lock;

-use const Shlinkio\Shlink\Core\LOCAL_LOCK_FACTORY;
+use function Shlinkio\Shlink\Common\env;
+
+use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;

 return [

@@ -24,16 +25,12 @@ return [
            LOCAL_LOCK_FACTORY => ConfigAbstractFactory::class,
        ],
        'aliases' => [
-            // With this config, a user could alias 'lock_store' => 'redis_lock_store' to override the default
-            'lock_store' => 'local_lock_store',
+            'lock_store' => env('REDIS_SERVERS') === null ? 'local_lock_store' : 'redis_lock_store',

            'redis_lock_store' => Lock\Store\RedisStore::class,
            'local_lock_store' => Lock\Store\FlockStore::class,
        ],
        'delegators' => [
-            Lock\Store\RedisStore::class => [
-                RetryLockStoreDelegatorFactory::class,
-            ],
            Lock\LockFactory::class => [
                LoggerAwareDelegatorFactory::class,
            ],
@@ -42,7 +39,7 @@ return [

    ConfigAbstractFactory::class => [
        Lock\Store\FlockStore::class => ['config.locks.locks_dir'],
-        Lock\Store\RedisStore::class => [RedisFactory::SERVICE_NAME],
+        Lock\Store\RedisStore::class => [PredisClient::class],
        Lock\LockFactory::class => ['lock_store'],
        LOCAL_LOCK_FACTORY => ['local_lock_store'],
    ],
--- a/config/autoload/mercure.global.php
+++ b/config/autoload/mercure.global.php
@@ -7,30 +7,36 @@ use Shlinkio\Shlink\Common\Mercure\LcobucciJwtProvider;
 use Symfony\Component\Mercure\Hub;
 use Symfony\Component\Mercure\HubInterface;

-return [
+use function Shlinkio\Shlink\Common\env;

-    'mercure' => [
-        'public_hub_url' => null,
-        'internal_hub_url' => null,
-        'jwt_secret' => null,
-        'jwt_issuer' => 'Shlink',
-    ],
+return (static function (): array {
+    $publicUrl = env('MERCURE_PUBLIC_HUB_URL');

-    'dependencies' => [
-        'delegators' => [
-            LcobucciJwtProvider::class => [
-                LazyServiceFactory::class,
+    return [
+
+        'mercure' => [
+            'public_hub_url' => $publicUrl,
+            'internal_hub_url' => env('MERCURE_INTERNAL_HUB_URL', $publicUrl),
+            'jwt_secret' => env('MERCURE_JWT_SECRET'),
+            'jwt_issuer' => 'Shlink',
+        ],
+
+        'dependencies' => [
+            'delegators' => [
+                LcobucciJwtProvider::class => [
+                    LazyServiceFactory::class,
+                ],
+                Hub::class => [
+                    LazyServiceFactory::class,
+                ],
            ],
-            Hub::class => [
-                LazyServiceFactory::class,
+            'lazy_services' => [
+                'class_map' => [
+                    LcobucciJwtProvider::class => LcobucciJwtProvider::class,
+                    Hub::class => HubInterface::class,
+                ],
            ],
        ],
-        'lazy_services' => [
-            'class_map' => [
-                LcobucciJwtProvider::class => LcobucciJwtProvider::class,
-                Hub::class => HubInterface::class,
-            ],
-        ],
-    ],

-];
+    ];
+})();
--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@@ -18,12 +18,12 @@ return [
            'middleware' => [
                ContentLengthMiddleware::class,
                ErrorHandler::class,
+                Rest\Middleware\CrossDomainMiddleware::class,
            ],
        ],
        'error-handler-rest' => [
            'path' => '/rest',
            'middleware' => [
-                Rest\Middleware\CrossDomainMiddleware::class,
                RequestIdMiddleware::class,
                ProblemDetails\ProblemDetailsMiddleware::class,
            ],
--- a/config/autoload/qr-codes.global.php
+++ b/config/autoload/qr-codes.global.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use function Shlinkio\Shlink\Common\env;
+
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_ERROR_CORRECTION;
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_FORMAT;
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_MARGIN;
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_SIZE;
+
+return [
+
+    'qr_codes' => [
+        'size' => (int) env('DEFAULT_QR_CODE_SIZE', DEFAULT_QR_CODE_SIZE),
+        'margin' => (int) env('DEFAULT_QR_CODE_MARGIN', DEFAULT_QR_CODE_MARGIN),
+        'format' => env('DEFAULT_QR_CODE_FORMAT', DEFAULT_QR_CODE_FORMAT),
+        'error_correction' => env('DEFAULT_QR_CODE_ERROR_CORRECTION', DEFAULT_QR_CODE_ERROR_CORRECTION),
+    ],
+
+];
--- a/config/autoload/redirects.global.php
+++ b/config/autoload/redirects.global.php
@@ -2,12 +2,23 @@

 declare(strict_types=1);

+use function Shlinkio\Shlink\Common\env;
+
+use const Shlinkio\Shlink\DEFAULT_REDIRECT_CACHE_LIFETIME;
+use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE;
+
 return [

    'not_found_redirects' => [
-        'invalid_short_url' => null,
-        'regular_404' => null,
-        'base_url' => null,
+        'invalid_short_url' => env('INVALID_SHORT_URL_REDIRECT_TO'),
+        'regular_404' => env('REGULAR_404_REDIRECT_TO'),
+        'base_url' => env('BASE_URL_REDIRECT_TO'),
+    ],
+
+    'url_shortener' => [
+        // TODO Move these options to their own config namespace. Maybe "redirects".
+        'redirect_status_code' => (int) env('REDIRECT_STATUS_CODE', DEFAULT_REDIRECT_STATUS_CODE),
+        'redirect_cache_lifetime' => (int) env('REDIRECT_CACHE_LIFETIME', DEFAULT_REDIRECT_CACHE_LIFETIME),
    ],

 ];
--- a/config/autoload/redis.global.php
+++ b/config/autoload/redis.global.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use function Shlinkio\Shlink\Common\env;
+
+return (static function (): array {
+    $redisServers = env('REDIS_SERVERS');
+
+    return match (true) {
+        $redisServers === null => [],
+        default => [
+            'cache' => [
+                'redis' => [
+                    'servers' => $redisServers,
+                    'sentinel_service' => env('REDIS_SENTINEL_SERVICE'),
+                ],
+            ],
+        ],
+    };
+})();
--- a/config/autoload/router.global.php
+++ b/config/autoload/router.global.php
@@ -4,10 +4,12 @@ declare(strict_types=1);

 use Mezzio\Router\FastRouteRouter;

+use function Shlinkio\Shlink\Common\env;
+
 return [

    'router' => [
-        'base_path' => '',
+        'base_path' => env('BASE_PATH', ''),

        'fastroute' => [
            FastRouteRouter::CONFIG_CACHE_ENABLED => true,
--- a/config/autoload/swoole.global.php
+++ b/config/autoload/swoole.global.php
@@ -2,6 +2,8 @@

 declare(strict_types=1);

+use function Shlinkio\Shlink\Common\env;
+
 return [

    'mezzio-swoole' => [
@@ -10,11 +12,12 @@ return [

        'swoole-http-server' => [
            'host' => '0.0.0.0',
+            'port' => (int) env('PORT', 8080),
            'process-name' => 'shlink',

            'options' => [
-                'worker_num' => 16,
-                'task_worker_num' => 16,
+                'worker_num' => (int) env('WEB_WORKER_NUM', 16),
+                'task_worker_num' => (int) env('TASK_WORKER_NUM', 16),
            ],
        ],
    ],
--- a/config/autoload/tracking.global.php
+++ b/config/autoload/tracking.global.php
@@ -2,30 +2,35 @@

 declare(strict_types=1);

+use function Shlinkio\Shlink\Common\env;
+
 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' => true,
+        'anonymize_remote_addr' => (bool) env('ANONYMIZE_REMOTE_ADDR', true),

        // Tells if visits to not-found URLs should be tracked. The disable_tracking option takes precedence
-        'track_orphan_visits' => true,
+        'track_orphan_visits' => (bool) env('TRACK_ORPHAN_VISITS', true),

        // A query param that, if provided, will disable tracking of one particular visit. Always takes precedence
-        'disable_track_param' => null,
+        'disable_track_param' => env('DISABLE_TRACK_PARAM'),

        // If true, visits will not be tracked at all
-        'disable_tracking' => false,
+        'disable_tracking' => (bool) env('DISABLE_TRACKING', false),

        // If true, visits will be tracked, but neither the IP address, nor the location will be resolved
-        'disable_ip_tracking' => false,
+        'disable_ip_tracking' => (bool) env('DISABLE_IP_TRACKING', false),

        // If true, the referrer will not be tracked
-        'disable_referrer_tracking' => false,
+        'disable_referrer_tracking' => (bool) env('DISABLE_REFERRER_TRACKING', false),

        // If true, the user agent will not be tracked
-        'disable_ua_tracking' => false,
+        'disable_ua_tracking' => (bool) env('DISABLE_UA_TRACKING', false),
+
+        // A list of IP addresses, patterns or CIDR blocks from which tracking is disabled by default
+        'disable_tracking_from' => env('DISABLE_TRACKING_FROM'),
    ],

 ];
--- a/config/autoload/url-shortener.global.php
+++ b/config/autoload/url-shortener.global.php
@@ -2,26 +2,37 @@

 declare(strict_types=1);

-use const Shlinkio\Shlink\Core\DEFAULT_REDIRECT_CACHE_LIFETIME;
-use const Shlinkio\Shlink\Core\DEFAULT_REDIRECT_STATUS_CODE;
-use const Shlinkio\Shlink\Core\DEFAULT_SHORT_CODES_LENGTH;
+use function Shlinkio\Shlink\Common\env;

-return [
+use const Shlinkio\Shlink\DEFAULT_SHORT_CODES_LENGTH;
+use const Shlinkio\Shlink\MIN_SHORT_CODES_LENGTH;

-    'url_shortener' => [
-        'domain' => [
-            'schema' => 'https',
-            'hostname' => '',
+return (static function (): array {
+    $shortCodesLength = (int) env('DEFAULT_SHORT_CODES_LENGTH', DEFAULT_SHORT_CODES_LENGTH);
+    $shortCodesLength = $shortCodesLength < MIN_SHORT_CODES_LENGTH ? MIN_SHORT_CODES_LENGTH : $shortCodesLength;
+    $resolveSchema = static function (): string {
+        $useHttps = env('USE_HTTPS'); // Deprecated. For v3, set this to true by default, instead of null
+        if ($useHttps !== null) {
+            $boolUseHttps = (bool) $useHttps;
+            return $boolUseHttps ? 'https' : 'http';
+        }
+
+        return env('SHORT_DOMAIN_SCHEMA', 'http');
+    };
+
+    return [
+
+        'url_shortener' => [
+            'domain' => [
+                // Deprecated SHORT_DOMAIN_* env vars
+                'schema' => $resolveSchema(),
+                'hostname' => env('DEFAULT_DOMAIN', env('SHORT_DOMAIN_HOST', '')),
+            ],
+            'validate_url' => (bool) env('VALIDATE_URLS', false), // Deprecated
+            'default_short_codes_length' => $shortCodesLength,
+            'auto_resolve_titles' => (bool) env('AUTO_RESOLVE_TITLES', false),
+            'append_extra_path' => (bool) env('REDIRECT_APPEND_EXTRA_PATH', false),
        ],
-        'validate_url' => false, // Deprecated
-        'visits_webhooks' => [],
-        'default_short_codes_length' => DEFAULT_SHORT_CODES_LENGTH,
-        'auto_resolve_titles' => false,
-        'append_extra_path' => false,

-        // TODO Move these two options to their own config namespace. Maybe "redirects".
-        'redirect_status_code' => DEFAULT_REDIRECT_STATUS_CODE,
-        'redirect_cache_lifetime' => DEFAULT_REDIRECT_CACHE_LIFETIME,
-    ],
-
-];
+    ];
+})();
--- a/config/autoload/url-shortener.local.php.dist
+++ b/config/autoload/url-shortener.local.php.dist
@@ -2,13 +2,16 @@

 declare(strict_types=1);

+$isSwoole = extension_loaded('swoole');
+
 return [

    'url_shortener' => [
        'domain' => [
            'schema' => 'http',
-            'hostname' => 'localhost:8080',
+            'hostname' => sprintf('localhost:%s', $isSwoole ? '8080' : '8000'),
        ],
+        'auto_resolve_titles' => true,
    ],

 ];
--- a/config/autoload/webhooks.global.php
+++ b/config/autoload/webhooks.global.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use function Shlinkio\Shlink\Common\env;
+
+return (static function (): array {
+    $webhooks = env('VISITS_WEBHOOKS');
+
+    return [
+
+        'url_shortener' => [
+            // TODO Move these options to their own config namespace
+            'visits_webhooks' => $webhooks === null ? [] : explode(',', $webhooks),
+            'notify_orphan_visits_to_webhooks' => (bool) env('NOTIFY_ORPHAN_VISITS_TO_WEBHOOKS', false),
+        ],
+
+    ];
+})();
--- a/config/cli-app.php
+++ b/config/cli-app.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+use Psr\Container\ContainerInterface;
+use Symfony\Component\Console\Application as CliApp;
+
+return (static function () {
+    /** @var ContainerInterface $container */
+    $container = include __DIR__ . '/container.php';
+    return $container->get(CliApp::class);
+})();
--- a/config/cli-config.php
+++ b/config/cli-config.php
@@ -4,12 +4,9 @@ declare(strict_types=1);

 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
-use Psr\Container\ContainerInterface;
-
-return (function () {
-    /** @var ContainerInterface $container */
-    $container = include __DIR__ . '/container.php';
-    $em = $container->get(EntityManager::class);

+return (static function () {
+    /** @var EntityManager $em */
+    $em = include __DIR__ . '/entity-manager.php';
    return ConsoleRunner::createHelperSet($em);
 })();
--- a/config/config.php
+++ b/config/config.php
@@ -8,7 +8,7 @@ use Laminas\ConfigAggregator;
 use Laminas\Diactoros;
 use Mezzio;
 use Mezzio\ProblemDetails;
-use Mezzio\Swoole\ConfigProvider as SwooleConfigProvider;
+use Mezzio\Swoole;

 use function class_exists;
 use function Shlinkio\Shlink\Common\env;
@@ -17,7 +17,7 @@ return (new ConfigAggregator\ConfigAggregator([
    Mezzio\ConfigProvider::class,
    Mezzio\Router\ConfigProvider::class,
    Mezzio\Router\FastRouteRouter\ConfigProvider::class,
-    class_exists(SwooleConfigProvider::class) ? SwooleConfigProvider::class : new ConfigAggregator\ArrayProvider([]),
+    class_exists(Swoole\ConfigProvider::class) ? Swoole\ConfigProvider::class : new ConfigAggregator\ArrayProvider([]),
    ProblemDetails\ConfigProvider::class,
    Diactoros\ConfigProvider::class,
    Common\ConfigProvider::class,
@@ -31,6 +31,7 @@ return (new ConfigAggregator\ConfigAggregator([
    new ConfigAggregator\PhpFileProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
    env('APP_ENV') === 'test'
        ? new ConfigAggregator\PhpFileProvider('config/test/*.global.php')
+        // Deprecated. When the SimplifiedConfigParser is removed, load only generated_config.php here
        : new ConfigAggregator\LaminasConfigProvider('config/params/{generated_config.php,*.config.{php,json}}'),
 ], 'data/cache/app_config.php', [
    Core\Config\SimplifiedConfigParser::class,
--- a/config/constants.php
+++ b/config/constants.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink;
+
+use Fig\Http\Message\StatusCodeInterface;
+
+const DEFAULT_DELETE_SHORT_URL_THRESHOLD = 15;
+const DEFAULT_SHORT_CODES_LENGTH = 5;
+const MIN_SHORT_CODES_LENGTH = 4;
+const DEFAULT_REDIRECT_STATUS_CODE = StatusCodeInterface::STATUS_FOUND;
+const DEFAULT_REDIRECT_CACHE_LIFETIME = 30;
+const LOCAL_LOCK_FACTORY = 'Shlinkio\Shlink\LocalLockFactory';
+const CUSTOM_SLUGS_REGEXP = '/[^\pL\pN._~]/u'; // Any unicode letter or number, plus ".", "_" and "~" chars
+const TITLE_TAG_VALUE = '/<title[^>]*>(.*?)<\/title>/i'; // Matches the value inside an html title tag
+const DEFAULT_QR_CODE_SIZE = 300;
+const DEFAULT_QR_CODE_MARGIN = 0;
+const DEFAULT_QR_CODE_FORMAT = 'png';
+const DEFAULT_QR_CODE_ERROR_CORRECTION = 'l';
--- a/config/container.php
+++ b/config/container.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 use Laminas\ServiceManager\ServiceManager;
 use Symfony\Component\Lock;

-use const Shlinkio\Shlink\Core\LOCAL_LOCK_FACTORY;
+use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;

 chdir(dirname(__DIR__));

--- a/config/entity-manager.php
+++ b/config/entity-manager.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+use Doctrine\ORM\EntityManager;
+use Psr\Container\ContainerInterface;
+
+return (static function () {
+    /** @var ContainerInterface $container */
+    $container = include __DIR__ . '/container.php';
+    return $container->get(EntityManager::class);
+})();
--- a/config/run.php
+++ b/config/run.php
@@ -4,12 +4,11 @@ declare(strict_types=1);

 use Mezzio\Application;
 use Psr\Container\ContainerInterface;
-use Symfony\Component\Console\Application as CliApp;

-return function (bool $isCli = false): void {
+return static function (): void {
    /** @var ContainerInterface $container */
    $container = include __DIR__ . '/container.php';
-    $app = $container->get($isCli ? CliApp::class : Application::class);
+    $app = $container->get(Application::class);

    $app->run();
 };
--- a/config/test/test_config.global.php
+++ b/config/test/test_config.global.php
@@ -35,26 +35,17 @@ if ($isApiTest) {
    $coverage = new CodeCoverage((new Selector())->forLineCoverage($filter), $filter);
 }

-$buildDbConnection = function (): array {
+$buildDbConnection = static function (): array {
    $driver = env('DB_DRIVER', 'sqlite');
    $isCi = env('CI', false);
-    $getMysqlHost = fn (string $driver) => sprintf('shlink_db%s', $driver === 'mysql' ? '' : '_maria');
-    $getCiMysqlPort = fn (string $driver) => $driver === 'mysql' ? '3307' : '3308';
+    $getMysqlHost = static fn (string $driver) => sprintf('shlink_db%s', $driver === 'mysql' ? '' : '_maria');
+    $getCiMysqlPort = static fn (string $driver) => $driver === 'mysql' ? '3307' : '3308';

-    $driverConfigMap = [
+    return match ($driver) {
        'sqlite' => [
            'driver' => 'pdo_sqlite',
            'path' => sys_get_temp_dir() . '/shlink-tests.db',
        ],
-        'mysql' => [
-            'driver' => 'pdo_mysql',
-            'host' => $isCi ? '127.0.0.1' : $getMysqlHost($driver),
-            'port' => $isCi ? $getCiMysqlPort($driver) : '3306',
-            'user' => 'root',
-            'password' => 'root',
-            'dbname' => 'shlink_test',
-            'charset' => 'utf8',
-        ],
        'postgres' => [
            'driver' => 'pdo_pgsql',
            'host' => $isCi ? '127.0.0.1' : 'shlink_db_postgres',
@@ -71,10 +62,16 @@ $buildDbConnection = function (): array {
            'password' => 'Passw0rd!',
            'dbname' => 'shlink_test',
        ],
-    ];
-    $driverConfigMap['maria'] = $driverConfigMap['mysql'];
-
-    return $driverConfigMap[$driver] ?? [];
+        default => [ // mysql and maria
+            'driver' => 'pdo_mysql',
+            'host' => $isCi ? '127.0.0.1' : $getMysqlHost($driver),
+            'port' => $isCi ? $getCiMysqlPort($driver) : '3306',
+            'user' => 'root',
+            'password' => 'root',
+            'dbname' => 'shlink_test',
+            'charset' => 'utf8',
+        ],
+    };
 };

 $buildTestLoggerConfig = fn (string $handlerName, string $filename) => [
@@ -120,7 +117,7 @@ return [
            'name' => 'start_collecting_coverage',
            'path' => '/api-tests/start-coverage',
            'middleware' => middleware(static function () use (&$coverage) {
-                if ($coverage) {
+                if ($coverage) { // @phpstan-ignore-line
                    $coverage->start('API tests');
                }
                return new EmptyResponse();
@@ -131,7 +128,7 @@ return [
            'name' => 'dump_coverage',
            'path' => '/api-tests/stop-coverage',
            'middleware' => middleware(static function () use (&$coverage) {
-                if ($coverage) {
+                if ($coverage) { // @phpstan-ignore-line
                    $basePath = __DIR__ . '/../../build/coverage-api';
                    $coverage->stop();
                    (new PHP())->process($coverage, $basePath . '.cov');
--- a/data/infra/php.Dockerfile
+++ b/data/infra/php.Dockerfile
@@ -1,9 +1,9 @@
-FROM php:8.0.6-fpm-alpine3.13
+FROM php:8.0.9-fpm-alpine3.14
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>

-ENV APCU_VERSION 5.1.19
+ENV APCU_VERSION 5.1.20
 ENV PDO_SQLSRV_VERSION 5.9.0
-ENV MS_ODBC_SQL_VERSION 17.5.2.1
+ENV MS_ODBC_SQL_VERSION 17.5.2.2

 RUN apk update

--- a/data/infra/swoole.Dockerfile
+++ b/data/infra/swoole.Dockerfile
@@ -1,11 +1,11 @@
-FROM php:8.0.6-alpine3.13
+FROM php:8.0.9-alpine3.14
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>

-ENV APCU_VERSION 5.1.19
-ENV PDO_SQLSRV_VERSION 5.9.0
+ENV APCU_VERSION 5.1.20
 ENV INOTIFY_VERSION 3.0.0
-ENV SWOOLE_VERSION 4.6.7
-ENV MS_ODBC_SQL_VERSION 17.5.2.1
+ENV SWOOLE_VERSION 4.7.1
+ENV PDO_SQLSRV_VERSION 5.9.0
+ENV MS_ODBC_SQL_VERSION 17.5.2.2

 RUN apk update

--- a/data/migrations/Version20201102113208.php
+++ b/data/migrations/Version20201102113208.php
@@ -60,10 +60,7 @@ final class Version20201102113208 extends AbstractMigration
           ->execute();
    }

-    /**
-     * @return string|int|null
-     */
-    private function resolveOneApiKeyId(Result $result)
+    private function resolveOneApiKeyId(Result $result): string|int|null
    {
        $results = [];
        while ($row = $result->fetchAssociative()) {
--- a/data/migrations/Version20210720143824.php
+++ b/data/migrations/Version20210720143824.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20210720143824 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $domainsTable = $schema->getTable('domains');
+        $this->skipIf($domainsTable->hasColumn('base_url_redirect'));
+
+        $this->createRedirectColumn($domainsTable, 'base_url_redirect');
+        $this->createRedirectColumn($domainsTable, 'regular_not_found_redirect');
+        $this->createRedirectColumn($domainsTable, 'invalid_short_url_redirect');
+    }
+
+    private function createRedirectColumn(Table $table, string $columnName): void
+    {
+        $table->addColumn($columnName, Types::STRING, [
+            'notnull' => false,
+            'default' => null,
+        ]);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $domainsTable = $schema->getTable('domains');
+        $this->skipIf(! $domainsTable->hasColumn('base_url_redirect'));
+
+        $domainsTable->dropColumn('base_url_redirect');
+        $domainsTable->dropColumn('regular_not_found_redirect');
+        $domainsTable->dropColumn('invalid_short_url_redirect');
+    }
+}
--- a/data/migrations/Version20211002072605.php
+++ b/data/migrations/Version20211002072605.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211002072605 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        $this->skipIf($shortUrls->hasColumn('forward_query'));
+        $shortUrls->addColumn('forward_query', Types::BOOLEAN, ['default' => true]);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        $this->skipIf(! $shortUrls->hasColumn('forward_query'));
+        $shortUrls->dropColumn('forward_query');
+    }
+}
--- a/docker/README.md
+++ b/docker/README.md
@@ -11,8 +11,8 @@ It exposes a shlink instance served with [swoole](https://www.swoole.co.uk/), wh

 The most basic way to run Shlink's docker image is by providing these mandatory env vars.

-* `SHORT_DOMAIN_HOST`: The custom short domain used for this shlink instance. For example **doma.in**.
-* `SHORT_DOMAIN_SCHEMA`: Either **http** or **https**.
+* `DEFAULT_DOMAIN`: The default short domain used for this shlink instance. For example **doma.in**.
+* `USE_HTTPS`: Either **true** or **false**.
 * `GEOLITE_LICENSE_KEY`: Your GeoLite2 license key. [Learn more](https://shlink.io/documentation/geolite-license-key/) about this.

 To run shlink on top of a local docker service, and using an internal SQLite database, do the following:
@@ -21,8 +21,8 @@ To run shlink on top of a local docker service, and using an internal SQLite dat
 docker run \
    --name shlink \
    -p 8080:8080 \
-    -e SHORT_DOMAIN_HOST=doma.in \
-    -e SHORT_DOMAIN_SCHEMA=https \
+    -e DEFAULT_DOMAIN=doma.in \
+    -e USE_HTTPS=true \
    -e GEOLITE_LICENSE_KEY=kjh23ljkbndskj345 \
    shlinkio/shlink:stable
 ```
--- a/docker/config/php.ini
+++ b/docker/config/php.ini
@@ -1,3 +1,4 @@
 log_errors_max_len=0
 zend.assertions=1
 assert.exception=1
+memory_limit=256M
--- a/docker/config/shlink_in_docker.local.php
+++ b/docker/config/shlink_in_docker.local.php
@@ -7,128 +7,8 @@ namespace Shlinkio\Shlink;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;

-use function explode;
-use function Functional\contains;
-use function Shlinkio\Shlink\Common\env;
-
-use const Shlinkio\Shlink\Core\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
-use const Shlinkio\Shlink\Core\DEFAULT_REDIRECT_CACHE_LIFETIME;
-use const Shlinkio\Shlink\Core\DEFAULT_REDIRECT_STATUS_CODE;
-use const Shlinkio\Shlink\Core\DEFAULT_SHORT_CODES_LENGTH;
-use const Shlinkio\Shlink\Core\MIN_SHORT_CODES_LENGTH;
-
-$helper = new class {
-    private const DB_DRIVERS_MAP = [
-        'mysql' => 'pdo_mysql',
-        'maria' => 'pdo_mysql',
-        'postgres' => 'pdo_pgsql',
-        'mssql' => 'pdo_sqlsrv',
-    ];
-    private const DB_PORTS_MAP = [
-        'mysql' => '3306',
-        'maria' => '3306',
-        'postgres' => '5432',
-        'mssql' => '1433',
-    ];
-
-    public function getDbConfig(): array
-    {
-        $driver = env('DB_DRIVER');
-        $isMysql = contains(['maria', 'mysql'], $driver);
-        if ($driver === null || $driver === 'sqlite') {
-            return [
-                'driver' => 'pdo_sqlite',
-                'path' => 'data/database.sqlite',
-            ];
-        }
-
-        return [
-            'driver' => self::DB_DRIVERS_MAP[$driver],
-            'dbname' => env('DB_NAME', 'shlink'),
-            'user' => env('DB_USER'),
-            'password' => env('DB_PASSWORD'),
-            'host' => env('DB_HOST', $driver === 'postgres' ? env('DB_UNIX_SOCKET') : null),
-            'port' => env('DB_PORT', self::DB_PORTS_MAP[$driver]),
-            'unix_socket' => $isMysql ? env('DB_UNIX_SOCKET') : null,
-        ];
-    }
-
-    public function getNotFoundRedirectsConfig(): array
-    {
-        return [
-            'invalid_short_url' => env('INVALID_SHORT_URL_REDIRECT_TO'),
-            'regular_404' => env('REGULAR_404_REDIRECT_TO'),
-            'base_url' => env('BASE_URL_REDIRECT_TO'),
-        ];
-    }
-
-    public function getVisitsWebhooks(): array
-    {
-        $webhooks = env('VISITS_WEBHOOKS');
-        return $webhooks === null ? [] : explode(',', $webhooks);
-    }
-
-    public function getRedisConfig(): ?array
-    {
-        $redisServers = env('REDIS_SERVERS');
-        return $redisServers === null ? null : ['servers' => $redisServers];
-    }
-
-    public function getDefaultShortCodesLength(): int
-    {
-        $value = (int) env('DEFAULT_SHORT_CODES_LENGTH', DEFAULT_SHORT_CODES_LENGTH);
-        return $value < MIN_SHORT_CODES_LENGTH ? MIN_SHORT_CODES_LENGTH : $value;
-    }
-
-    public function getMercureConfig(): array
-    {
-        $publicUrl = env('MERCURE_PUBLIC_HUB_URL');
-
-        return [
-            'public_hub_url' => $publicUrl,
-            'internal_hub_url' => env('MERCURE_INTERNAL_HUB_URL', $publicUrl),
-            'jwt_secret' => env('MERCURE_JWT_SECRET'),
-        ];
-    }
-};
-
 return [

-    'delete_short_urls' => [
-        'check_visits_threshold' => true,
-        'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', DEFAULT_DELETE_SHORT_URL_THRESHOLD),
-    ],
-
-    'entity_manager' => [
-        'connection' => $helper->getDbConfig(),
-    ],
-
-    'url_shortener' => [
-        'domain' => [
-            'schema' => env('SHORT_DOMAIN_SCHEMA', 'http'),
-            'hostname' => env('SHORT_DOMAIN_HOST', ''),
-        ],
-        'validate_url' => (bool) env('VALIDATE_URLS', false),
-        'visits_webhooks' => $helper->getVisitsWebhooks(),
-        'default_short_codes_length' => $helper->getDefaultShortCodesLength(),
-        'auto_resolve_titles' => (bool) env('AUTO_RESOLVE_TITLES', false),
-        'redirect_status_code' => (int) env('REDIRECT_STATUS_CODE', DEFAULT_REDIRECT_STATUS_CODE),
-        'redirect_cache_lifetime' => (int) env('REDIRECT_CACHE_LIFETIME', DEFAULT_REDIRECT_CACHE_LIFETIME),
-        'append_extra_path' => (bool) env('REDIRECT_APPEND_EXTRA_PATH', false),
-    ],
-
-    'tracking' => [
-        'anonymize_remote_addr' => (bool) env('ANONYMIZE_REMOTE_ADDR', true),
-        'track_orphan_visits' => (bool) env('TRACK_ORPHAN_VISITS', true),
-        'disable_track_param' => env('DISABLE_TRACK_PARAM'),
-        'disable_tracking' => (bool) env('DISABLE_TRACKING', false),
-        'disable_ip_tracking' => (bool) env('DISABLE_IP_TRACKING', false),
-        'disable_referrer_tracking' => (bool) env('DISABLE_REFERRER_TRACKING', false),
-        'disable_ua_tracking' => (bool) env('DISABLE_UA_TRACKING', false),
-    ],
-
-    'not_found_redirects' => $helper->getNotFoundRedirectsConfig(),
-
    'logger' => [
        'Shlink' => [
            'handlers' => [
@@ -143,34 +23,4 @@ return [
        ],
    ],

-    'dependencies' => [
-        'aliases' => env('REDIS_SERVERS') === null ? [] : [
-            'lock_store' => 'redis_lock_store',
-        ],
-    ],
-
-    'cache' => [
-        'redis' => $helper->getRedisConfig(),
-    ],
-
-    'router' => [
-        'base_path' => env('BASE_PATH', ''),
-    ],
-
-    'mezzio-swoole' => [
-        'swoole-http-server' => [
-            'port' => (int) env('PORT', 8080),
-            'options' => [
-                'worker_num' => (int) env('WEB_WORKER_NUM', 16),
-                'task_worker_num' => (int) env('TASK_WORKER_NUM', 16),
-            ],
-        ],
-    ],
-
-    'geolite2' => [
-        'license_key' => env('GEOLITE_LICENSE_KEY', 'G4Lm0C60yJsnkdPi'), // Deprecated. Remove hardcoded license on v3
-    ],
-
-    'mercure' => $helper->getMercureConfig(),
-
 ];
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -25,7 +25,7 @@ fi
 # https://shlink.io/documentation/long-running-tasks/#locate-visits
 # set env var "ENABLE_PERIODIC_VISIT_LOCATE=true" to enable
 if [ $ENABLE_PERIODIC_VISIT_LOCATE ]; then
-  echo "Starting periodic visite locate..."
+  echo "Configuring periodic visit locate..."
  echo "0 * * * * php /etc/shlink/bin/cli visit:locate -q" > /etc/crontabs/root
  /usr/sbin/crond &
 fi
--- a/docs/adr/2021-08-05-migrate-to-a-new-caching-library.md
+++ b/docs/adr/2021-08-05-migrate-to-a-new-caching-library.md
@@ -0,0 +1,59 @@
+# Migrate to a new caching library
+
+* Status: Accepted
+* Date: 2021-08-05
+
+## Context and problem statement
+
+Shlink has always used the `doctrine/cache` library to handle anything related with cache.
+
+It was convenient, as it provided several adapters, and it was the library used by other doctrine packages.
+
+However, after the creation of the caching PSRs ([PSR-6 - Cache](https://www.php-fig.org/psr/psr-6) and [PSR-16 - Simple cache](https://www.php-fig.org/psr/psr-16)), most library authors have moved to those interfaces, and the doctrine team has decided to recommend using any other existing package and decommission their own solution.
+
+Also, Shlink needs support for Redis clusters and Redis sentinels, which is not supported by `doctrine/cache` Redis adapters.
+
+## Considered option
+
+After some research, the only packages that seem to support the capabilities required by Shlink and also seem healthy, are these:
+
+* [Symfony cache](https://symfony.com/doc/current/components/cache.html)
+    * 🟢 PSR-6 compliant: **yes**
+    * 🟢 PSR-16 compliant: **yes**
+    * 🟢 APCu support: **yes**
+    * 🟢 Redis support: **yes**
+    * 🟢 Redis cluster support: **yes**
+    * 🟢 Redis sentinel support: **yes**
+    * 🟢 Can use redis through Predis: **yes**
+    * 🔴 Individual packages per adapter: **no**
+* [Laminas cache](https://docs.laminas.dev/laminas-cache/)
+    * 🟢 PSR-6 compliant: **yes**
+    * 🟢 PSR-16 compliant: **yes**
+    * 🟢 APCu support: **yes**
+    * 🟢 Redis support: **yes**
+    * 🟢 Redis cluster support: **yes**
+    * 🔴 Redis sentinel support: **no**
+    * 🔴 Can use redis through Predis: **no**
+    * 🟢 Individual packages per adapter: **yes**
+
+## Decision outcome
+
+Even though Symfony packs all their adapters in a single component, which means we will install some code that will never be used, Laminas relies on the native redis extension for anything related with redis.
+
+That would make Shlink more complex to install, so it seems Symfony's package is the option where it's easier to migrate to.
+
+Also, it's important that the cache component can share the Redis integration (through `Predis`, in this case), as it's also used by other components (the lock component, to name one).
+
+## Pros and Cons of the Options
+
+### Symfony cache
+
+* Good because it supports Redis Sentinel.
+* Good because it allows using a external `Predis` instance.
+* Bad because it packs all the adapters in a single component.
+
+### Laminas cache
+
+* Good because allows installing only the adapters you are going to use, through separated packages.
+* Bad because it requires the php-redis native extension in order to interact with Redis.
+* Bad because it does ot seem to support Redis Sentinels.
--- a/docs/adr/README.md
+++ b/docs/adr/README.md
@@ -2,5 +2,6 @@

 Here listed you will find the different architectural decisions taken in the project, including all the reasoning behind it, options considered, and final outcome.

+* [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)
 * [2021-01-17 Support restrictions and permissions in API keys](2021-01-17-support-restrictions-and-permissions-in-api-keys.md)
--- a/docs/swagger/definitions/NotFoundRedirects.json
+++ b/docs/swagger/definitions/NotFoundRedirects.json
@@ -0,0 +1,20 @@
+{
+    "type": "object",
+    "properties": {
+        "baseUrlRedirect": {
+            "type": "string",
+            "nullable": true,
+            "description": "URL to redirect to when a user hits the domain's base URL"
+        },
+        "regular404Redirect": {
+            "type": "string",
+            "nullable": true,
+            "description": "URL to redirect to when a user hits a not found URL other than an invalid short URL"
+        },
+        "invalidShortUrlRedirect": {
+            "type": "string",
+            "nullable": true,
+            "description": "URL to redirect to when a user hits an invalid short URL"
+        }
+    }
+}
--- a/docs/swagger/definitions/ShortUrl.json
+++ b/docs/swagger/definitions/ShortUrl.json
@@ -1,5 +1,18 @@
 {
    "type": "object",
+    "required": [
+        "shortCode",
+        "shortUrl",
+        "longUrl",
+        "dateCreated",
+        "visitsCount",
+        "tags",
+        "meta",
+        "domain",
+        "title",
+        "crawlable",
+        "forwardQuery"
+    ],
    "properties": {
        "shortCode": {
            "type": "string",
@@ -45,6 +58,10 @@
        "crawlable": {
            "type": "boolean",
            "description": "Tells if this URL will be included as 'Allow' in Shlink's robots.txt."
+        },
+        "forwardQuery": {
+            "type": "boolean",
+            "description": "Tells if this URL will forward the query params to the long URL when visited, as explained in [the docs](https://shlink.io/documentation/some-features/#query-params-forwarding)."
        }
    }
 }
--- a/docs/swagger/definitions/ShortUrlEdition.json
+++ b/docs/swagger/definitions/ShortUrlEdition.json
@@ -0,0 +1,48 @@
+{
+    "type": "object",
+    "properties": {
+        "longUrl": {
+            "description": "The long URL this short URL will redirect to",
+            "type": "string"
+        },
+        "validSince": {
+            "description": "The date (in ISO-8601 format) from which this short code will be valid",
+            "type": "string",
+            "nullable": true
+        },
+        "validUntil": {
+            "description": "The date (in ISO-8601 format) until which this short code will be valid",
+            "type": "string",
+            "nullable": true
+        },
+        "maxVisits": {
+            "description": "The maximum number of allowed visits for this short code",
+            "type": "number",
+            "nullable": true
+        },
+        "validateUrl": {
+            "description": "Tells if the long URL (if provided) should or should not be validated as a reachable URL. If not provided, it will fall back to app-level config",
+            "type": "boolean"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            },
+            "description": "The list of tags to set to the short URL."
+        },
+        "title": {
+            "type": "string",
+            "description": "A descriptive title of the short URL.",
+            "nullable": true
+        },
+        "crawlable": {
+            "type": "boolean",
+            "description": "Tells if this URL will be included as 'Allow' in Shlink's robots.txt."
+        },
+        "forwardQuery": {
+            "type": "boolean",
+            "description": "Tells if the query params should be forwarded from the short URL to the long one, as explained in [the docs](https://shlink.io/documentation/some-features/#query-params-forwarding)."
+        }
+    }
+}
--- a/docs/swagger/paths/v1_short-urls.json
+++ b/docs/swagger/paths/v1_short-urls.json
@@ -225,63 +225,37 @@
            "content": {
                "application/json": {
                    "schema": {
-                        "type": "object",
-                        "required": [
-                            "longUrl"
-                        ],
-                        "properties": {
-                            "longUrl": {
-                                "description": "The URL to parse",
-                                "type": "string"
+                        "allOf": [
+                            {
+                                "$ref": "../definitions/ShortUrlEdition.json"
                            },
-                            "tags": {
-                                "description": "The URL to parse",
-                                "type": "array",
-                                "items": {
-                                    "type": "string"
+                            {
+                                "type": "object",
+                                "required": ["longUrl"],
+                                "properties": {
+                                    "customSlug": {
+                                        "description": "A unique custom slug to be used instead of the generated short code",
+                                        "type": "string"
+                                    },
+                                    "findIfExists": {
+                                        "description": "Will force existing matching URL to be returned if found, instead of creating a new one",
+                                        "type": "boolean"
+                                    },
+                                    "domain": {
+                                        "description": "The domain to which the short URL will be attached",
+                                        "type": "string"
+                                    },
+                                    "shortCodeLength": {
+                                        "description": "The length for generated short code. It has to be at least 4 and defaults to 5. It will be ignored when customSlug is provided",
+                                        "type": "number"
+                                    },
+                                    "validateUrl": {
+                                        "description": "Tells if the long URL should or should not be validated as a reachable URL. If not provided, it will fall back to app-level config",
+                                        "type": "boolean"
+                                    }
                                }
-                            },
-                            "validSince": {
-                                "description": "The date (in ISO-8601 format) from which this short code will be valid",
-                                "type": "string"
-                            },
-                            "validUntil": {
-                                "description": "The date (in ISO-8601 format) until which this short code will be valid",
-                                "type": "string"
-                            },
-                            "customSlug": {
-                                "description": "A unique custom slug to be used instead of the generated short code",
-                                "type": "string"
-                            },
-                            "maxVisits": {
-                                "description": "The maximum number of allowed visits for this short code",
-                                "type": "number"
-                            },
-                            "findIfExists": {
-                                "description": "Will force existing matching URL to be returned if found, instead of creating a new one",
-                                "type": "boolean"
-                            },
-                            "domain": {
-                                "description": "The domain to which the short URL will be attached",
-                                "type": "string"
-                            },
-                            "shortCodeLength": {
-                                "description": "The length for generated short code. It has to be at least 4 and defaults to 5. It will be ignored when customSlug is provided",
-                                "type": "number"
-                            },
-                            "validateUrl": {
-                                "description": "Tells if the long URL should or should not be validated as a reachable URL. If not provided, it will fall back to app-level config",
-                                "type": "boolean"
-                            },
-                            "title": {
-                                "type": "string",
-                                "description": "A descriptive title of the short URL."
-                            },
-                            "crawlable": {
-                                "type": "boolean",
-                                "description": "Tells if this URL will be included as 'Allow' in Shlink's robots.txt."
                            }
-                        }
+                        ]
                    }
                }
            }
--- a/docs/swagger/paths/v1_short-urls_{shortCode}.json
+++ b/docs/swagger/paths/v1_short-urls_{shortCode}.json
@@ -112,48 +112,7 @@
            "content": {
                "application/json": {
                    "schema": {
-                        "type": "object",
-                        "properties": {
-                            "longUrl": {
-                                "description": "The long URL this short URL will redirect to",
-                                "type": "string"
-                            },
-                            "validSince": {
-                                "description": "The date (in ISO-8601 format) from which this short code will be valid",
-                                "type": "string",
-                                "nullable": true
-                            },
-                            "validUntil": {
-                                "description": "The date (in ISO-8601 format) until which this short code will be valid",
-                                "type": "string",
-                                "nullable": true
-                            },
-                            "maxVisits": {
-                                "description": "The maximum number of allowed visits for this short code",
-                                "type": "number",
-                                "nullable": true
-                            },
-                            "validateUrl": {
-                                "description": "Tells if the long URL (if provided) should or should not be validated as a reachable URL. If not provided, it will fall back to app-level config",
-                                "type": "boolean"
-                            },
-                            "tags": {
-                                "type": "array",
-                                "items": {
-                                    "type": "string"
-                                },
-                                "description": "The list of tags to set to the short URL."
-                            },
-                            "title": {
-                                "type": "string",
-                                "description": "A descriptive title of the short URL.",
-                                "nullable": true
-                            },
-                            "crawlable": {
-                                "type": "boolean",
-                                "description": "Tells if this URL will be included as 'Allow' in Shlink's robots.txt."
-                            }
-                        }
+                        "$ref": "../definitions/ShortUrlEdition.json"
                    }
                }
            }
--- a/docs/swagger/paths/v2_domains.json
+++ b/docs/swagger/paths/v2_domains.json
@@ -18,7 +18,7 @@
        ],
        "responses": {
            "200": {
-                "description": "The list of tags",
+                "description": "The list of domains",
                "content": {
                    "application/json": {
                        "schema": {
@@ -33,13 +33,16 @@
                                            "type": "array",
                                            "items": {
                                                "type": "object",
-                                                "required": ["domain", "isDefault"],
+                                                "required": ["domain", "isDefault", "redirects"],
                                                "properties": {
                                                    "domain":  {
                                                        "type": "string"
                                                    },
                                                    "isDefault": {
                                                        "type": "boolean"
+                                                    },
+                                                    "redirects": {
+                                                        "$ref": "../definitions/NotFoundRedirects.json"
                                                    }
                                                }
                                            }
@@ -56,15 +59,30 @@
                            "data": [
                                {
                                    "domain": "example.com",
-                                    "isDefault": true
+                                    "isDefault": true,
+                                    "redirects": {
+                                        "baseUrlRedirect": "https://example.com/my-landing-page",
+                                        "regular404Redirect": null,
+                                        "invalidShortUrlRedirect": "https://example.com/invalid-url"
+                                    }
                                },
                                {
                                    "domain": "aaa.com",
-                                    "isDefault": false
+                                    "isDefault": false,
+                                    "redirects":  {
+                                        "baseUrlRedirect": null,
+                                        "regular404Redirect": null,
+                                        "invalidShortUrlRedirect": null
+                                    }
                                },
                                {
                                    "domain": "bbb.com",
-                                    "isDefault": false
+                                    "isDefault": false,
+                                    "redirects":  {
+                                        "baseUrlRedirect": null,
+                                        "regular404Redirect": null,
+                                        "invalidShortUrlRedirect": "https://example.com/invalid-url"
+                                    }
                                }
                            ]
                        }
--- a/docs/swagger/paths/v2_domains_redirects.json
+++ b/docs/swagger/paths/v2_domains_redirects.json
@@ -0,0 +1,124 @@
+{
+    "patch": {
+        "operationId": "setDomainRedirects",
+        "tags": [
+            "Domains"
+        ],
+        "summary": "Sets domain \"not found\" redirects",
+        "description": "Sets the URLs that you want a visitor to get redirected to for \"not found\" URLs for a specific domain",
+        "security": [
+            {
+                "ApiKey": []
+            }
+        ],
+        "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            }
+        ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "allOf": [
+                            {
+                                "required": ["domain"],
+                                "properties": {
+                                    "domain": {
+                                        "description": "The domain's authority for which you want to set redirects",
+                                        "type": "string"
+                                    }
+                                }
+                            },
+                            {
+                                "$ref": "../definitions/NotFoundRedirects.json"
+                            }
+                        ]
+                    }
+                }
+            }
+        },
+        "responses": {
+            "200": {
+                "description": "The domain's redirects after the update, when existing redirects have been merged with provided ones.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "required": ["baseUrlRedirect", "regular404Redirect", "invalidShortUrlRedirect"]
+                                },
+                                {
+                                    "$ref": "../definitions/NotFoundRedirects.json"
+                                }
+                            ]
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "baseUrlRedirect": "https://example.com/my-landing-page",
+                        "regular404Redirect": null,
+                        "invalidShortUrlRedirect": "https://example.com/invalid-url"
+                    }
+                }
+            },
+            "400": {
+                "description": "Provided data is invalid.",
+                "content": {
+                    "application/problem+json": {
+                        "schema": {
+                            "type": "object",
+                            "allOf": [
+                                {
+                                    "$ref": "../definitions/Error.json"
+                                },
+                                {
+                                    "type": "object",
+                                    "required": ["invalidElements"],
+                                    "properties": {
+                                        "invalidElements": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "string",
+                                                "enum": [
+                                                    "domain",
+                                                    "baseUrlRedirect",
+                                                    "regular404Redirect",
+                                                    "invalidShortUrlRedirect"
+                                                ]
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            },
+            "403": {
+                "description": "Default domain was provided, and it cannot be edited this way.",
+                "content": {
+                    "application/problem+json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/problem+json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,5 +1,5 @@
 {
-    "openapi": "3.0.0",
+    "openapi": "3.0.3",
    "info": {
        "title": "Shlink",
        "description": "Shlink, the self-hosted URL shortener",
@@ -102,6 +102,9 @@
        "/rest/v{version}/domains": {
            "$ref": "paths/v2_domains.json"
        },
+        "/rest/v{version}/domains/redirects": {
+            "$ref": "paths/v2_domains_redirects.json"
+        },

        "/rest/v{version}/mercure-info": {
            "$ref": "paths/v2_mercure-info.json"
--- a/module/CLI/config/cli.config.php
+++ b/module/CLI/config/cli.config.php
@@ -27,6 +27,7 @@ return [
            Command\Tag\DeleteTagsCommand::NAME => Command\Tag\DeleteTagsCommand::class,

            Command\Domain\ListDomainsCommand::NAME => Command\Domain\ListDomainsCommand::class,
+            Command\Domain\DomainRedirectsCommand::NAME => Command\Domain\DomainRedirectsCommand::class,

            Command\Db\CreateDatabaseCommand::NAME => Command\Db\CreateDatabaseCommand::class,
            Command\Db\MigrateDatabaseCommand::NAME => Command\Db\MigrateDatabaseCommand::class,
--- a/module/CLI/config/dependencies.config.php
+++ b/module/CLI/config/dependencies.config.php
@@ -24,7 +24,7 @@ use Symfony\Component\Console as SymfonyCli;
 use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Process\PhpExecutableFinder;

-use const Shlinkio\Shlink\Core\LOCAL_LOCK_FACTORY;
+use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;

 return [

@@ -61,6 +61,7 @@ return [
            Command\Db\MigrateDatabaseCommand::class => ConfigAbstractFactory::class,

            Command\Domain\ListDomainsCommand::class => ConfigAbstractFactory::class,
+            Command\Domain\DomainRedirectsCommand::class => ConfigAbstractFactory::class,
        ],
    ],

@@ -104,6 +105,7 @@ return [
        Command\Tag\DeleteTagsCommand::class => [TagService::class],

        Command\Domain\ListDomainsCommand::class => [DomainService::class],
+        Command\Domain\DomainRedirectsCommand::class => [DomainService::class],

        Command\Db\CreateDatabaseCommand::class => [
            LockFactory::class,
--- a/module/CLI/src/ApiKey/RoleResolver.php
+++ b/module/CLI/src/ApiKey/RoleResolver.php
@@ -8,6 +8,8 @@ use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Rest\ApiKey\Model\RoleDefinition;
 use Symfony\Component\Console\Input\InputInterface;

+use function is_string;
+
 class RoleResolver implements RoleResolverInterface
 {
    public function __construct(private DomainServiceInterface $domainService)
@@ -23,7 +25,7 @@ class RoleResolver implements RoleResolverInterface
        if ($author) {
            $roleDefinitions[] = RoleDefinition::forAuthoredShortUrls();
        }
-        if ($domainAuthority !== null) {
+        if (is_string($domainAuthority)) {
            $domain = $this->domainService->getOrCreate($domainAuthority);
            $roleDefinitions[] = RoleDefinition::forDomain($domain);
        }
--- a/module/CLI/src/Command/Api/GenerateKeyCommand.php
+++ b/module/CLI/src/Command/Api/GenerateKeyCommand.php
@@ -25,7 +25,7 @@ class GenerateKeyCommand extends BaseCommand

    public function __construct(
        private ApiKeyServiceInterface $apiKeyService,
-        private RoleResolverInterface $roleResolver
+        private RoleResolverInterface $roleResolver,
    ) {
        parent::__construct();
    }
@@ -97,7 +97,7 @@ class GenerateKeyCommand extends BaseCommand
        $io->success(sprintf('Generated API key: "%s"', $apiKey->toString()));

        if (! $apiKey->isAdmin()) {
-            ShlinkTable::fromOutput($io)->render(
+            ShlinkTable::default($io)->render(
                ['Role name', 'Role metadata'],
                $apiKey->mapRoles(fn (string $name, array $meta) => [$name, arrayToString($meta, 0)]),
                null,
--- a/module/CLI/src/Command/Api/ListKeysCommand.php
+++ b/module/CLI/src/Command/Api/ListKeysCommand.php
@@ -69,7 +69,7 @@ class ListKeysCommand extends BaseCommand
            return $rowData;
        });

-        ShlinkTable::fromOutput($output)->render(array_filter([
+        ShlinkTable::withRowSeparators($output)->render(array_filter([
            'Key',
            'Name',
            ! $enabledOnly ? 'Is enabled' : null,
--- a/module/CLI/src/Command/BaseCommand.php
+++ b/module/CLI/src/Command/BaseCommand.php
@@ -12,40 +12,36 @@ use function Shlinkio\Shlink\Core\kebabCaseToCamelCase;
 use function sprintf;
 use function str_contains;

+/** @deprecated */
 abstract class BaseCommand extends Command
 {
    /**
-     * @param mixed|null $default
+     * @param string|string[]|bool|null $default
     */
    protected function addOptionWithDeprecatedFallback(
        string $name,
        ?string $shortcut = null,
        ?int $mode = null,
        string $description = '',
-        $default = null,
+        bool|string|array|null $default = null,
    ): self {
        $this->addOption($name, $shortcut, $mode, $description, $default);

        if (str_contains($name, '-')) {
            $camelCaseName = kebabCaseToCamelCase($name);
-            $this->addOption($camelCaseName, null, $mode, sprintf('[DEPRECATED] Same as "%s".', $name), $default);
+            $this->addOption($camelCaseName, null, $mode, sprintf('[DEPRECATED] Alias for "%s".', $name), $default);
        }

        return $this;
    }

-    /**
-     * @return bool|string|string[]|null
-     */
-    protected function getOptionWithDeprecatedFallback(InputInterface $input, string $name)
+    // @phpstan-ignore-next-line
+    protected function getOptionWithDeprecatedFallback(InputInterface $input, string $name) // phpcs:ignore
    {
        $rawInput = method_exists($input, '__toString') ? $input->__toString() : '';
        $camelCaseName = kebabCaseToCamelCase($name);
+        $resolvedOptionName = str_contains($rawInput, $camelCaseName) ? $camelCaseName : $name;

-        if (str_contains($rawInput, $camelCaseName)) {
-            return $input->getOption($camelCaseName);
-        }
-
-        return $input->getOption($name);
+        return $input->getOption($resolvedOptionName);
    }
 }
--- a/module/CLI/src/Command/Db/AbstractDatabaseCommand.php
+++ b/module/CLI/src/Command/Db/AbstractDatabaseCommand.php
@@ -18,7 +18,7 @@ abstract class AbstractDatabaseCommand extends AbstractLockedCommand
    public function __construct(
        LockFactory $locker,
        private ProcessRunnerInterface $processRunner,
-        PhpExecutableFinder $phpFinder
+        PhpExecutableFinder $phpFinder,
    ) {
        parent::__construct($locker);
        $this->phpBinary = $phpFinder->find(false) ?: 'php';
@@ -32,6 +32,6 @@ abstract class AbstractDatabaseCommand extends AbstractLockedCommand

    protected function getLockConfig(): LockedCommandConfig
    {
-        return LockedCommandConfig::blocking($this->getName());
+        return LockedCommandConfig::blocking($this->getName() ?? static::class);
    }
 }
--- a/module/CLI/src/Command/Db/CreateDatabaseCommand.php
+++ b/module/CLI/src/Command/Db/CreateDatabaseCommand.php
@@ -26,7 +26,7 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
        ProcessRunnerInterface $processRunner,
        PhpExecutableFinder $phpFinder,
        private Connection $regularConn,
-        private Connection $noDbNameConn
+        private Connection $noDbNameConn,
    ) {
        parent::__construct($locker, $processRunner, $phpFinder);
    }
--- a/module/CLI/src/Command/Domain/DomainRedirectsCommand.php
+++ b/module/CLI/src/Command/Domain/DomainRedirectsCommand.php
@@ -0,0 +1,114 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Domain;
+
+use Shlinkio\Shlink\CLI\Util\ExitCodes;
+use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
+use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
+use Shlinkio\Shlink\Core\Domain\Model\DomainItem;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+use function Functional\filter;
+use function Functional\invoke;
+use function sprintf;
+use function str_contains;
+
+class DomainRedirectsCommand extends Command
+{
+    public const NAME = 'domain:redirects';
+
+    public function __construct(private DomainServiceInterface $domainService)
+    {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setDescription('Set specific "not found" redirects for individual domains.')
+            ->addArgument(
+                'domain',
+                InputArgument::REQUIRED,
+                'The domain authority to which you want to set the specific redirects',
+            );
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output): void
+    {
+        /** @var string|null $domain */
+        $domain = $input->getArgument('domain');
+        if ($domain !== null) {
+            return;
+        }
+
+        $io = new SymfonyStyle($input, $output);
+        $askNewDomain = static fn () => $io->ask('Domain authority for which you want to set specific redirects');
+
+        /** @var string[] $availableDomains */
+        $availableDomains = invoke(
+            filter($this->domainService->listDomains(), static fn (DomainItem $item) => ! $item->isDefault()),
+            'toString',
+        );
+        if (empty($availableDomains)) {
+            $input->setArgument('domain', $askNewDomain());
+            return;
+        }
+
+        $selectedOption = $io->choice(
+            'Select the domain to configure',
+            [...$availableDomains, '<options=bold>New domain</>'],
+        );
+        $input->setArgument('domain', str_contains($selectedOption, 'New domain') ? $askNewDomain() : $selectedOption);
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): ?int
+    {
+        $io = new SymfonyStyle($input, $output);
+        $domainAuthority = $input->getArgument('domain');
+        $domain = $this->domainService->findByAuthority($domainAuthority);
+
+        $ask = static function (string $message, ?string $current) use ($io): ?string {
+            if ($current === null) {
+                return $io->ask(sprintf('%s (Leave empty for no redirect)', $message));
+            }
+
+            $choice = $io->choice($message, [
+                sprintf('Keep current one: [%s]', $current),
+                'Set new redirect URL',
+                'Remove redirect',
+            ]);
+
+            return match ($choice) {
+                'Set new redirect URL' => $io->ask('New redirect URL'),
+                'Remove redirect' => null,
+                default => $current,
+            };
+        };
+
+        $this->domainService->configureNotFoundRedirects($domainAuthority, NotFoundRedirects::withRedirects(
+            $ask(
+                'URL to redirect to when a user hits this domain\'s base URL',
+                $domain?->baseUrlRedirect(),
+            ),
+            $ask(
+                'URL to redirect to when a user hits a not found URL other than an invalid short URL',
+                $domain?->regular404Redirect(),
+            ),
+            $ask(
+                'URL to redirect to when a user hits an invalid short URL',
+                $domain?->invalidShortUrlRedirect(),
+            ),
+        ));
+
+        $io->success(sprintf('"Not found" redirects properly set for "%s"', $domainAuthority));
+
+        return ExitCodes::EXIT_SUCCESS;
+    }
+}
--- a/module/CLI/src/Command/Domain/ListDomainsCommand.php
+++ b/module/CLI/src/Command/Domain/ListDomainsCommand.php
@@ -6,10 +6,12 @@ namespace Shlinkio\Shlink\CLI\Command\Domain;

 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\ShlinkTable;
+use Shlinkio\Shlink\Core\Config\NotFoundRedirectConfigInterface;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Core\Domain\Model\DomainItem;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;

 use function Functional\map;
@@ -27,18 +29,49 @@ class ListDomainsCommand extends Command
    {
        $this
            ->setName(self::NAME)
-            ->setDescription('List all domains that have been ever used for some short URL');
+            ->setDescription('List all domains that have been ever used for some short URL')
+            ->addOption(
+                'show-redirects',
+                'r',
+                InputOption::VALUE_NONE,
+                'Will display an extra column with the information of the "not found" redirects for every domain.',
+            );
    }

    protected function execute(InputInterface $input, OutputInterface $output): ?int
    {
        $domains = $this->domainService->listDomains();
+        $showRedirects = $input->getOption('show-redirects');
+        $commonFields = ['Domain', 'Is default'];
+        $table = $showRedirects ? ShlinkTable::withRowSeparators($output) : ShlinkTable::default($output);

-        ShlinkTable::fromOutput($output)->render(
-            ['Domain', 'Is default'],
-            map($domains, fn (DomainItem $domain) => [$domain->toString(), $domain->isDefault() ? 'Yes' : 'No']),
+        $table->render(
+            $showRedirects ? [...$commonFields, '"Not found" redirects'] : $commonFields,
+            map($domains, function (DomainItem $domain) use ($showRedirects) {
+                $commonValues = [$domain->toString(), $domain->isDefault() ? 'Yes' : 'No'];
+
+                return $showRedirects
+                    ? [
+                        ...$commonValues,
+                        $this->notFoundRedirectsToString($domain->notFoundRedirectConfig()),
+                      ]
+                    : $commonValues;
+            }),
        );

        return ExitCodes::EXIT_SUCCESS;
    }
+
+    private function notFoundRedirectsToString(NotFoundRedirectConfigInterface $config): string
+    {
+        $baseUrl = $config->baseUrlRedirect() ?? 'N/A';
+        $regular404 = $config->regular404Redirect() ?? 'N/A';
+        $invalidShortUrl = $config->invalidShortUrlRedirect() ?? 'N/A';
+
+        return <<<EOL
+        * Base URL: {$baseUrl}
+        * Regular 404: {$regular404}
+        * Invalid short URL: {$invalidShortUrl}
+        EOL;
+    }
 }
--- a/module/CLI/src/Command/ShortUrl/GenerateShortUrlCommand.php
+++ b/module/CLI/src/Command/ShortUrl/GenerateShortUrlCommand.php
@@ -33,7 +33,7 @@ class GenerateShortUrlCommand extends BaseCommand
    public function __construct(
        private UrlShortenerInterface $urlShortener,
        private ShortUrlStringifierInterface $stringifier,
-        private int $defaultShortCodeLength
+        private int $defaultShortCodeLength,
    ) {
        parent::__construct();
    }
@@ -104,7 +104,19 @@ class GenerateShortUrlCommand extends BaseCommand
                'no-validate-url',
                null,
                InputOption::VALUE_NONE,
-                'Forces the long URL to not be validated, regardless what is globally configured.',
+                '[DEPRECATED] Forces the long URL to not be validated, regardless what is globally configured.',
+            )
+            ->addOption(
+                'crawlable',
+                'r',
+                InputOption::VALUE_NONE,
+                'Tells if this URL will be included as "Allow" in Shlink\'s robots.txt.',
+            )
+            ->addOption(
+                'no-forward-query',
+                'w',
+                InputOption::VALUE_NONE,
+                'Disables the forwarding of the query string to the long URL, when the new short URL is visited.',
            );
    }

@@ -156,6 +168,8 @@ class GenerateShortUrlCommand extends BaseCommand
                ShortUrlInputFilter::SHORT_CODE_LENGTH => $shortCodeLength,
                ShortUrlInputFilter::VALIDATE_URL => $doValidateUrl,
                ShortUrlInputFilter::TAGS => $tags,
+                ShortUrlInputFilter::CRAWLABLE => $input->getOption('crawlable'),
+                ShortUrlInputFilter::FORWARD_QUERY => !$input->getOption('no-forward-query'),
            ]));

            $io->writeln([
--- a/module/CLI/src/Command/ShortUrl/GetVisitsCommand.php
+++ b/module/CLI/src/Command/ShortUrl/GetVisitsCommand.php
@@ -7,7 +7,6 @@ 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\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
 use Shlinkio\Shlink\Core\Model\VisitsParams;
@@ -21,6 +20,7 @@ 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
@@ -73,7 +73,7 @@ class GetVisitsCommand extends AbstractWithDateRangeCommand

        $paginator = $this->visitsHelper->visitsForShortUrl(
            $identifier,
-            new VisitsParams(new DateRange($startDate, $endDate)),
+            new VisitsParams(buildDateRange($startDate, $endDate)),
        );

        $rows = map($paginator->getCurrentPageResults(), function (Visit $visit) {
@@ -81,7 +81,7 @@ class GetVisitsCommand extends AbstractWithDateRangeCommand
            $rowData['country'] = ($visit->getVisitLocation() ?? new UnknownVisitLocation())->getCountryName();
            return select_keys($rowData, ['referer', 'date', 'userAgent', 'country']);
        });
-        ShlinkTable::fromOutput($output)->render(['Referer', 'Date', 'User agent', 'Country'], $rows);
+        ShlinkTable::default($output)->render(['Referer', 'Date', 'User agent', 'Country'], $rows);

        return ExitCodes::EXIT_SUCCESS;
    }
--- a/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php
+++ b/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php
@@ -35,7 +35,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand

    public function __construct(
        private ShortUrlServiceInterface $shortUrlService,
-        private DataTransformerInterface $transformer
+        private DataTransformerInterface $transformer,
    ) {
        parent::__construct();
    }
@@ -164,7 +164,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
            return map($columnsMap, fn (callable $call) => $call($rawShortUrl, $shortUrl));
        });

-        ShlinkTable::fromOutput($output)->render(
+        ShlinkTable::default($output)->render(
            array_keys($columnsMap),
            $rows,
            $all ? null : $this->formatCurrentPageMessage($shortUrls, 'Page %s of %s'),
--- a/module/CLI/src/Command/Tag/ListTagsCommand.php
+++ b/module/CLI/src/Command/Tag/ListTagsCommand.php
@@ -32,7 +32,7 @@ class ListTagsCommand extends Command

    protected function execute(InputInterface $input, OutputInterface $output): ?int
    {
-        ShlinkTable::fromOutput($output)->render(['Name', 'URLs amount', 'Visits amount'], $this->getTagsRows());
+        ShlinkTable::default($output)->render(['Name', 'URLs amount', 'Visits amount'], $this->getTagsRows());
        return ExitCodes::EXIT_SUCCESS;
    }

--- a/module/CLI/src/Command/Util/AbstractWithDateRangeCommand.php
+++ b/module/CLI/src/Command/Util/AbstractWithDateRangeCommand.php
@@ -11,6 +11,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;

+use function is_string;
 use function sprintf;

 abstract class AbstractWithDateRangeCommand extends BaseCommand
@@ -49,7 +50,7 @@ abstract class AbstractWithDateRangeCommand extends BaseCommand
    private function getDateOption(InputInterface $input, OutputInterface $output, string $key): ?Chronos
    {
        $value = $this->getOptionWithDeprecatedFallback($input, $key);
-        if (empty($value)) {
+        if (empty($value) || ! is_string($value)) {
            return null;
        }

--- a/module/CLI/src/Command/Util/LockedCommandConfig.php
+++ b/module/CLI/src/Command/Util/LockedCommandConfig.php
@@ -11,7 +11,7 @@ final class LockedCommandConfig
    private function __construct(
        private string $lockName,
        private bool $isBlocking,
-        private float $ttl = self::DEFAULT_TTL
+        private float $ttl = self::DEFAULT_TTL,
    ) {
    }

--- a/module/CLI/src/Command/Visit/DownloadGeoLiteDbCommand.php
+++ b/module/CLI/src/Command/Visit/DownloadGeoLiteDbCommand.php
@@ -45,8 +45,8 @@ class DownloadGeoLiteDbCommand extends Command
                $io->text(sprintf('<fg=blue>%s GeoLite2 db file...</>', $olderDbExists ? 'Updating' : 'Downloading'));
                $this->progressBar = new ProgressBar($io);
            }, function (int $total, int $downloaded): void {
-                $this->progressBar->setMaxSteps($total);
-                $this->progressBar->setProgress($downloaded);
+                $this->progressBar?->setMaxSteps($total);
+                $this->progressBar?->setProgress($downloaded);
            });

            if ($this->progressBar === null) {
--- a/module/CLI/src/Command/Visit/LocateVisitsCommand.php
+++ b/module/CLI/src/Command/Visit/LocateVisitsCommand.php
@@ -35,7 +35,7 @@ class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocat
    public function __construct(
        private VisitLocatorInterface $visitLocator,
        private IpLocationResolverInterface $ipLocationResolver,
-        LockFactory $locker
+        LockFactory $locker,
    ) {
        parent::__construct($locker);
    }
@@ -139,7 +139,7 @@ class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocat
            throw IpCannotBeLocatedException::forEmptyAddress();
        }

-        $ipAddr = $visit->getRemoteAddr();
+        $ipAddr = $visit->getRemoteAddr() ?? '';
        $this->io->write(sprintf('Processing IP <fg=blue>%s</>', $ipAddr));
        if ($ipAddr === IpAddress::LOCALHOST) {
            $this->io->writeln(' [<comment>Ignored localhost address</comment>]');
@@ -168,7 +168,12 @@ class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocat

    private function checkDbUpdate(InputInterface $input): void
    {
-        $downloadDbCommand = $this->getApplication()->find(DownloadGeoLiteDbCommand::NAME);
+        $cliApp = $this->getApplication();
+        if ($cliApp === null) {
+            return;
+        }
+
+        $downloadDbCommand = $cliApp->find(DownloadGeoLiteDbCommand::NAME);
        $exitCode = $downloadDbCommand->run($input, $this->io);

        if ($exitCode === ExitCodes::EXIT_FAILURE) {
@@ -178,6 +183,6 @@ class LocateVisitsCommand extends AbstractLockedCommand implements VisitGeolocat

    protected function getLockConfig(): LockedCommandConfig
    {
-        return LockedCommandConfig::nonBlocking($this->getName());
+        return LockedCommandConfig::nonBlocking(self::NAME);
    }
 }
--- a/module/CLI/src/Exception/GeolocationDbUpdateFailedException.php
+++ b/module/CLI/src/Exception/GeolocationDbUpdateFailedException.php
@@ -42,10 +42,7 @@ class GeolocationDbUpdateFailedException extends RuntimeException implements Exc
        return $e;
    }

-    /**
-     * @param mixed $buildEpoch
-     */
-    public static function withInvalidEpochInOldDb($buildEpoch): self
+    public static function withInvalidEpochInOldDb(mixed $buildEpoch): self
    {
        $e = new self(sprintf(
            'Build epoch with value "%s" from existing geolocation database, could not be parsed to integer.',
--- a/module/CLI/src/Util/GeolocationDbUpdater.php
+++ b/module/CLI/src/Util/GeolocationDbUpdater.php
@@ -23,7 +23,7 @@ class GeolocationDbUpdater implements GeolocationDbUpdaterInterface
        private DbUpdaterInterface $dbUpdater,
        private Reader $geoLiteDbReader,
        private LockFactory $locker,
-        private TrackingOptions $trackingOptions
+        private TrackingOptions $trackingOptions,
    ) {
    }

--- a/module/CLI/src/Util/ShlinkTable.php
+++ b/module/CLI/src/Util/ShlinkTable.php
@@ -5,20 +5,33 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Util;

 use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Helper\TableSeparator;
 use Symfony\Component\Console\Output\OutputInterface;

+use function Functional\intersperse;
+
 final class ShlinkTable
 {
    private const DEFAULT_STYLE_NAME = 'default';
    private const TABLE_TITLE_STYLE = '<options=bold> %s </>';

-    public function __construct(private Table $baseTable)
+    private function __construct(private Table $baseTable, private bool $withRowSeparators)
    {
    }

-    public static function fromOutput(OutputInterface $output): self
+    public static function default(OutputInterface $output): self
    {
-        return new self(new Table($output));
+        return new self(new Table($output), false);
+    }
+
+    public static function withRowSeparators(OutputInterface $output): self
+    {
+        return new self(new Table($output), true);
+    }
+
+    public static function fromBaseTable(Table $baseTable): self
+    {
+        return new self($baseTable, false);
    }

    public function render(array $headers, array $rows, ?string $footerTitle = null, ?string $headerTitle = null): void
@@ -26,11 +39,12 @@ final class ShlinkTable
        $style = Table::getStyleDefinition(self::DEFAULT_STYLE_NAME);
        $style->setFooterTitleFormat(self::TABLE_TITLE_STYLE)
              ->setHeaderTitleFormat(self::TABLE_TITLE_STYLE);
+        $tableRows = $this->withRowSeparators ? intersperse($rows, new TableSeparator()) : $rows;

        $table = clone $this->baseTable;
        $table->setStyle($style)
              ->setHeaders($headers)
-              ->setRows($rows)
+              ->setRows($tableRows)
              ->setFooterTitle($footerTitle)
              ->setHeaderTitle($headerTitle)
              ->render();
--- a/module/CLI/test/ApiKey/RoleResolverTest.php
+++ b/module/CLI/test/ApiKey/RoleResolverTest.php
@@ -36,7 +36,7 @@ class RoleResolverTest extends TestCase
        int $expectedDomainCalls,
    ): void {
        $getDomain = $this->domainService->getOrCreate('example.com')->willReturn(
-            (new Domain('example.com'))->setId('1'),
+            Domain::withAuthority('example.com')->setId('1'),
        );

        $result = $this->resolver->determineRoles($input);
@@ -47,7 +47,7 @@ class RoleResolverTest extends TestCase

    public function provideRoles(): iterable
    {
-        $domain = (new Domain('example.com'))->setId('1');
+        $domain = Domain::withAuthority('example.com')->setId('1');
        $buildInput = function (array $definition): InputInterface {
            $input = $this->prophesize(InputInterface::class);

@@ -68,6 +68,21 @@ class RoleResolverTest extends TestCase
            [RoleDefinition::forDomain($domain)],
            1,
        ];
+        yield 'false domain role' => [
+            $buildInput([RoleResolver::DOMAIN_ONLY_PARAM => false]),
+            [],
+            0,
+        ];
+        yield 'true domain role' => [
+            $buildInput([RoleResolver::DOMAIN_ONLY_PARAM => true]),
+            [],
+            0,
+        ];
+        yield 'string array domain role' => [
+            $buildInput([RoleResolver::DOMAIN_ONLY_PARAM => ['foo', 'bar']]),
+            [],
+            0,
+        ];
        yield 'author role only' => [
            $buildInput([RoleResolver::DOMAIN_ONLY_PARAM => null, RoleResolver::AUTHOR_ONLY_PARAM => true]),
            [RoleDefinition::forAuthoredShortUrls()],
--- a/module/CLI/test/Command/Api/ListKeysCommandTest.php
+++ b/module/CLI/test/Command/Api/ListKeysCommandTest.php
@@ -53,7 +53,9 @@ class ListKeysCommandTest extends TestCase
            | Key                                  | Name | Is enabled | Expiration date | Roles |
            +--------------------------------------+------+------------+-----------------+-------+
            | {$apiKey1} | -    | +++        | -               | Admin |
+            +--------------------------------------+------+------------+-----------------+-------+
            | {$apiKey2} | -    | +++        | -               | Admin |
+            +--------------------------------------+------+------------+-----------------+-------+
            | {$apiKey3} | -    | +++        | -               | Admin |
            +--------------------------------------+------+------------+-----------------+-------+

@@ -67,6 +69,7 @@ class ListKeysCommandTest extends TestCase
            | Key                                  | Name | Expiration date | Roles |
            +--------------------------------------+------+-----------------+-------+
            | {$apiKey1} | -    | -               | Admin |
+            +--------------------------------------+------+-----------------+-------+
            | {$apiKey2} | -    | -               | Admin |
            +--------------------------------------+------+-----------------+-------+

@@ -76,11 +79,13 @@ class ListKeysCommandTest extends TestCase
            [
                $apiKey1 = ApiKey::create(),
                $apiKey2 = $this->apiKeyWithRoles([RoleDefinition::forAuthoredShortUrls()]),
-                $apiKey3 = $this->apiKeyWithRoles([RoleDefinition::forDomain((new Domain('example.com'))->setId('1'))]),
+                $apiKey3 = $this->apiKeyWithRoles(
+                    [RoleDefinition::forDomain(Domain::withAuthority('example.com')->setId('1'))],
+                ),
                $apiKey4 = ApiKey::create(),
                $apiKey5 = $this->apiKeyWithRoles([
                    RoleDefinition::forAuthoredShortUrls(),
-                    RoleDefinition::forDomain((new Domain('example.com'))->setId('1')),
+                    RoleDefinition::forDomain(Domain::withAuthority('example.com')->setId('1')),
                ]),
                $apiKey6 = ApiKey::create(),
            ],
@@ -90,11 +95,16 @@ class ListKeysCommandTest extends TestCase
            | Key                                  | Name | Expiration date | Roles                    |
            +--------------------------------------+------+-----------------+--------------------------+
            | {$apiKey1} | -    | -               | Admin                    |
+            +--------------------------------------+------+-----------------+--------------------------+
            | {$apiKey2} | -    | -               | Author only              |
+            +--------------------------------------+------+-----------------+--------------------------+
            | {$apiKey3} | -    | -               | Domain only: example.com |
+            +--------------------------------------+------+-----------------+--------------------------+
            | {$apiKey4} | -    | -               | Admin                    |
+            +--------------------------------------+------+-----------------+--------------------------+
            | {$apiKey5} | -    | -               | Author only              |
            |                                      |      |                 | Domain only: example.com |
+            +--------------------------------------+------+-----------------+--------------------------+
            | {$apiKey6} | -    | -               | Admin                    |
            +--------------------------------------+------+-----------------+--------------------------+

@@ -113,8 +123,11 @@ class ListKeysCommandTest extends TestCase
            | Key                                  | Name          | Expiration date | Roles |
            +--------------------------------------+---------------+-----------------+-------+
            | {$apiKey1} | Alice         | -               | Admin |
+            +--------------------------------------+---------------+-----------------+-------+
            | {$apiKey2} | Alice and Bob | -               | Admin |
+            +--------------------------------------+---------------+-----------------+-------+
            | {$apiKey3} |               | -               | Admin |
+            +--------------------------------------+---------------+-----------------+-------+
            | {$apiKey4} | -             | -               | Admin |
            +--------------------------------------+---------------+-----------------+-------+

--- a/module/CLI/test/Command/Domain/DomainRedirectsCommandTest.php
+++ b/module/CLI/test/Command/Domain/DomainRedirectsCommandTest.php
@@ -0,0 +1,180 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\Domain;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Domain\DomainRedirectsCommand;
+use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
+use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
+use Shlinkio\Shlink\Core\Domain\Model\DomainItem;
+use Shlinkio\Shlink\Core\Entity\Domain;
+use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
+use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
+use Symfony\Component\Console\Tester\CommandTester;
+
+use function substr_count;
+
+class DomainRedirectsCommandTest extends TestCase
+{
+    use CliTestUtilsTrait;
+
+    private CommandTester $commandTester;
+    private ObjectProphecy $domainService;
+
+    public function setUp(): void
+    {
+        $this->domainService = $this->prophesize(DomainServiceInterface::class);
+        $this->commandTester = $this->testerForCommand(new DomainRedirectsCommand($this->domainService->reveal()));
+    }
+
+    /**
+     * @test
+     * @dataProvider provideDomains
+     */
+    public function onlyPlainQuestionsAreAskedForNewDomainsAndDomainsWithNoRedirects(?Domain $domain): void
+    {
+        $domainAuthority = 'my-domain.com';
+        $findDomain = $this->domainService->findByAuthority($domainAuthority)->willReturn($domain);
+        $configureRedirects = $this->domainService->configureNotFoundRedirects(
+            $domainAuthority,
+            NotFoundRedirects::withRedirects('foo.com', null, 'baz.com'),
+        )->willReturn(Domain::withAuthority(''));
+
+        $this->commandTester->setInputs(['foo.com', '', 'baz.com']);
+        $this->commandTester->execute(['domain' => $domainAuthority]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertStringContainsString('[OK] "Not found" redirects properly set for "my-domain.com"', $output);
+        self::assertStringContainsString('URL to redirect to when a user hits this domain\'s base URL', $output);
+        self::assertStringContainsString(
+            'URL to redirect to when a user hits a not found URL other than an invalid short URL',
+            $output,
+        );
+        self::assertStringContainsString('URL to redirect to when a user hits an invalid short URL', $output);
+        self::assertEquals(3, substr_count($output, '(Leave empty for no redirect)'));
+        $findDomain->shouldHaveBeenCalledOnce();
+        $configureRedirects->shouldHaveBeenCalledOnce();
+        $this->domainService->listDomains()->shouldNotHaveBeenCalled();
+    }
+
+    public function provideDomains(): iterable
+    {
+        yield 'no domain' => [null];
+        yield 'domain without redirects' => [Domain::withAuthority('')];
+    }
+
+    /** @test */
+    public function offersNewOptionsForDomainsWithExistingRedirects(): void
+    {
+        $domainAuthority = 'example.com';
+        $domain = Domain::withAuthority($domainAuthority);
+        $domain->configureNotFoundRedirects(NotFoundRedirects::withRedirects('foo.com', 'bar.com', 'baz.com'));
+
+        $findDomain = $this->domainService->findByAuthority($domainAuthority)->willReturn($domain);
+        $configureRedirects = $this->domainService->configureNotFoundRedirects(
+            $domainAuthority,
+            NotFoundRedirects::withRedirects(null, 'edited.com', 'baz.com'),
+        )->willReturn($domain);
+
+        $this->commandTester->setInputs(['2', '1', 'edited.com', '0']);
+        $this->commandTester->execute(['domain' => $domainAuthority]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertStringContainsString('[OK] "Not found" redirects properly set for "example.com"', $output);
+        self::assertStringContainsString('Keep current one: [bar.com]', $output);
+        self::assertStringContainsString('Keep current one: [baz.com]', $output);
+        self::assertStringContainsString('Keep current one: [baz.com]', $output);
+        self::assertStringNotContainsStringIgnoringCase('(Leave empty for no redirect)', $output);
+        self::assertEquals(3, substr_count($output, 'Set new redirect URL'));
+        self::assertEquals(3, substr_count($output, 'Remove redirect'));
+        $findDomain->shouldHaveBeenCalledOnce();
+        $configureRedirects->shouldHaveBeenCalledOnce();
+        $this->domainService->listDomains()->shouldNotHaveBeenCalled();
+    }
+
+    /** @test */
+    public function authorityIsRequestedWhenNotProvidedAndNoOtherDomainsExist(): void
+    {
+        $domainAuthority = 'example.com';
+        $domain = Domain::withAuthority($domainAuthority);
+
+        $listDomains = $this->domainService->listDomains()->willReturn([]);
+        $findDomain = $this->domainService->findByAuthority($domainAuthority)->willReturn($domain);
+        $configureRedirects = $this->domainService->configureNotFoundRedirects(
+            $domainAuthority,
+            NotFoundRedirects::withoutRedirects(),
+        )->willReturn($domain);
+
+        $this->commandTester->setInputs([$domainAuthority, '', '', '']);
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertStringContainsString('Domain authority for which you want to set specific redirects', $output);
+        $listDomains->shouldHaveBeenCalledOnce();
+        $findDomain->shouldHaveBeenCalledOnce();
+        $configureRedirects->shouldHaveBeenCalledOnce();
+    }
+
+    /** @test */
+    public function oneOfTheExistingDomainsCanBeSelected(): void
+    {
+        $domainAuthority = 'existing-two.com';
+        $domain = Domain::withAuthority($domainAuthority);
+
+        $listDomains = $this->domainService->listDomains()->willReturn([
+            DomainItem::forDefaultDomain('default-domain.com', new NotFoundRedirectOptions()),
+            DomainItem::forExistingDomain(Domain::withAuthority('existing-one.com')),
+            DomainItem::forExistingDomain(Domain::withAuthority($domainAuthority)),
+        ]);
+        $findDomain = $this->domainService->findByAuthority($domainAuthority)->willReturn($domain);
+        $configureRedirects = $this->domainService->configureNotFoundRedirects(
+            $domainAuthority,
+            NotFoundRedirects::withoutRedirects(),
+        )->willReturn($domain);
+
+        $this->commandTester->setInputs(['1', '', '', '']);
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertStringNotContainsString('Domain authority for which you want to set specific redirects', $output);
+        self::assertStringNotContainsString('default-domain.com', $output);
+        self::assertStringContainsString('existing-one.com', $output);
+        self::assertStringContainsString($domainAuthority, $output);
+        $listDomains->shouldHaveBeenCalledOnce();
+        $findDomain->shouldHaveBeenCalledOnce();
+        $configureRedirects->shouldHaveBeenCalledOnce();
+    }
+
+    /** @test */
+    public function aNewDomainCanBeCreatedEvenIfOthersAlreadyExist(): void
+    {
+        $domainAuthority = 'new-domain.com';
+        $domain = Domain::withAuthority($domainAuthority);
+
+        $listDomains = $this->domainService->listDomains()->willReturn([
+            DomainItem::forDefaultDomain('default-domain.com', new NotFoundRedirectOptions()),
+            DomainItem::forExistingDomain(Domain::withAuthority('existing-one.com')),
+            DomainItem::forExistingDomain(Domain::withAuthority('existing-two.com')),
+        ]);
+        $findDomain = $this->domainService->findByAuthority($domainAuthority)->willReturn($domain);
+        $configureRedirects = $this->domainService->configureNotFoundRedirects(
+            $domainAuthority,
+            NotFoundRedirects::withoutRedirects(),
+        )->willReturn($domain);
+
+        $this->commandTester->setInputs(['2', $domainAuthority, '', '', '']);
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        self::assertStringContainsString('Domain authority for which you want to set specific redirects', $output);
+        self::assertStringNotContainsString('default-domain.com', $output);
+        self::assertStringContainsString('existing-one.com', $output);
+        self::assertStringContainsString('existing-two.com', $output);
+        $listDomains->shouldHaveBeenCalledOnce();
+        $findDomain->shouldHaveBeenCalledOnce();
+        $configureRedirects->shouldHaveBeenCalledOnce();
+    }
+}
--- a/module/CLI/test/Command/Domain/ListDomainsCommandTest.php
+++ b/module/CLI/test/Command/Domain/ListDomainsCommandTest.php
@@ -8,8 +8,11 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Domain\ListDomainsCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
+use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
 use Shlinkio\Shlink\Core\Domain\DomainServiceInterface;
 use Shlinkio\Shlink\Core\Domain\Model\DomainItem;
+use Shlinkio\Shlink\Core\Entity\Domain;
+use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
 use Symfony\Component\Console\Tester\CommandTester;

@@ -26,10 +29,38 @@ class ListDomainsCommandTest extends TestCase
        $this->commandTester = $this->testerForCommand(new ListDomainsCommand($this->domainService->reveal()));
    }

-    /** @test */
-    public function allDomainsAreProperlyPrinted(): void
+    /**
+     * @test
+     * @dataProvider provideInputsAndOutputs
+     */
+    public function allDomainsAreProperlyPrinted(array $input, string $expectedOutput): void
    {
-        $expectedOutput = <<<OUTPUT
+        $bazDomain = Domain::withAuthority('baz.com');
+        $bazDomain->configureNotFoundRedirects(NotFoundRedirects::withRedirects(
+            null,
+            'https://foo.com/baz-domain/regular',
+            'https://foo.com/baz-domain/invalid',
+        ));
+
+        $listDomains = $this->domainService->listDomains()->willReturn([
+            DomainItem::forDefaultDomain('foo.com', new NotFoundRedirectOptions([
+                'base_url' => 'https://foo.com/default/base',
+                'invalid_short_url' => 'https://foo.com/default/invalid',
+            ])),
+            DomainItem::forExistingDomain(Domain::withAuthority('bar.com')),
+            DomainItem::forExistingDomain($bazDomain),
+        ]);
+
+        $this->commandTester->execute($input);
+
+        self::assertEquals($expectedOutput, $this->commandTester->getDisplay());
+        self::assertEquals(ExitCodes::EXIT_SUCCESS, $this->commandTester->getStatusCode());
+        $listDomains->shouldHaveBeenCalledOnce();
+    }
+
+    public function provideInputsAndOutputs(): iterable
+    {
+        $withoutRedirectsOutput = <<<OUTPUT
        +---------+------------+
        | Domain  | Is default |
        +---------+------------+
@@ -39,16 +70,27 @@ class ListDomainsCommandTest extends TestCase
        +---------+------------+

        OUTPUT;
-        $listDomains = $this->domainService->listDomains()->willReturn([
-            new DomainItem('foo.com', true),
-            new DomainItem('bar.com', false),
-            new DomainItem('baz.com', false),
-        ]);
+        $withRedirectsOutput = <<<OUTPUT
+        +---------+------------+---------------------------------------------------------+
+        | Domain  | Is default | "Not found" redirects                                   |
+        +---------+------------+---------------------------------------------------------+
+        | foo.com | Yes        | * Base URL: https://foo.com/default/base                |
+        |         |            | * Regular 404: N/A                                      |
+        |         |            | * Invalid short URL: https://foo.com/default/invalid    |
+        +---------+------------+---------------------------------------------------------+
+        | bar.com | No         | * Base URL: N/A                                         |
+        |         |            | * Regular 404: N/A                                      |
+        |         |            | * Invalid short URL: N/A                                |
+        +---------+------------+---------------------------------------------------------+
+        | baz.com | No         | * Base URL: N/A                                         |
+        |         |            | * Regular 404: https://foo.com/baz-domain/regular       |
+        |         |            | * Invalid short URL: https://foo.com/baz-domain/invalid |
+        +---------+------------+---------------------------------------------------------+

-        $this->commandTester->execute([]);
+        OUTPUT;

-        self::assertEquals($expectedOutput, $this->commandTester->getDisplay());
-        self::assertEquals(ExitCodes::EXIT_SUCCESS, $this->commandTester->getStatusCode());
-        $listDomains->shouldHaveBeenCalledOnce();
+        yield 'no args' => [[], $withoutRedirectsOutput];
+        yield 'no show redirects' => [['--show-redirects' => false], $withoutRedirectsOutput];
+        yield 'show redirects' => [['--show-redirects' => true], $withRedirectsOutput];
    }
 }
--- a/module/CLI/test/Command/ShortUrl/GetVisitsCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/GetVisitsCommandTest.php
@@ -45,7 +45,7 @@ class GetVisitsCommandTest extends TestCase
        $shortCode = 'abc123';
        $this->visitsHelper->visitsForShortUrl(
            new ShortUrlIdentifier($shortCode),
-            new VisitsParams(new DateRange(null, null)),
+            new VisitsParams(DateRange::emptyInstance()),
        )
            ->willReturn(new Paginator(new ArrayAdapter([])))
            ->shouldBeCalledOnce();
@@ -61,7 +61,7 @@ class GetVisitsCommandTest extends TestCase
        $endDate = '2016-02-01';
        $this->visitsHelper->visitsForShortUrl(
            new ShortUrlIdentifier($shortCode),
-            new VisitsParams(new DateRange(Chronos::parse($startDate), Chronos::parse($endDate))),
+            new VisitsParams(DateRange::withStartAndEndDate(Chronos::parse($startDate), Chronos::parse($endDate))),
        )
            ->willReturn(new Paginator(new ArrayAdapter([])))
            ->shouldBeCalledOnce();
@@ -80,7 +80,7 @@ class GetVisitsCommandTest extends TestCase
        $startDate = 'foo';
        $info = $this->visitsHelper->visitsForShortUrl(
            new ShortUrlIdentifier($shortCode),
-            new VisitsParams(new DateRange()),
+            new VisitsParams(DateRange::emptyInstance()),
        )->willReturn(new Paginator(new ArrayAdapter([])));

        $this->commandTester->execute([
--- a/module/CLI/test/Command/ShortUrl/ListShortUrlsCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/ListShortUrlsCommandTest.php
@@ -238,11 +238,10 @@ class ListShortUrlsCommandTest extends TestCase
    }

    /**
-     * @param string|array|null $expectedOrderBy
     * @test
     * @dataProvider provideOrderBy
     */
-    public function orderByIsProperlyComputed(array $commandArgs, $expectedOrderBy): void
+    public function orderByIsProperlyComputed(array $commandArgs, string|array|null $expectedOrderBy): void
    {
        $listShortUrls = $this->shortUrlService->listShortUrls(ShortUrlsParams::fromRawData([
            'orderBy' => $expectedOrderBy,
--- a/module/CLI/test/Util/GeolocationDbUpdaterTest.php
+++ b/module/CLI/test/Util/GeolocationDbUpdaterTest.php
@@ -116,9 +116,8 @@ class GeolocationDbUpdaterTest extends TestCase
    /**
     * @test
     * @dataProvider provideSmallDays
-     * @param string|int $buildEpoch
     */
-    public function databaseIsNotUpdatedIfItIsYoungerThanOneWeek($buildEpoch): void
+    public function databaseIsNotUpdatedIfItIsYoungerThanOneWeek(string|int $buildEpoch): void
    {
        $fileExists = $this->dbUpdater->databaseFileExists()->willReturn(true);
        $getMeta = $this->geoLiteDbReader->metadata()->willReturn($this->buildMetaWithBuildEpoch($buildEpoch));
@@ -161,10 +160,7 @@ class GeolocationDbUpdaterTest extends TestCase
        $this->geolocationDbUpdater->checkDbUpdate();
    }

-    /**
-     * @param string|int $buildEpoch
-     */
-    private function buildMetaWithBuildEpoch($buildEpoch): Metadata
+    private function buildMetaWithBuildEpoch(string|int $buildEpoch): Metadata
    {
        return new Metadata([
            'binary_format_major_version' => '',
--- a/module/CLI/test/Util/ShlinkTableTest.php
+++ b/module/CLI/test/Util/ShlinkTableTest.php
@@ -24,7 +24,7 @@ class ShlinkTableTest extends TestCase
    public function setUp(): void
    {
        $this->baseTable = $this->prophesize(Table::class);
-        $this->shlinkTable = new ShlinkTable($this->baseTable->reveal());
+        $this->shlinkTable = ShlinkTable::fromBaseTable($this->baseTable->reveal());
    }

    /** @test */
@@ -57,7 +57,7 @@ class ShlinkTableTest extends TestCase
    /** @test */
    public function newTableIsCreatedForFactoryMethod(): void
    {
-        $instance = ShlinkTable::fromOutput($this->prophesize(OutputInterface::class)->reveal());
+        $instance = ShlinkTable::default($this->prophesize(OutputInterface::class)->reveal());

        $ref = new ReflectionObject($instance);
        $baseTable = $ref->getProperty('baseTable');
--- a/module/Core/config/dependencies.config.php
+++ b/module/Core/config/dependencies.config.php
@@ -25,6 +25,8 @@ return [
            Options\NotFoundRedirectOptions::class => ConfigAbstractFactory::class,
            Options\UrlShortenerOptions::class => ConfigAbstractFactory::class,
            Options\TrackingOptions::class => ConfigAbstractFactory::class,
+            Options\QrCodeOptions::class => ConfigAbstractFactory::class,
+            Options\WebhookOptions::class => ConfigAbstractFactory::class,

            Service\UrlShortener::class => ConfigAbstractFactory::class,
            Service\ShortUrlService::class => ConfigAbstractFactory::class,
@@ -46,6 +48,8 @@ return [
            Util\DoctrineBatchHelper::class => ConfigAbstractFactory::class,
            Util\RedirectResponseHelper::class => ConfigAbstractFactory::class,

+            Config\NotFoundRedirectResolver::class => ConfigAbstractFactory::class,
+
            Action\RedirectAction::class => ConfigAbstractFactory::class,
            Action\PixelAction::class => ConfigAbstractFactory::class,
            Action\QrCodeAction::class => ConfigAbstractFactory::class,
@@ -75,7 +79,8 @@ return [
        ErrorHandler\NotFoundTrackerMiddleware::class => [Visit\RequestTracker::class],
        ErrorHandler\NotFoundRedirectHandler::class => [
            NotFoundRedirectOptions::class,
-            Util\RedirectResponseHelper::class,
+            Config\NotFoundRedirectResolver::class,
+            Domain\DomainService::class,
        ],

        Options\AppOptions::class => ['config.app_options'],
@@ -83,6 +88,8 @@ return [
        Options\NotFoundRedirectOptions::class => ['config.not_found_redirects'],
        Options\UrlShortenerOptions::class => ['config.url_shortener'],
        Options\TrackingOptions::class => ['config.tracking'],
+        Options\QrCodeOptions::class => ['config.qr_codes'],
+        Options\WebhookOptions::class => ['config.url_shortener'], // TODO This config is currently under url_shortener

        Service\UrlShortener::class => [
            ShortUrl\Helper\ShortUrlTitleResolutionHelper::class,
@@ -112,12 +119,18 @@ return [
        ],
        Service\ShortUrl\ShortUrlResolver::class => ['em'],
        Service\ShortUrl\ShortCodeHelper::class => ['em'],
-        Domain\DomainService::class => ['em', 'config.url_shortener.domain.hostname'],
+        Domain\DomainService::class => [
+            'em',
+            'config.url_shortener.domain.hostname',
+            Options\NotFoundRedirectOptions::class,
+        ],

        Util\UrlValidator::class => ['httpClient', Options\UrlShortenerOptions::class],
        Util\DoctrineBatchHelper::class => ['em'],
        Util\RedirectResponseHelper::class => [Options\UrlShortenerOptions::class],

+        Config\NotFoundRedirectResolver::class => [Util\RedirectResponseHelper::class, 'Logger_Shlink'],
+
        Action\RedirectAction::class => [
            Service\ShortUrl\ShortUrlResolver::class,
            Visit\RequestTracker::class,
@@ -129,6 +142,7 @@ return [
            Service\ShortUrl\ShortUrlResolver::class,
            ShortUrl\Helper\ShortUrlStringifier::class,
            'Logger_Shlink',
+            Options\QrCodeOptions::class,
        ],
        Action\RobotsAction::class => [Crawling\CrawlingHelper::class],

--- a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.Domain.php
+++ b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.Domain.php
@@ -24,4 +24,19 @@ return static function (ClassMetadata $metadata, array $emConfig): void {
    $builder->createField('authority', Types::STRING)
            ->unique()
            ->build();
+
+    $builder->createField('baseUrlRedirect', Types::STRING)
+            ->columnName('base_url_redirect')
+            ->nullable()
+            ->build();
+
+    $builder->createField('regular404Redirect', Types::STRING)
+            ->columnName('regular_not_found_redirect')
+            ->nullable()
+            ->build();
+
+    $builder->createField('invalidShortUrlRedirect', Types::STRING)
+            ->columnName('invalid_short_url_redirect')
+            ->nullable()
+            ->build();
 };
--- a/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.ShortUrl.php
+++ b/module/Core/config/entities-mappings/Shlinkio.Shlink.Core.Entity.ShortUrl.php
@@ -100,4 +100,9 @@ return static function (ClassMetadata $metadata, array $emConfig): void {
            ->columnName('crawlable')
            ->option('default', false)
            ->build();
+
+    $builder->createField('forwardQuery', Types::BOOLEAN)
+            ->columnName('forward_query')
+            ->option('default', true)
+            ->build();
 };
--- a/module/Core/config/event_dispatcher.config.php
+++ b/module/Core/config/event_dispatcher.config.php
@@ -58,7 +58,7 @@ return [
            'httpClient',
            'em',
            'Logger_Shlink',
-            'config.url_shortener.visits_webhooks',
+            Options\WebhookOptions::class,
            ShortUrl\Transformer\ShortUrlDataTransformer::class,
            Options\AppOptions::class,
        ],
--- a/module/Core/functions/functions.php
+++ b/module/Core/functions/functions.php
@@ -6,7 +6,6 @@ namespace Shlinkio\Shlink\Core;

 use Cake\Chronos\Chronos;
 use DateTimeInterface;
-use Fig\Http\Message\StatusCodeInterface;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
 use Laminas\InputFilter\InputFilter;
 use PUGX\Shortid\Factory as ShortIdFactory;
@@ -16,20 +15,12 @@ use function Functional\reduce_left;
 use function is_array;
 use function lcfirst;
 use function print_r;
+use function Shlinkio\Shlink\Common\buildDateRange;
 use function sprintf;
 use function str_repeat;
 use function str_replace;
 use function ucwords;

-const DEFAULT_DELETE_SHORT_URL_THRESHOLD = 15;
-const DEFAULT_SHORT_CODES_LENGTH = 5;
-const MIN_SHORT_CODES_LENGTH = 4;
-const DEFAULT_REDIRECT_STATUS_CODE = StatusCodeInterface::STATUS_FOUND;
-const DEFAULT_REDIRECT_CACHE_LIFETIME = 30;
-const LOCAL_LOCK_FACTORY = 'Shlinkio\Shlink\LocalLockFactory';
-const CUSTOM_SLUGS_REGEXP = '/[^\pL\pN._~]/u'; // Any unicode letter or number, plus ".", "_" and "~" chars
-const TITLE_TAG_VALUE = '/<title[^>]*>(.*?)<\/title>/i'; // Matches the value inside an html title tag
-
 function generateRandomShortCode(int $length): string
 {
    static $shortIdFactory;
@@ -51,18 +42,10 @@ function parseDateRangeFromQuery(array $query, string $startDateName, string $en
    $startDate = parseDateFromQuery($query, $startDateName);
    $endDate = parseDateFromQuery($query, $endDateName);

-    return match (true) {
-        $startDate === null && $endDate === null => DateRange::emptyInstance(),
-        $startDate !== null && $endDate !== null => DateRange::withStartAndEndDate($startDate, $endDate),
-        $startDate !== null => DateRange::withStartDate($startDate),
-        default => DateRange::withEndDate($endDate),
-    };
+    return buildDateRange($startDate, $endDate);
 }

-/**
- * @param string|DateTimeInterface|Chronos|null $date
- */
-function parseDateField($date): ?Chronos
+function parseDateField(string|DateTimeInterface|Chronos|null $date): ?Chronos
 {
    if ($date === null || $date instanceof Chronos) {
        return $date;
--- a/module/Core/src/Action/Model/QrCodeParams.php
+++ b/module/Core/src/Action/Model/QrCodeParams.php
@@ -14,40 +14,42 @@ use Endroid\QrCode\Writer\SvgWriter;
 use Endroid\QrCode\Writer\WriterInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Core\Options\QrCodeOptions;

+use function Functional\contains;
 use function strtolower;
 use function trim;

 final class QrCodeParams
 {
-    private const DEFAULT_SIZE = 300;
    private const MIN_SIZE = 50;
    private const MAX_SIZE = 1000;
+    private const SUPPORTED_FORMATS = ['png', 'svg'];

    private function __construct(
        private int $size,
        private int $margin,
        private WriterInterface $writer,
-        private ErrorCorrectionLevelInterface $errorCorrectionLevel
+        private ErrorCorrectionLevelInterface $errorCorrectionLevel,
    ) {
    }

-    public static function fromRequest(ServerRequestInterface $request): self
+    public static function fromRequest(ServerRequestInterface $request, QrCodeOptions $defaults): self
    {
        $query = $request->getQueryParams();

        return new self(
-            self::resolveSize($request, $query),
-            self::resolveMargin($query),
-            self::resolveWriter($query),
-            self::resolveErrorCorrection($query),
+            self::resolveSize($request, $query, $defaults),
+            self::resolveMargin($query, $defaults),
+            self::resolveWriter($query, $defaults),
+            self::resolveErrorCorrection($query, $defaults),
        );
    }

-    private static function resolveSize(Request $request, array $query): int
+    private static function resolveSize(Request $request, array $query, QrCodeOptions $defaults): int
    {
        // FIXME Size attribute is deprecated. After v3.0.0, always use the query param instead
-        $size = (int) $request->getAttribute('size', $query['size'] ?? self::DEFAULT_SIZE);
+        $size = (int) $request->getAttribute('size', $query['size'] ?? $defaults->size());
        if ($size < self::MIN_SIZE) {
            return self::MIN_SIZE;
        }
@@ -55,13 +57,9 @@ final class QrCodeParams
        return $size > self::MAX_SIZE ? self::MAX_SIZE : $size;
    }

-    private static function resolveMargin(array $query): int
+    private static function resolveMargin(array $query, QrCodeOptions $defaults): int
    {
-        $margin = $query['margin'] ?? null;
-        if ($margin === null) {
-            return 0;
-        }
-
+        $margin = $query['margin'] ?? (string) $defaults->margin();
        $intMargin = (int) $margin;
        if ($margin !== (string) $intMargin) {
            return 0;
@@ -70,18 +68,20 @@ final class QrCodeParams
        return $intMargin < 0 ? 0 : $intMargin;
    }

-    private static function resolveWriter(array $query): WriterInterface
+    private static function resolveWriter(array $query, QrCodeOptions $defaults): WriterInterface
    {
-        $format = strtolower(trim($query['format'] ?? 'png'));
+        $qFormat = self::normalizeParam($query['format'] ?? '');
+        $format = contains(self::SUPPORTED_FORMATS, $qFormat) ? $qFormat : self::normalizeParam($defaults->format());
+
        return match ($format) {
            'svg' => new SvgWriter(),
            default => new PngWriter(),
        };
    }

-    private static function resolveErrorCorrection(array $query): ErrorCorrectionLevelInterface
+    private static function resolveErrorCorrection(array $query, QrCodeOptions $defaults): ErrorCorrectionLevelInterface
    {
-        $errorCorrectionLevel = strtolower(trim($query['errorCorrection'] ?? 'l'));
+        $errorCorrectionLevel = self::normalizeParam($query['errorCorrection'] ?? $defaults->errorCorrection());
        return match ($errorCorrectionLevel) {
            'h' => new ErrorCorrectionLevelHigh(),
            'q' => new ErrorCorrectionLevelQuartile(),
@@ -90,6 +90,11 @@ final class QrCodeParams
        };
    }

+    private static function normalizeParam(string $param): string
+    {
+        return strtolower(trim($param));
+    }
+
    public function size(): int
    {
        return $this->size;
--- a/module/Core/src/Action/QrCodeAction.php
+++ b/module/Core/src/Action/QrCodeAction.php
@@ -14,6 +14,7 @@ use Shlinkio\Shlink\Common\Response\QrCodeResponse;
 use Shlinkio\Shlink\Core\Action\Model\QrCodeParams;
 use Shlinkio\Shlink\Core\Exception\ShortUrlNotFoundException;
 use Shlinkio\Shlink\Core\Model\ShortUrlIdentifier;
+use Shlinkio\Shlink\Core\Options\QrCodeOptions;
 use Shlinkio\Shlink\Core\Service\ShortUrl\ShortUrlResolverInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;

@@ -22,7 +23,8 @@ class QrCodeAction implements MiddlewareInterface
    public function __construct(
        private ShortUrlResolverInterface $urlResolver,
        private ShortUrlStringifierInterface $stringifier,
-        private LoggerInterface $logger
+        private LoggerInterface $logger,
+        private QrCodeOptions $defaultOptions,
    ) {
    }

@@ -37,7 +39,7 @@ class QrCodeAction implements MiddlewareInterface
            return $handler->handle($request);
        }

-        $params = QrCodeParams::fromRequest($request);
+        $params = QrCodeParams::fromRequest($request, $this->defaultOptions);
        $qrCodeBuilder = Builder::create()
            ->data($this->stringifier->stringify($shortUrl))
            ->size($params->size())
--- a/module/Core/src/Action/RobotsAction.php
+++ b/module/Core/src/Action/RobotsAction.php
@@ -23,6 +23,7 @@ class RobotsAction implements RequestHandlerInterface, StatusCodeInterface

    public function handle(ServerRequestInterface $request): ResponseInterface
    {
+        // @phpstan-ignore-next-line The "Response" phpdoc is wrong
        return new Response(self::STATUS_OK, ['Content-type' => 'text/plain'], $this->buildRobots());
    }

--- a/module/Core/src/Config/NotFoundRedirectConfigInterface.php
+++ b/module/Core/src/Config/NotFoundRedirectConfigInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Config;
+
+interface NotFoundRedirectConfigInterface
+{
+    public function invalidShortUrlRedirect(): ?string;
+
+    public function hasInvalidShortUrlRedirect(): bool;
+
+    public function regular404Redirect(): ?string;
+
+    public function hasRegular404Redirect(): bool;
+
+    public function baseUrlRedirect(): ?string;
+
+    public function hasBaseUrlRedirect(): bool;
+}
--- a/module/Core/src/Config/NotFoundRedirectResolver.php
+++ b/module/Core/src/Config/NotFoundRedirectResolver.php
@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Config;
+
+use League\Uri\Exceptions\SyntaxError;
+use League\Uri\Uri;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
+use Psr\Log\LoggerInterface;
+use Shlinkio\Shlink\Core\ErrorHandler\Model\NotFoundType;
+use Shlinkio\Shlink\Core\Util\RedirectResponseHelperInterface;
+
+use function Functional\compose;
+use function str_replace;
+
+class NotFoundRedirectResolver implements NotFoundRedirectResolverInterface
+{
+    private const DOMAIN_PLACEHOLDER = '{DOMAIN}';
+    private const ORIGINAL_PATH_PLACEHOLDER = '{ORIGINAL_PATH}';
+
+    public function __construct(
+        private RedirectResponseHelperInterface $redirectResponseHelper,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function resolveRedirectResponse(
+        NotFoundType $notFoundType,
+        NotFoundRedirectConfigInterface $config,
+        UriInterface $currentUri,
+    ): ?ResponseInterface {
+        $urlToRedirectTo = match (true) {
+            $notFoundType->isBaseUrl() && $config->hasBaseUrlRedirect() => $config->baseUrlRedirect(),
+            $notFoundType->isRegularNotFound() && $config->hasRegular404Redirect() => $config->regular404Redirect(),
+            $notFoundType->isInvalidShortUrl() && $config->hasInvalidShortUrlRedirect() =>
+                $config->invalidShortUrlRedirect(),
+            default => null,
+        };
+
+        if ($urlToRedirectTo === null) {
+            return null;
+        }
+
+        return $this->redirectResponseHelper->buildRedirectResponse(
+            $this->resolvePlaceholders($currentUri, $urlToRedirectTo),
+        );
+    }
+
+    private function resolvePlaceholders(UriInterface $currentUri, string $redirectUrl): string
+    {
+        $domain = $currentUri->getAuthority();
+        $path = $currentUri->getPath();
+
+        try {
+            $redirectUri = Uri::createFromString($redirectUrl);
+        } catch (SyntaxError $e) {
+            $this->logger->warning('It was not possible to parse "{url}" as a valid URL: {e}', [
+                'e' => $e,
+                'url' => $redirectUrl,
+            ]);
+            return $redirectUrl;
+        }
+
+        $replacePlaceholderForPattern = static fn (string $pattern, string $replace, callable $modifier) =>
+            static fn (?string $value) =>
+                $value === null ? null : str_replace($modifier($pattern), $modifier($replace), $value);
+        $replacePlaceholders = static fn (callable $modifier) => compose(
+            $replacePlaceholderForPattern(self::DOMAIN_PLACEHOLDER, $domain, $modifier),
+            $replacePlaceholderForPattern(self::ORIGINAL_PATH_PLACEHOLDER, $path, $modifier),
+        );
+        $replacePlaceholdersInPath = $replacePlaceholders('\Functional\id');
+        $replacePlaceholdersInQuery = $replacePlaceholders('\urlencode');
+
+        return $redirectUri
+            ->withPath($replacePlaceholdersInPath($redirectUri->getPath()))
+            ->withQuery($replacePlaceholdersInQuery($redirectUri->getQuery()))
+            ->__toString();
+    }
+}
--- a/module/Core/src/Config/NotFoundRedirectResolverInterface.php
+++ b/module/Core/src/Config/NotFoundRedirectResolverInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Config;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
+use Shlinkio\Shlink\Core\ErrorHandler\Model\NotFoundType;
+
+interface NotFoundRedirectResolverInterface
+{
+    public function resolveRedirectResponse(
+        NotFoundType $notFoundType,
+        NotFoundRedirectConfigInterface $config,
+        UriInterface $currentUri,
+    ): ?ResponseInterface;
+}
--- a/module/Core/src/Config/NotFoundRedirects.php
+++ b/module/Core/src/Config/NotFoundRedirects.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Config;
+
+use JsonSerializable;
+
+final class NotFoundRedirects implements JsonSerializable
+{
+    private function __construct(
+        private ?string $baseUrlRedirect,
+        private ?string $regular404Redirect,
+        private ?string $invalidShortUrlRedirect,
+    ) {
+    }
+
+    public static function withRedirects(
+        ?string $baseUrlRedirect,
+        ?string $regular404Redirect = null,
+        ?string $invalidShortUrlRedirect = null,
+    ): self {
+        return new self($baseUrlRedirect, $regular404Redirect, $invalidShortUrlRedirect);
+    }
+
+    public static function withoutRedirects(): self
+    {
+        return new self(null, null, null);
+    }
+
+    public static function fromConfig(NotFoundRedirectConfigInterface $config): self
+    {
+        return new self($config->baseUrlRedirect(), $config->regular404Redirect(), $config->invalidShortUrlRedirect());
+    }
+
+    public function baseUrlRedirect(): ?string
+    {
+        return $this->baseUrlRedirect;
+    }
+
+    public function regular404Redirect(): ?string
+    {
+        return $this->regular404Redirect;
+    }
+
+    public function invalidShortUrlRedirect(): ?string
+    {
+        return $this->invalidShortUrlRedirect;
+    }
+
+    public function jsonSerialize(): array
+    {
+        return [
+            'baseUrlRedirect' => $this->baseUrlRedirect,
+            'regular404Redirect' => $this->regular404Redirect,
+            'invalidShortUrlRedirect' => $this->invalidShortUrlRedirect,
+        ];
+    }
+}
--- a/module/Core/src/Domain/DomainService.php
+++ b/module/Core/src/Domain/DomainService.php
@@ -5,10 +5,13 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Domain;

 use Doctrine\ORM\EntityManagerInterface;
+use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
 use Shlinkio\Shlink\Core\Domain\Model\DomainItem;
 use Shlinkio\Shlink\Core\Domain\Repository\DomainRepositoryInterface;
 use Shlinkio\Shlink\Core\Entity\Domain;
 use Shlinkio\Shlink\Core\Exception\DomainNotFoundException;
+use Shlinkio\Shlink\Core\Exception\InvalidDomainException;
+use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
 use Shlinkio\Shlink\Rest\ApiKey\Role;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;

@@ -16,8 +19,11 @@ use function Functional\map;

 class DomainService implements DomainServiceInterface
 {
-    public function __construct(private EntityManagerInterface $em, private string $defaultDomain)
-    {
+    public function __construct(
+        private EntityManagerInterface $em,
+        private string $defaultDomain,
+        private NotFoundRedirectOptions $redirectOptions,
+    ) {
    }

    /**
@@ -28,14 +34,14 @@ class DomainService implements DomainServiceInterface
        /** @var DomainRepositoryInterface $repo */
        $repo = $this->em->getRepository(Domain::class);
        $domains = $repo->findDomainsWithout($this->defaultDomain, $apiKey);
-        $mappedDomains = map($domains, fn (Domain $domain) => new DomainItem($domain->getAuthority(), false));
+        $mappedDomains = map($domains, fn (Domain $domain) => DomainItem::forExistingDomain($domain));

        if ($apiKey?->hasRole(Role::DOMAIN_SPECIFIC)) {
            return $mappedDomains;
        }

        return [
-            new DomainItem($this->defaultDomain, true),
+            DomainItem::forDefaultDomain($this->defaultDomain, $this->redirectOptions),
            ...$mappedDomains,
        ];
    }
@@ -54,15 +60,58 @@ class DomainService implements DomainServiceInterface
        return $domain;
    }

-    public function getOrCreate(string $authority): Domain
+    public function findByAuthority(string $authority, ?ApiKey $apiKey = null): ?Domain
    {
        $repo = $this->em->getRepository(Domain::class);
-        /** @var Domain|null $domain */
-        $domain = $repo->findOneBy(['authority' => $authority]) ?? new Domain($authority);
+        return $repo->findOneByAuthority($authority, $apiKey);
+    }

-        $this->em->persist($domain);
+    /**
+     * @throws DomainNotFoundException
+     */
+    public function getOrCreate(string $authority, ?ApiKey $apiKey = null): Domain
+    {
+        $domain = $this->getPersistedDomain($authority, $apiKey);
        $this->em->flush();

        return $domain;
    }
+
+    /**
+     * @throws DomainNotFoundException
+     * @throws InvalidDomainException
+     */
+    public function configureNotFoundRedirects(
+        string $authority,
+        NotFoundRedirects $notFoundRedirects,
+        ?ApiKey $apiKey = null,
+    ): Domain {
+        if ($authority === $this->defaultDomain) {
+            throw InvalidDomainException::forDefaultDomainRedirects();
+        }
+
+        $domain = $this->getPersistedDomain($authority, $apiKey);
+        $domain->configureNotFoundRedirects($notFoundRedirects);
+
+        $this->em->flush();
+
+        return $domain;
+    }
+
+    /**
+     * @throws DomainNotFoundException
+     */
+    private function getPersistedDomain(string $authority, ?ApiKey $apiKey): Domain
+    {
+        $domain = $this->findByAuthority($authority, $apiKey);
+        if ($domain === null && $apiKey?->hasRole(Role::DOMAIN_SPECIFIC)) {
+            // This API key is restricted to one domain and a different one was tried to be fetched
+            throw DomainNotFoundException::fromAuthority($authority);
+        }
+
+        $domain = $domain ?? Domain::withAuthority($authority);
+        $this->em->persist($domain);
+
+        return $domain;
+    }
 }
--- a/module/Core/src/Domain/DomainServiceInterface.php
+++ b/module/Core/src/Domain/DomainServiceInterface.php
@@ -4,9 +4,11 @@ declare(strict_types=1);

 namespace Shlinkio\Shlink\Core\Domain;

+use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
 use Shlinkio\Shlink\Core\Domain\Model\DomainItem;
 use Shlinkio\Shlink\Core\Entity\Domain;
 use Shlinkio\Shlink\Core\Exception\DomainNotFoundException;
+use Shlinkio\Shlink\Core\Exception\InvalidDomainException;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;

 interface DomainServiceInterface
@@ -21,5 +23,20 @@ interface DomainServiceInterface
     */
    public function getDomain(string $domainId): Domain;

-    public function getOrCreate(string $authority): Domain;
+    /**
+     * @throws DomainNotFoundException If the API key is restricted to one domain and a different one is provided
+     */
+    public function getOrCreate(string $authority, ?ApiKey $apiKey = null): Domain;
+
+    public function findByAuthority(string $authority, ?ApiKey $apiKey = null): ?Domain;
+
+    /**
+     * @throws DomainNotFoundException If the API key is restricted to one domain and a different one is provided
+     * @throws InvalidDomainException If default domain is provided
+     */
+    public function configureNotFoundRedirects(
+        string $authority,
+        NotFoundRedirects $notFoundRedirects,
+        ?ApiKey $apiKey = null,
+    ): Domain;
 }
--- a/module/Core/src/Domain/Model/DomainItem.php
+++ b/module/Core/src/Domain/Model/DomainItem.php
@@ -5,28 +5,50 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Domain\Model;

 use JsonSerializable;
+use Shlinkio\Shlink\Core\Config\NotFoundRedirectConfigInterface;
+use Shlinkio\Shlink\Core\Config\NotFoundRedirects;
+use Shlinkio\Shlink\Core\Entity\Domain;

 final class DomainItem implements JsonSerializable
 {
-    public function __construct(private string $domain, private bool $isDefault)
+    private function __construct(
+        private string $authority,
+        private NotFoundRedirectConfigInterface $notFoundRedirectConfig,
+        private bool $isDefault,
+    ) {
+    }
+
+    public static function forExistingDomain(Domain $domain): self
    {
+        return new self($domain->getAuthority(), $domain, false);
+    }
+
+    public static function forDefaultDomain(string $authority, NotFoundRedirectConfigInterface $config): self
+    {
+        return new self($authority, $config, true);
    }

    public function jsonSerialize(): array
    {
        return [
-            'domain' => $this->domain,
+            'domain' => $this->authority,
            'isDefault' => $this->isDefault,
+            'redirects' => NotFoundRedirects::fromConfig($this->notFoundRedirectConfig),
        ];
    }

    public function toString(): string
    {
-        return $this->domain;
+        return $this->authority;
    }

    public function isDefault(): bool
    {
        return $this->isDefault;
    }
+
+    public function notFoundRedirectConfig(): NotFoundRedirectConfigInterface
+    {
+        return $this->notFoundRedirectConfig;
+    }
 }
--- a/module/Core/src/Domain/Repository/DomainRepository.php
+++ b/module/Core/src/Domain/Repository/DomainRepository.php
@@ -6,8 +6,13 @@ namespace Shlinkio\Shlink\Core\Domain\Repository;

 use Doctrine\ORM\Query\Expr\Join;
 use Happyr\DoctrineSpecification\Repository\EntitySpecificationRepository;
+use Happyr\DoctrineSpecification\Spec;
+use Shlinkio\Shlink\Core\Domain\Spec\IsDomain;
+use Shlinkio\Shlink\Core\Domain\Spec\IsNotAuthority;
 use Shlinkio\Shlink\Core\Entity\Domain;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\ShortUrl\Spec\BelongsToApiKey;
+use Shlinkio\Shlink\Rest\ApiKey\Role;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;

 class DomainRepository extends EntitySpecificationRepository implements DomainRepositoryInterface
@@ -18,18 +23,51 @@ class DomainRepository extends EntitySpecificationRepository implements DomainRe
    public function findDomainsWithout(?string $excludedAuthority, ?ApiKey $apiKey = null): array
    {
        $qb = $this->createQueryBuilder('d');
-        $qb->join(ShortUrl::class, 's', Join::WITH, 's.domain = d')
-           ->orderBy('d.authority', 'ASC');
+        $qb->leftJoin(ShortUrl::class, 's', Join::WITH, 's.domain = d')
+           ->groupBy('d')
+           ->orderBy('d.authority', 'ASC')
+           ->having($qb->expr()->gt('COUNT(s.id)', '0'))
+           ->orHaving($qb->expr()->isNotNull('d.baseUrlRedirect'))
+           ->orHaving($qb->expr()->isNotNull('d.regular404Redirect'))
+           ->orHaving($qb->expr()->isNotNull('d.invalidShortUrlRedirect'));

-        if ($excludedAuthority !== null) {
-            $qb->where($qb->expr()->neq('d.authority', ':excludedAuthority'))
-               ->setParameter('excludedAuthority', $excludedAuthority);
-        }
-
-        if ($apiKey !== null) {
-            $this->applySpecification($qb, $apiKey->spec(), 's');
+        $specs = $this->determineExtraSpecs($excludedAuthority, $apiKey);
+        foreach ($specs as [$alias, $spec]) {
+            $this->applySpecification($qb, $spec, $alias);
        }

        return $qb->getQuery()->getResult();
    }
+
+    public function findOneByAuthority(string $authority, ?ApiKey $apiKey = null): ?Domain
+    {
+        $qb = $this->createQueryBuilder('d');
+        $qb->leftJoin(ShortUrl::class, 's', Join::WITH, 's.domain = d')
+           ->where($qb->expr()->eq('d.authority', ':authority'))
+           ->setParameter('authority', $authority)
+           ->setMaxResults(1);
+
+        $specs = $this->determineExtraSpecs(null, $apiKey);
+        foreach ($specs as [$alias, $spec]) {
+            $this->applySpecification($qb, $spec, $alias);
+        }
+
+        return $qb->getQuery()->getOneOrNullResult();
+    }
+
+    private function determineExtraSpecs(?string $excludedAuthority, ?ApiKey $apiKey): iterable
+    {
+        if ($excludedAuthority !== null) {
+            yield ['d', new IsNotAuthority($excludedAuthority)];
+        }
+
+        // FIXME The $apiKey->spec() method cannot be used here, as it returns a single spec which assumes the
+        //       ShortUrl is the root entity. Here, the Domain is the root entity.
+        //       Think on a way to centralize the conditional behavior and make $apiKey->spec() more flexible.
+        yield from $apiKey?->mapRoles(fn (string $roleName, array $meta) => match ($roleName) {
+            Role::DOMAIN_SPECIFIC => ['d', new IsDomain(Role::domainIdFromMeta($meta))],
+            Role::AUTHORED_SHORT_URLS => ['s', new BelongsToApiKey($apiKey)],
+            default => [null, Spec::andX()],
+        }) ?? [];
+    }
 }
--- a/module/Core/src/Domain/Repository/DomainRepositoryInterface.php
+++ b/module/Core/src/Domain/Repository/DomainRepositoryInterface.php
@@ -15,4 +15,6 @@ interface DomainRepositoryInterface extends ObjectRepository, EntitySpecificatio
     * @return Domain[]
     */
    public function findDomainsWithout(?string $excludedAuthority, ?ApiKey $apiKey = null): array;
+
+    public function findOneByAuthority(string $authority, ?ApiKey $apiKey = null): ?Domain;
 }
--- a/module/Core/src/Domain/Spec/IsDomain.php
+++ b/module/Core/src/Domain/Spec/IsDomain.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Domain\Spec;
+
+use Happyr\DoctrineSpecification\Filter\Filter;
+use Happyr\DoctrineSpecification\Spec;
+use Happyr\DoctrineSpecification\Specification\BaseSpecification;
+
+class IsDomain extends BaseSpecification
+{
+    public function __construct(private string $domainId, ?string $context = null)
+    {
+        parent::__construct($context);
+    }
+
+    protected function getSpec(): Filter
+    {
+        return Spec::eq('id', $this->domainId);
+    }
+}
--- a/module/Core/src/Domain/Spec/IsNotAuthority.php
+++ b/module/Core/src/Domain/Spec/IsNotAuthority.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Domain\Spec;
+
+use Happyr\DoctrineSpecification\Filter\Filter;
+use Happyr\DoctrineSpecification\Spec;
+use Happyr\DoctrineSpecification\Specification\BaseSpecification;
+
+class IsNotAuthority extends BaseSpecification
+{
+    public function __construct(private string $authority, ?string $context = null)
+    {
+        parent::__construct($context);
+    }
+
+    protected function getSpec(): Filter
+    {
+        return Spec::not(Spec::eq('authority', $this->authority));
+    }
+}
--- a/module/Core/src/Domain/Validation/DomainRedirectsInputFilter.php
+++ b/module/Core/src/Domain/Validation/DomainRedirectsInputFilter.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Domain\Validation;
+
+use Laminas\InputFilter\InputFilter;
+use Shlinkio\Shlink\Common\Validation;
+
+class DomainRedirectsInputFilter extends InputFilter
+{
+    use Validation\InputFactoryTrait;
+
+    public const DOMAIN = 'domain';
+    public const BASE_URL_REDIRECT = 'baseUrlRedirect';
+    public const REGULAR_404_REDIRECT = 'regular404Redirect';
+    public const INVALID_SHORT_URL_REDIRECT = 'invalidShortUrlRedirect';
+
+    private function __construct()
+    {
+    }
+
+    public static function withData(array $data): self
+    {
+        $instance = new self();
+
+        $instance->initializeInputs();
+        $instance->setData($data);
+
+        return $instance;
+    }
+
+    private function initializeInputs(): void
+    {
+        $domain = $this->createInput(self::DOMAIN);
+        $domain->getValidatorChain()->attach(new Validation\HostAndPortValidator());
+        $this->add($domain);
+
+        $this->add($this->createInput(self::BASE_URL_REDIRECT, false));
+        $this->add($this->createInput(self::REGULAR_404_REDIRECT, false));
+        $this->add($this->createInput(self::INVALID_SHORT_URL_REDIRECT, false));
+    }
+}
--- a/module/Core/src/Entity/Domain.php
+++ b/module/Core/src/Entity/Domain.php
@@ -6,13 +6,24 @@ namespace Shlinkio\Shlink\Core\Entity;

 use JsonSerializable;
 use Shlinkio\Shlink\Common\Entity\AbstractEntity;
+use Shlinkio\Shlink\Core\Config\NotFoundRedirectConfigInterface;
+use Shlinkio\Shlink\Core\Config\NotFoundRedirects;

-class Domain extends AbstractEntity implements JsonSerializable
+class Domain extends AbstractEntity implements JsonSerializable, NotFoundRedirectConfigInterface
 {
-    public function __construct(private string $authority)
+    private ?string $baseUrlRedirect = null;
+    private ?string $regular404Redirect = null;
+    private ?string $invalidShortUrlRedirect = null;
+
+    private function __construct(private string $authority)
    {
    }

+    public static function withAuthority(string $authority): self
+    {
+        return new self($authority);
+    }
+
    public function getAuthority(): string
    {
        return $this->authority;
@@ -22,4 +33,41 @@ class Domain extends AbstractEntity implements JsonSerializable
    {
        return $this->getAuthority();
    }
+
+    public function invalidShortUrlRedirect(): ?string
+    {
+        return $this->invalidShortUrlRedirect;
+    }
+
+    public function hasInvalidShortUrlRedirect(): bool
+    {
+        return $this->invalidShortUrlRedirect !== null;
+    }
+
+    public function regular404Redirect(): ?string
+    {
+        return $this->regular404Redirect;
+    }
+
+    public function hasRegular404Redirect(): bool
+    {
+        return $this->regular404Redirect !== null;
+    }
+
+    public function baseUrlRedirect(): ?string
+    {
+        return $this->baseUrlRedirect;
+    }
+
+    public function hasBaseUrlRedirect(): bool
+    {
+        return $this->baseUrlRedirect !== null;
+    }
+
+    public function configureNotFoundRedirects(NotFoundRedirects $redirects): void
+    {
+        $this->baseUrlRedirect = $redirects->baseUrlRedirect();
+        $this->regular404Redirect = $redirects->regular404Redirect();
+        $this->invalidShortUrlRedirect = $redirects->invalidShortUrlRedirect();
+    }
 }
--- a/module/Core/src/Entity/ShortUrl.php
+++ b/module/Core/src/Entity/ShortUrl.php
@@ -43,6 +43,7 @@ class ShortUrl extends AbstractEntity
    private ?string $title = null;
    private bool $titleWasAutoResolved = false;
    private bool $crawlable = false;
+    private bool $forwardQuery = true;

    private function __construct()
    {
@@ -80,6 +81,7 @@ class ShortUrl extends AbstractEntity
        $instance->title = $meta->getTitle();
        $instance->titleWasAutoResolved = $meta->titleWasAutoResolved();
        $instance->crawlable = $meta->isCrawlable();
+        $instance->forwardQuery = $meta->forwardQuery();

        return $instance;
    }
@@ -207,6 +209,11 @@ class ShortUrl extends AbstractEntity
        return $this->crawlable;
    }

+    public function forwardQuery(): bool
+    {
+        return $this->forwardQuery;
+    }
+
    public function update(
        ShortUrlEdit $shortUrlEdit,
        ?ShortUrlRelationResolverInterface $relationResolver = null,
@@ -238,6 +245,9 @@ class ShortUrl extends AbstractEntity
            $this->title = $shortUrlEdit->title();
            $this->titleWasAutoResolved = $shortUrlEdit->titleWasAutoResolved();
        }
+        if ($shortUrlEdit->forwardQueryWasProvided()) {
+            $this->forwardQuery = $shortUrlEdit->forwardQuery();
+        }
    }

    /**
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alejandro Celaya	6f62d62909	Merge pull request #1203 from shlinkio/develop Release 2.9.1	2021-10-11 09:03:16 +02:00
Alejandro Celaya	c3aa2df4e9	Merge pull request #1202 from acelaya-forks/feature/fix-use-https Fixed crash when trying to resolve schema based on USE_HTTPS env var	2021-10-11 09:01:38 +02:00
Alejandro Celaya	f4fbf2da75	Tagged version in changelog	2021-10-11 08:47:41 +02:00
Alejandro Celaya	288de8acaa	Fixed crash when trying to resolve schema based on USE_HTTPS env var	2021-10-11 08:46:40 +02:00
Alejandro Celaya	750e6cff45	Merge pull request #1200 from shlinkio/develop Release 2.9.0	2021-10-10 22:45:17 +02:00
Alejandro Celaya	f49e94052d	Merge pull request #1199 from acelaya-forks/feature/address-based-tracking Feature/address based tracking	2021-10-10 22:42:27 +02:00
Alejandro Celaya	ceb642b745	Updated to latest installer and changelog	2021-10-10 22:31:26 +02:00
Alejandro Celaya	ed1d886f01	Added option to disable tracking based on IP address patterns	2021-10-10 22:00:22 +02:00
Alejandro Celaya	db98d811b0	Merge pull request #1198 from acelaya-forks/feature/orphan-visits-webhook Feature/orphan visits webhook	2021-10-09 13:08:05 +02:00
Alejandro Celaya	14ba11e1ab	Enhanced changelog	2021-10-09 12:36:37 +02:00
Alejandro Celaya	483bdddb18	Updated to installer version with support for orphan visits webhooks	2021-10-09 12:35:45 +02:00
Alejandro Celaya	d16fda3f16	Added option to send orphan visits to webhooks	2021-10-09 10:53:21 +02:00
Alejandro Celaya	c718b94937	Fixed crash when notifying orphan visits to a webhook	2021-10-09 10:35:37 +02:00
Alejandro Celaya	bb21ab073f	Merge pull request #1196 from acelaya-forks/feature/redis-sentinels Feature/redis sentinels	2021-10-08 19:05:17 +02:00
Alejandro Celaya	3ffe530461	Updated changelog	2021-10-08 18:52:53 +02:00
Alejandro Celaya	95cf0d86bc	Added support to provide redis sentinel when using redis cache	2021-10-08 18:52:17 +02:00
Alejandro Celaya	9899a5fc56	Merge pull request #1195 from acelaya-forks/feature/not-found-redirect-placeholders Feature/not found redirect placeholders	2021-10-03 17:04:17 +02:00
Alejandro Celaya	952648185c	Removed duplicated space	2021-10-03 16:48:39 +02:00
Alejandro Celaya	69740493b7	Updated changelog	2021-10-03 16:47:43 +02:00
Alejandro Celaya	994a28f31d	Ensured NotFoundRedirectResolver replaces placeholders from the URL	2021-10-03 16:45:13 +02:00
Alejandro Celaya	b0a8a03f0a	Refactored NotFoundRedirectResolver to remove duplicated lines and non-strict code	2021-10-03 10:35:35 +02:00
Alejandro Celaya	36e740f4cc	Added logic to forward path and domain to not-found redirects when they contain placeholders	2021-10-02 17:30:25 +02:00
Alejandro Celaya	a5874a3f80	Merge pull request #1194 from acelaya-forks/feature/optinally-forward-query Feature/optinally forward query	2021-10-02 10:56:48 +02:00
Alejandro Celaya	0c95b978b4	Added option in CLI to disable query forwarding when creating Short URLs	2021-10-02 10:45:00 +02:00
Alejandro Celaya	e21f9dd1fb	Added forwardQuery prop to the SHortUrl serialization	2021-10-02 10:31:23 +02:00
Alejandro Celaya	74a08b86ce	Estended ShortUrlRedirectionBuilderTest covering short URLS withput query forwarding	2021-10-02 10:16:56 +02:00
Alejandro Celaya	8212d3c540	Allowed to set and update the forwardQuery param on short URLs	2021-10-02 10:02:47 +02:00
Alejandro Celaya	1ed6458b39	Added forwardQuery property in short URLs, that determines if the query should be forwarded to the long URL	2021-10-02 09:32:04 +02:00
Alejandro Celaya	60c8f23a63	Merge pull request #1193 from acelaya-forks/feature/api-key-visits Added extra DB tests ensuring proper short URL visits are resolved fr…	2021-10-01 19:59:30 +02:00
Alejandro Celaya	5e627641ea	Added more tests ensuring any short URL can be fetched by using an admin API key	2021-10-01 19:32:34 +02:00
Alejandro Celaya	abc954aa47	Added extra DB tests ensuring proper short URL visits are resolved from an API key	2021-09-30 22:57:24 +02:00
Alejandro Celaya	3bfa27e682	Merge pull request #1191 from acelaya-forks/feature/default-qr-codes-config Feature/default qr codes config	2021-09-26 20:39:09 +02:00
Alejandro Celaya	4b7e122254	Updated changelog	2021-09-26 20:15:00 +02:00
Alejandro Celaya	cfd3c13751	Updated to latest installer	2021-09-26 20:13:50 +02:00
Alejandro Celaya	6a1ee2b894	Added new config to set custom defaults for QR codes	2021-09-26 13:25:02 +02:00
Alejandro Celaya	cbec4a4e81	Moved constants to its own file inside config folder	2021-09-26 11:26:26 +02:00
Alejandro Celaya	c7d8c1cab5	Merge pull request #1189 from acelaya-forks/feature/roll-back-domain-redirects-logic Reolled-back logic that would have made domains with no specific redi…	2021-09-26 11:22:58 +02:00
Alejandro Celaya	c39e1e649d	Reolled-back logic that would have made domains with no specific redirects to not fall back to the default redirects	2021-09-26 11:10:00 +02:00
Alejandro Celaya	95ab64ba77	Merge pull request #1187 from acelaya-forks/feature/build-8.1 Feature/build 8.1	2021-09-26 10:43:55 +02:00
Alejandro Celaya	1f8fcdb0f3	Fixed typo in ci workflow	2021-09-26 10:20:09 +02:00
Alejandro Celaya	fb26a8ae50	Downgraded pdo_sqlsrv version for PHP 8.0	2021-09-26 10:19:26 +02:00
Alejandro Celaya	42dbeaa1a5	Updated MS native deps in swoole dev container	2021-09-26 10:06:35 +02:00
Alejandro Celaya	3305f4c03a	Updated pdo_sqlsrv version used in CI workflow	2021-09-26 10:04:50 +02:00
Alejandro Celaya	f5beec70c8	Updated MS native deps	2021-09-26 10:03:07 +02:00
Alejandro Celaya	c2cd21c15e	Updated swoole version used in CI workflow	2021-09-26 09:53:58 +02:00
Alejandro Celaya	633e389275	Updated changelog	2021-09-26 09:50:35 +02:00
Alejandro Celaya	f5aaf298e1	Added experimental builds under PHP 8.1	2021-09-26 09:49:51 +02:00
Alejandro Celaya	7db6136436	Simplified how the not-found redirects are resolved	2021-09-26 09:40:24 +02:00
Alejandro Celaya	ce7296eebb	Merge pull request #1186 from acelaya-forks/feature/deprecate-domain-env-vars Feature/deprecate domain env vars	2021-09-26 09:23:01 +02:00
Alejandro Celaya	c6226547f7	Updated changelog	2021-09-26 09:12:26 +02:00
Alejandro Celaya	e7ec8f0489	Deprecated SHORT_DOMAIN_* env vars with replacements	2021-09-26 09:10:54 +02:00
Alejandro Celaya	dc466f238b	Updated changelog	2021-09-12 08:32:24 +02:00
Alejandro Celaya	f164656874	Merge pull request #1172 from NReilingh/patch-1 Slight misuse of VOLUME in Dockerfile	2021-09-12 08:30:28 +02:00
Nick Reilingh	ef3c59152f	Dockerfile -- remove unneeded VOLUME instructions	2021-09-11 16:40:09 -04:00
Nick Reilingh	14c6ead389	Dockerfile - comment misused VOLUME instructions Issuing a VOLUME instruction in a production Dockerfile requires the Docker engine to create a volume whether or not it is mapped to the host or a named volume. Neither of these paths have data that needs to be persisted for production use, so their inclusion under a typical `docker run` example forces the engine to create extraneous volumes which quickly become orphaned whenever the container is recreated.	2021-09-11 13:46:52 -04:00
Alejandro Celaya	b0d33f3a85	Merge pull request #1166 from acelaya-forks/feature/fix-undefined-var Feature/fix undefined var	2021-08-26 10:06:33 +02:00
Alejandro Celaya	066cc20ee6	Updated changelog	2021-08-26 09:53:10 +02:00
Alejandro Celaya	0f51b5b1ce	Fixed warning displayed when trying to late visits and there are no pending	2021-08-26 09:52:11 +02:00
Alejandro Celaya	ebcf3e0119	Merge pull request #1158 from acelaya-forks/feature/global-cors Feature/global cors	2021-08-16 13:02:18 +02:00
Alejandro Celaya	6ee248d656	Updated changelog	2021-08-16 12:50:18 +02:00
Alejandro Celaya	8a46b410f6	Ensured Cors middleware applies for all routes, not only rest ones	2021-08-16 12:49:15 +02:00
Alejandro Celaya	cd06cea153	Fixed merge conflicts	2021-08-15 19:32:27 +02:00
Alejandro Celaya	8393d44c50	Merge pull request #1156 from acelaya-forks/feature/query-num-keys Fixed numeric query params being replaced by 0 in long URLs	2021-08-15 19:25:13 +02:00
Alejandro Celaya	3e8ce80f80	Fixed numeric query params being replaced by 0 in long URLs	2021-08-15 19:13:26 +02:00
Alejandro Celaya	80e033c91d	Fixed local dev config for db	2021-08-14 19:23:08 +02:00
Alejandro Celaya	a7dd441333	Added missing double quote. Closes #1151	2021-08-09 22:16:12 +02:00
Alejandro Celaya	48efaa9fd7	Merge pull request #1150 from acelaya-forks/feature/env-config Feature/env config	2021-08-07 14:13:26 +02:00
Alejandro Celaya	92e831175f	Ensure no DB driver config falls back to SQLite	2021-08-07 13:32:59 +02:00
Alejandro Celaya	9b75e076b5	Updated changelog	2021-08-07 11:08:52 +02:00
Alejandro Celaya	2c5d6d1651	Moved env vars to common global config files, so that theycan be used in non-docker contexts too	2021-08-07 11:05:20 +02:00
Alejandro Celaya	c5cf116f33	Fixed changelog message	2021-08-06 19:59:35 +02:00
Alejandro Celaya	66a4a9bce6	Moved bugfix from Unreleased to v2.8.0, as it's already fixed there	2021-08-06 13:57:39 +02:00
Alejandro Celaya	7e7ef64c79	Merge pull request #1146 from acelaya-forks/feature/coding-standard Updated to coding standard v2.2.0	2021-08-05 19:58:34 +02:00
Alejandro Celaya	9a31f53d4d	Updated to coding standard v2.2.0	2021-08-05 19:47:17 +02:00
Alejandro Celaya	60d6314262	Merge pull request #1145 from acelaya-forks/feature/update-cache Feature/update cache	2021-08-05 17:07:41 +02:00
Alejandro Celaya	eff7445804	Updated changelog	2021-08-05 16:50:50 +02:00
Alejandro Celaya	2bfe21aef4	Documented architectural decission on what component to pick for caching	2021-08-05 16:47:30 +02:00
Alejandro Celaya	6ae0c7dcfc	Updated to latest common with symfony/cache support	2021-08-05 14:05:44 +02:00
Alejandro Celaya	883ac1007a	Updated to provisional hero-common v4.0	2021-08-04 18:46:19 +02:00
Alejandro Celaya	ff6747dab5	Merge pull request #1143 from shlinkio/develop Release 2.8.0	2021-08-04 15:43:59 +02:00
Alejandro Celaya	555e6f804c	Merge pull request #1141 from acelaya-forks/feature/update-deps Feature/update deps	2021-08-04 15:36:28 +02:00
Alejandro Celaya	98c5c7990f	Updated changelog	2021-08-04 13:29:33 +02:00
Alejandro Celaya	27dcdb517d	Updated dockerfile dependencies	2021-08-04 13:28:14 +02:00
Alejandro Celaya	916d75d161	Updated project dependencies	2021-08-04 13:22:16 +02:00
Alejandro Celaya	57bd16f4f5	Updated test utils lib to v2.2	2021-08-04 11:11:00 +02:00
Alejandro Celaya	444a1756a2	Merge pull request #1140 from acelaya-forks/feature/domain-redirects-endpoint Feature/domain redirects endpoint	2021-08-03 19:59:54 +02:00
Alejandro Celaya	0c97c8f04f	Updated changelog	2021-08-03 19:47:44 +02:00
Alejandro Celaya	de81e81ecb	Created API test for Domain redirects	2021-08-03 19:43:30 +02:00
Alejandro Celaya	40a7d5a112	Documented error when trying to edit default domain redirects through endpoint	2021-08-03 18:33:50 +02:00
Alejandro Celaya	7c06633a67	Ensured default domain redirects cannot be edited through regular approach	2021-08-03 18:28:09 +02:00
Alejandro Celaya	9abf611d63	Created DomainResirectsAction unit test	2021-08-03 18:09:39 +02:00
Alejandro Celaya	565fe4c348	Added redirects to the list of domains	2021-08-03 17:00:26 +02:00
Alejandro Celaya	7b43403b1c	Fixed error when editing domain redirects for a new domain	2021-08-03 16:48:17 +02:00
Alejandro Celaya	9f25979b4c	Added validation to not found redirects for domain	2021-08-03 14:08:36 +02:00
Alejandro Celaya	20f70b8b07	Created new table with row separators for CLI, to use with multi-line rows	2021-08-03 10:21:42 +02:00
Alejandro Celaya	8fbf05acd4	Added deprecated keyword to ensure something is changed for v3.0.0	2021-08-03 10:02:44 +02:00
Alejandro Celaya	6860855c71	Prevent double flush when editing domain redirects	2021-08-03 09:55:21 +02:00
Alejandro Celaya	b78660c685	Updated installer	2021-08-02 20:50:35 +02:00
Alejandro Celaya	6a40bbdcb5	Created new action to set redirects for a domain	2021-08-02 20:49:39 +02:00
Alejandro Celaya	5a1a4f5594	Added support to configure domain redirects but taking into consideration the permissions on an API key	2021-08-02 20:49:39 +02:00
Alejandro Celaya	2ac7be4363	Extended DomainNotFoundException to allow creating from an authority	2021-08-02 20:49:39 +02:00
Alejandro Celaya	4ef5ab7a90	Fixed wrong domains getting resolved for an API key roles	2021-08-02 20:49:39 +02:00
Alejandro Celaya	192308a6a3	Added swagger docs for endpoint do edit domain redirects	2021-08-02 20:49:39 +02:00
Alejandro Celaya	c9ce111643	Fixed merge conflicts	2021-08-02 20:39:33 +02:00
Alejandro Celaya	32fda231ad	Merge pull request #1138 from acelaya-forks/feature/fix-import-with-no-visits Feature/fix import with no visits	2021-08-02 20:34:06 +02:00
Alejandro Celaya	e4d4686717	Ensure visits lists where the page is lower than 1, fall back to page 1 to avoid errors	2021-08-02 20:22:07 +02:00
Alejandro Celaya	ca6c6a1b6e	Updated importer to v2.3.1	2021-08-02 18:29:16 +02:00
Alejandro Celaya	806c4ce168	Merge pull request #1134 from acelaya-forks/feature/infection24 Feature/infection24	2021-08-01 10:11:53 +02:00
Alejandro Celaya	9d14597be0	Added --only-covering-test-cases flag when running infection commands	2021-08-01 10:00:24 +02:00
Alejandro Celaya	dc68bb907c	Updated infection to v0.24	2021-08-01 09:57:34 +02:00
Alejandro Celaya	e4598c058a	Merge pull request #1133 from acelaya-forks/feature/docker-cron-permissions Disabled user change on Dockerfile, as it produces some issues	2021-08-01 09:11:06 +02:00
Alejandro Celaya	377562cdff	Disabled user change on Dockerfile, as it produces some issues	2021-08-01 08:55:39 +02:00
Alejandro Celaya	969fcccc1f	Merge pull request #1131 from acelaya-forks/feature/clean-workarounds-from-fix Removed hardcoded dependency	2021-07-30 18:54:45 +02:00
Alejandro Celaya	4c00764146	Removed hardcoded dependency	2021-07-30 18:40:26 +02:00
Alejandro Celaya	e98ee64695	Merge branch 'main' into develop	2021-07-30 18:25:48 +02:00
Alejandro Celaya	51c7d0ed3e	Removed deprecated env var for publish release	2021-07-30 18:25:00 +02:00
Alejandro Celaya	db93498ee6	Fixed merge conflicts	2021-07-30 18:19:32 +02:00
Alejandro Celaya	b3af493758	Merge pull request #1130 from acelaya-forks/feature/docker-memory-limit Fixed memory too low limit on docker image	2021-07-30 18:16:40 +02:00
Alejandro Celaya	7b9ebbbb5f	Fixed use of ImplicitOptionsMiddleware with its new signature	2021-07-30 18:05:03 +02:00
Alejandro Celaya	ea735fc0a0	Ensured guzzle/psr7 1.7 is used as the project still has deprecated calls	2021-07-30 17:48:43 +02:00
Alejandro Celaya	06227e97d0	Fixed memory too low limit on docker image	2021-07-30 17:39:45 +02:00
Alejandro Celaya	dbc50b6d4f	Merge pull request #1124 from acelaya-forks/feature/domain-specific-redirects Feature/domain specific redirects	2021-07-23 18:59:24 +02:00
Alejandro Celaya	8b75ad1e7f	Covered detached domains with redirects in domains list API test	2021-07-23 13:11:09 +02:00
Alejandro Celaya	8f3c740b57	Ensured domains not used in short URLs but with redirects configured are returned in domains list	2021-07-23 13:06:03 +02:00
Alejandro Celaya	24a6a0c23f	Added test for DomainRedirectCommand	2021-07-22 20:48:58 +02:00
Alejandro Celaya	267d72a76c	Improved unit tests covering new not found redirects for domains capability	2021-07-22 17:49:37 +02:00
Alejandro Celaya	021cecc216	Created command that allows configuring not found redirects for every domain	2021-07-21 21:09:33 +02:00
Alejandro Celaya	4642480bbb	Updated changelog	2021-07-21 09:41:58 +02:00
Alejandro Celaya	4d48482d1e	Added support to define differnet not-found redirects per domain	2021-07-21 09:28:21 +02:00
Alejandro Celaya	2054784a4a	Merge pull request #1123 from acelaya-forks/feature/match-in-db-tests Replaced map with match	2021-07-20 14:04:19 +02:00
Alejandro Celaya	57d816b862	Replaced map with match	2021-07-20 14:03:19 +02:00
Alejandro Celaya	32bb66c42b	Merge pull request #1122 from acelaya-forks/feature/phpstan-level Feature/phpstan level	2021-07-20 14:01:45 +02:00
Alejandro Celaya	e4d15e64b6	Ensured static analysis is run with APP_ENV=test	2021-07-20 13:50:14 +02:00
Alejandro Celaya	b11daeae7d	Fixed version constraint in composer.json	2021-07-20 13:41:55 +02:00
Alejandro Celaya	8e78f8527e	Updated changelog	2021-07-20 13:37:00 +02:00
Alejandro Celaya	bc385744db	Temporarely ignored some phpstan errors until a custom rule is defined	2021-07-20 13:36:09 +02:00
Alejandro Celaya	02fd28edec	Installed phpstan-dcotrine and fixed more static analysis errors	2021-07-20 13:29:50 +02:00
Alejandro Celaya	95770ac104	Increased phpstan level to 8	2021-07-20 12:51:07 +02:00
Alejandro Celaya	2eeb762cd9	Moved specific phpstan ignore to their own lines	2021-07-19 22:50:32 +02:00
Alejandro Celaya	de5666d262	Resolved all phpstan errors	2021-07-19 22:47:12 +02:00
Alejandro Celaya	934d266880	Added phpstan-symfony plugin to improve inspections on getArgument and getOption	2021-07-19 20:00:53 +02:00
Alejandro Celaya	b8fa234dbb	Fixed some phpstan errors	2021-07-19 18:35:42 +02:00
Alejandro Celaya	bceea090ed	Increaed phpstan level to 7	2021-07-17 20:58:24 +02:00