Merge pull request #1350 from acelaya-forks/feature/fix-memory-leak

Updated to shlink-common 4.4, which no longer uses doctrine/cache
2026-02-28 20:23:12 +08:00 · 2022-01-23 18:14:00 +01:00 · 2022-01-23 17:54:49 +01:00 · 2022-01-07 21:50:31 +01:00 · 2022-01-07 21:37:24 +01:00 · 2022-01-07 14:44:19 +01:00
158 changed files with 2272 additions and 1166 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,29 +8,12 @@ on:
      - develop

 jobs:
-  lint:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0']
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: swoole-4.7.1
-          coverage: none
-      - run: composer install --no-interaction --prefer-dist
-      - run: composer cs
-
  static-analysis:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
        php-version: ['8.0']
+        command: ['cs', 'stan', 'swagger:validate']
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -39,223 +22,90 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.7.1
+          extensions: openswoole-4.8.1
          coverage: none
      - run: composer install --no-interaction --prefer-dist
-      - run: composer stan
+      - run: composer ${{ matrix.command }}

-  unit-tests:
+  tests:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
        php-version: ['8.0', '8.1']
-    continue-on-error: ${{ matrix.php-version == '8.1' }}
+        test-group: ['unit', 'api']
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
+      - name: Start database server
+        if: ${{ matrix.test-group == 'api' }}
+        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_postgres
      - name: Use PHP
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.7.1
+          extensions: openswoole-4.8.1
          coverage: pcov
          ini-values: pcov.directory=module
-      - 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
+      - run: composer install --no-interaction --prefer-dist
+      - run: composer test:${{ matrix.test-group }}:ci
      - uses: actions/upload-artifact@v2
        if: ${{ matrix.php-version == '8.0' }}
        with:
-          name: coverage-unit
+          name: coverage-${{ matrix.test-group }}
          path: |
-            build/coverage-unit
-            build/coverage-unit.cov
+            build/coverage-${{ matrix.test-group }}
+            build/coverage-${{ matrix.test-group }}.cov

-  db-tests-sqlite:
+  db-tests:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
        php-version: ['8.0', '8.1']
-    continue-on-error: ${{ matrix.php-version == '8.1' }}
+        platform: ['sqlite:ci', 'mysql', 'maria', 'postgres', 'ms']
+    env:
+      LC_ALL: C
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
+      - name: Install MSSQL ODBC
+        if: ${{ matrix.platform == 'ms' }}
+        run: sudo ./data/infra/ci/install-ms-odbc.sh
+      - name: Start database server
+        if: ${{ matrix.platform != 'sqlite:ci' }}
+        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_${{ matrix.platform }}
      - name: Use PHP
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.7.1
+          extensions: openswoole-4.8.1, pdo_sqlsrv-5.10.0beta2
          coverage: pcov
          ini-values: pcov.directory=module
-      - 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' }}
+      - run: composer install --no-interaction --prefer-dist
+      - name: Create test database
+        if: ${{ matrix.platform == 'ms' }}
+        run: docker-compose exec -T shlink_db_ms /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Passw0rd!' -Q "CREATE DATABASE shlink_test;"
+      - name: Run tests
+        run: composer test:db:${{ matrix.platform }}
+      - name: Upload code coverage
+        uses: actions/upload-artifact@v2
+        if: ${{ matrix.php-version == '8.0' && matrix.platform == 'sqlite:ci' }}
        with:
          name: coverage-db
          path: |
            build/coverage-db
            build/coverage-db.cov

-  db-tests-mysql:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0', '8.1']
-    continue-on-error: ${{ matrix.php-version == '8.1' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Start database server
-        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: swoole-4.7.1
-          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
-      - run: composer test:db:mysql
-
-  db-tests-maria:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0', '8.1']
-    continue-on-error: ${{ matrix.php-version == '8.1' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Start database server
-        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_maria
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: swoole-4.7.1
-          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
-      - run: composer test:db:maria
-
-  db-tests-postgres:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0', '8.1']
-    continue-on-error: ${{ matrix.php-version == '8.1' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Start database server
-        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_postgres
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: swoole-4.7.1
-          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
-      - run: composer test:db:postgres
-
-  db-tests-ms:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0', '8.1']
-    continue-on-error: ${{ matrix.php-version == '8.1' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Install MSSQL ODBC
-        run: sudo ./data/infra/ci/install-ms-odbc.sh
-      - 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.7.1, pdo_sqlsrv-5.10.0beta1
-          coverage: none
-      - 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
-
-  api-tests:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['8.0', '8.1']
-    continue-on-error: ${{ matrix.php-version == '8.1' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Start database server
-        run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml up -d shlink_db_postgres
-      - name: Use PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: swoole-4.7.1
-          coverage: pcov
-          ini-values: pcov.directory=module
-      - 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' }}
-        with:
-          name: coverage-api
-          path: |
-            build/coverage-api
-            build/coverage-api.cov
-
  mutation-tests:
    needs:
-      - unit-tests
-      - db-tests-sqlite
-      - api-tests
+      - tests
+      - db-tests
    runs-on: ubuntu-20.04
    strategy:
      matrix:
        php-version: ['8.0', '8.1']
-        test-group: ['unit', 'db']
-    continue-on-error: ${{ matrix.php-version == '8.1' }}
+        test-group: ['unit', 'db', 'api']
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
@@ -264,23 +114,24 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.7.1
+          extensions: openswoole-4.8.1
          coverage: pcov
          ini-values: pcov.directory=module
-      - 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 install --no-interaction --prefer-dist
      - uses: actions/download-artifact@v2
        with:
          path: build
-      - run: composer infect:ci:${{ matrix.test-group }}
+      - if: ${{ matrix.test-group == 'unit' }}
+        run: composer infect:ci:unit
+        env:
+          INFECTION_BADGE_API_KEY: ${{ secrets.INFECTION_BADGE_API_KEY }}
+      - if: ${{ matrix.test-group != 'unit' }}
+        run: composer infect:ci:${{ matrix.test-group }}

  upload-coverage:
    needs:
-      - unit-tests
-      - db-tests-sqlite
-      - api-tests
+      - tests
+      - db-tests
    runs-on: ubuntu-20.04
    strategy:
      matrix:
--- a/.github/workflows/docker-image-build.yml
+++ b/.github/workflows/docker-image-build.yml
@@ -9,7 +9,7 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
        uses: actions/checkout@v2
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: ['8.0']
+        php-version: ['8.0', '8.1']
        swoole: ['yes', 'no']
    steps:
      - name: Checkout code
@@ -20,7 +20,7 @@ jobs:
        with:
          php-version: ${{ matrix.php-version }}
          tools: composer
-          extensions: swoole-4.6.7
+          extensions: openswoole-4.8.1
      - if: ${{ matrix.swoole == 'yes' }}
        run: ./build.sh ${GITHUB_REF#refs/tags/v}
      - if: ${{ matrix.swoole == 'no' }}
@@ -53,7 +53,7 @@ jobs:
    runs-on: ubuntu-20.04
    strategy:
      matrix:
-        php-version: [ '8.0' ]
+        php-version: [ '8.0', '8.1' ]
        swoole: [ 'yes', 'no' ]
    steps:
      - uses: geekyeggo/delete-artifact@v1
--- a/.github/workflows/publish-swagger-spec.yml
+++ b/.github/workflows/publish-swagger-spec.yml
@@ -0,0 +1,40 @@
+name: Publish swagger spec
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        php-version: ['8.0']
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Determine version
+        id: determine_version
+        run: echo "::set-output name=version::${GITHUB_REF#refs/tags/}"
+        shell: bash
+      - name: Use PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer
+          extensions: openswoole-4.8.1
+          coverage: none
+      - run: composer install --no-interaction --prefer-dist
+      - run: composer swagger:inline
+      - run: mkdir ${{ steps.determine_version.outputs.version }}
+      - run: mv docs/swagger/swagger-inlined.json ${{ steps.determine_version.outputs.version }}/oas.json
+      - name: Publish spec
+        uses: JamesIves/github-pages-deploy-action@4.1.7
+        with:
+          token: ${{ secrets.OAS_PUBLISH_TOKEN }}
+          repository-name: 'shlinkio/shlink-open-api-specs'
+          branch: main
+          folder: ${{ steps.determine_version.outputs.version }}
+          target-folder: specs/${{ steps.determine_version.outputs.version }}
+          clean: false
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ docs/swagger-ui*
 docs/mercure.html
 docker-compose.override.yml
 .phpunit.result.cache
+docs/swagger/swagger-inlined.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,159 @@ 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).

+## [2.10.3] - 2022-01-23
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1349](https://github.com/shlinkio/shlink/issues/1349) Fixed memory leak in cache implementation.
+
+
+## [2.10.2] - 2022-01-07
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1293](https://github.com/shlinkio/shlink/issues/1293) Fixed error when trying to create/import short URLs with a too long title.
+* [#1306](https://github.com/shlinkio/shlink/issues/1306) Ensured remote IP address is not logged when using swoole/openswoole.
+* [#1308](https://github.com/shlinkio/shlink/issues/1308) Fixed memory leak when using redis due to the amount of non-expiring keys created by doctrine. Now they have a 24h expiration by default.
+
+
+## [2.10.1] - 2021-12-21
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1285](https://github.com/shlinkio/shlink/issues/1285) Fixed error caused by database connections expiring after some hours of inactivity.
+* [#1286](https://github.com/shlinkio/shlink/issues/1286) Fixed `x-request-id` header not being generated during non-rest requests.
+
+
+## [2.10.0] - 2021-12-12
+### Added
+* [#1163](https://github.com/shlinkio/shlink/issues/1163) Allowed setting not-found redirects for default domain in the same way it's done for any other domain.
+
+    This implies a few non-breaking changes:
+
+    * The domains list no longer has the values of `INVALID_SHORT_URL_REDIRECT_TO`, `REGULAR_404_REDIRECT_TO` and `BASE_URL_REDIRECT_TO` on the default domain redirects.
+    * The `GET /domains` endpoint includes a new `defaultRedirects` property in the response, with the default redirects set via config or env vars.
+    * The `INVALID_SHORT_URL_REDIRECT_TO`, `REGULAR_404_REDIRECT_TO` and `BASE_URL_REDIRECT_TO` env vars are now deprecated, and should be replaced by `DEFAULT_INVALID_SHORT_URL_REDIRECT`, `DEFAULT_REGULAR_404_REDIRECT` and `DEFAULT_BASE_URL_REDIRECT` respectively. Deprecated ones will continue to work until v3.0.0, where they will be removed.
+
+* [#868](https://github.com/shlinkio/shlink/issues/868) Added support to publish real-time updates in a RabbitMQ server.
+
+    Shlink will create new exchanges and queues for every topic documented in the [Async API spec](https://api-spec.shlink.io/async-api/), meaning, you will have one queue for orphan visits, one for regular visits, and one queue for every short URL with its visits.
+
+    The RabbitMQ server config can be provided via installer config options, or via environment variables.
+
+* [#1204](https://github.com/shlinkio/shlink/issues/1204) Added support for `openswoole` and migrated official docker image to `openswoole`.
+* [#1242](https://github.com/shlinkio/shlink/issues/1242) Added support to import urls and visits from YOURLS.
+
+    In order to do it, you need to first install this [dedicated plugin](https://slnk.to/yourls-import) in YOURLS, and then run the `short-url:import yourls` command, as with any other source.
+
+* [#1235](https://github.com/shlinkio/shlink/issues/1235) Added support to disable rounding QR codes block sizing via config option, env var or query param.
+* [#1188](https://github.com/shlinkio/shlink/issues/1188) Added support for PHP 8.1.
+
+    The official docker image has also been updated to use PHP 8.1 by default.
+
+### Changed
+* [#844](https://github.com/shlinkio/shlink/issues/844) Added mutation checks to API tests.
+* [#1218](https://github.com/shlinkio/shlink/issues/1218) Updated to symfony/mercure 0.6.
+* [#1223](https://github.com/shlinkio/shlink/issues/1223) Updated to phpstan 1.0.
+* [#1258](https://github.com/shlinkio/shlink/issues/1258) Updated to Symfony 6 components, except symfony/console.
+* Added `domain` field to `DeleteShortUrlException` exception.
+
+### Deprecated
+* [#1260](https://github.com/shlinkio/shlink/issues/1260) Deprecated `USE_HTTPS` env var that was added in previous release, in favor of the new `IS_HTTPS_ENABLED`.
+
+    The old one proved to be confusing and misleading, making people think it was used to actually enable HTTPS transparently, instead of its actual purpose, which is just telling Shlink it is being served with HTTPS.
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1206](https://github.com/shlinkio/shlink/issues/1206) Fixed debugging of the docker image, so that it does not run the commands with `-q` when the `SHELL_VERBOSITY` env var has been provided.
+* [#1254](https://github.com/shlinkio/shlink/issues/1254) Fixed examples in swagger docs.
+
+
+## [2.9.3] - 2021-11-15
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1232](https://github.com/shlinkio/shlink/issues/1232) Solved potential SQL injection by enforcing `doctrine/dbal` 3.1.4.
+
+
+## [2.9.2] - 2021-10-23
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1210](https://github.com/shlinkio/shlink/issues/1210) Fixed real time updates not being notified due to an incorrect handling of db transactions on multi-process tasks.
+* [#1211](https://github.com/shlinkio/shlink/issues/1211) Fixed `There is no active transaction` error when running migrations in MySQL/Mariadb after updating to doctrine-migrations 3.3.
+* [#1197](https://github.com/shlinkio/shlink/issues/1197) Fixed amount of task workers provided via config option or env var not being validated to ensure enough workers to process all parallel tasks.
+
+
+## [2.9.1] - 2021-10-11
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### 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.
--- a/18
+++ b/18
@@ -1,9 +1,9 @@
-FROM php:8.0.9-alpine3.14 as base
+FROM php:8.1.0-alpine3.15 as base

 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION ${SHLINK_VERSION}
-ENV SWOOLE_VERSION 4.7.1
-ENV PDO_SQLSRV_VERSION 5.9.0
+ENV OPENSWOOLE_VERSION 4.8.1
+ENV PDO_SQLSRV_VERSION 5.10.0beta2
 ENV MS_ODBC_SQL_VERSION 17.5.2.2
 ENV LC_ALL "C"

@@ -11,8 +11,8 @@ WORKDIR /etc/shlink

 # Install required PHP extensions
 RUN \
-    # Install mysql and calendar
-    docker-php-ext-install -j"$(nproc)" pdo_mysql calendar && \
+    # Install extensions with no extra dependencies
+    docker-php-ext-install -j"$(nproc)" pdo_mysql calendar sockets bcmath && \
    # Install sqlite
    apk add --no-cache sqlite-libs sqlite-dev && \
    docker-php-ext-install -j"$(nproc)" pdo_sqlite && \
@@ -40,10 +40,10 @@ RUN if [ $(uname -m) == "x86_64" ]; then \
      rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk ; \
    fi

-# Install swoole
+# Install openswoole
 RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} && \
-    pecl install swoole-${SWOOLE_VERSION} && \
-    docker-php-ext-enable swoole && \
+    pecl install openswoole-${OPENSWOOLE_VERSION} && \
+    docker-php-ext-enable openswoole && \
    apk del .phpize-deps


@@ -65,7 +65,7 @@ LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
 COPY --from=builder /etc/shlink .
 RUN ln -s /etc/shlink/bin/cli /usr/local/bin/shlink

-# Expose default swoole port
+# Expose default openswoole port
 EXPOSE 8080

 # Copy config specific for the image
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@

 [![Build Status](https://img.shields.io/github/workflow/status/shlinkio/shlink/Continuous%20integration/develop?logo=github&style=flat-square)](https://github.com/shlinkio/shlink/actions?query=workflow%3A%22Continuous+integration%22)
 [![Code Coverage](https://img.shields.io/codecov/c/gh/shlinkio/shlink/develop?style=flat-square)](https://app.codecov.io/gh/shlinkio/shlink)
+[![Infection MSI](https://img.shields.io/endpoint?style=flat-square&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fshlinkio%2Fshlink%2Fdevelop)](https://dashboard.stryker-mutator.io/reports/github.com/shlinkio/shlink/develop)
 [![Latest Stable Version](https://img.shields.io/github/release/shlinkio/shlink.svg?style=flat-square)](https://packagist.org/packages/shlinkio/shlink)
 [![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?logo=docker&style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/)
 [![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/main/LICENSE)
@@ -33,10 +34,11 @@ The idea is that you can just generate a container using the image and provide t

 First, make sure the host where you are going to run shlink fulfills these requirements:

-* PHP 8.0
+* PHP 8.0 or 8.1
 * The next PHP extensions: json, curl, pdo, intl, gd and gmp.
-    * apcu extension is recommended if you don't plan to use swoole.
+    * apcu extension is recommended if you don't plan to use swoole or openswoole.
    * xml extension is required if you want to generate QR codes in svg format.
+    * sockets and bcmath extensions are required if you want to integrate with a RabbitMQ instance.
 * MySQL, MariaDB, PostgreSQL, Microsoft SQL Server or SQLite.
 * The web server of your choice with PHP integration (Apache or Nginx recommended).

@@ -48,7 +50,7 @@ In order to run Shlink, you will need a built version of the project. There are

    The easiest way to install shlink is by using one of the pre-bundled distributable packages.

-    Go to the [latest version](https://github.com/shlinkio/shlink/releases/latest) and download the `shlink*_dist.zip` file that suits your needs. You will find one for every supported PHP version and with/without swoole integration.
+    Go to the [latest version](https://github.com/shlinkio/shlink/releases/latest) and download the `shlink*_dist.zip` file that suits your needs. You will find one for every supported PHP version and with/without swoole/openswoole integration.

    Finally, decompress the file in the location of your choice.

--- a/bin/test/run-api-tests.sh
+++ b/bin/test/run-api-tests.sh
@@ -2,6 +2,7 @@
 export APP_ENV=test
 export DB_DRIVER=postgres
 export TEST_ENV=api
+export GENERATE_COVERAGE=${GENERATE_COVERAGE:-"no"}

 rm -rf data/log/api-tests

--- a/composer.json
+++ b/composer.json
@@ -15,67 +15,69 @@
        "php": "^8.0",
        "ext-json": "*",
        "ext-pdo": "*",
-        "akrabat/ip-address-middleware": "^2.0",
-        "cakephp/chronos": "^2.2",
+        "akrabat/ip-address-middleware": "^2.1",
+        "cakephp/chronos": "^2.3",
        "cocur/slugify": "^4.0",
-        "doctrine/migrations": "^3.2",
-        "doctrine/orm": "^2.9",
-        "endroid/qr-code": "^4.2",
-        "geoip2/geoip2": "^2.11",
-        "guzzlehttp/guzzle": "^7.3",
+        "doctrine/migrations": "^3.3",
+        "doctrine/orm": "^2.10",
+        "endroid/qr-code": "^4.4",
+        "geoip2/geoip2": "^2.12",
+        "guzzlehttp/guzzle": "^7.4",
        "happyr/doctrine-specification": "^2.0",
-        "jaybizzle/crawler-detect": "^1.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",
+        "jaybizzle/crawler-detect": "^1.2.110",
+        "laminas/laminas-config": "^3.7",
+        "laminas/laminas-config-aggregator": "^1.7",
+        "laminas/laminas-diactoros": "^2.8",
+        "laminas/laminas-inputfilter": "^2.13",
+        "laminas/laminas-servicemanager": "^3.10",
+        "laminas/laminas-stdlib": "^3.6",
        "lcobucci/jwt": "^4.1",
        "league/uri": "^6.4",
        "lstrojny/functional-php": "^1.17",
-        "mezzio/mezzio": "^3.5",
-        "mezzio/mezzio-fastroute": "^3.2",
-        "mezzio/mezzio-problem-details": "^1.4",
-        "mezzio/mezzio-swoole": "^3.3",
+        "mezzio/mezzio": "^3.7",
+        "mezzio/mezzio-fastroute": "^3.3",
+        "mezzio/mezzio-problem-details": "^1.5",
+        "mezzio/mezzio-swoole": "^3.5",
+        "mlocati/ip-lib": "^1.17",
        "monolog/monolog": "^2.3",
        "nikolaposa/monolog-factory": "^3.1",
        "ocramius/proxy-manager": "^2.11",
-        "pagerfanta/core": "^2.7",
+        "pagerfanta/core": "^3.5",
+        "php-amqplib/php-amqplib": "^3.1",
        "php-middleware/request-id": "^4.1",
        "predis/predis": "^1.1",
-        "pugx/shortid-php": "^0.7",
-        "ramsey/uuid": "^3.9",
-        "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.1",
-        "shlinkio/shlink-installer": "^6.2",
-        "shlinkio/shlink-ip-geolocation": "^2.0",
-        "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"
+        "pugx/shortid-php": "^1.0",
+        "ramsey/uuid": "^4.2",
+        "shlinkio/shlink-common": "^4.4",
+        "shlinkio/shlink-config": "^1.4",
+        "shlinkio/shlink-event-dispatcher": "^2.3",
+        "shlinkio/shlink-importer": "^2.5",
+        "shlinkio/shlink-installer": "^6.3",
+        "shlinkio/shlink-ip-geolocation": "^2.2",
+        "symfony/console": "^5.4",
+        "symfony/filesystem": "^6.0 || ^5.4",
+        "symfony/lock": "^6.0 || ^5.4",
+        "symfony/mercure": "^0.6",
+        "symfony/process": "^6.0 || ^5.4",
+        "symfony/string": "^6.0 || ^5.4"
    },
    "require-dev": {
+        "cebe/php-openapi": "^1.5",
        "devster/ubench": "^2.1",
        "dms/phpunit-arraysubset-asserts": "^0.3.0",
        "eaglewu/swoole-ide-helper": "dev-master",
-        "infection/infection": "^0.25.0",
+        "infection/infection": "^0.25.4",
        "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/phpstan": "^0.12.94",
-        "phpstan/phpstan-doctrine": "^0.12.42",
-        "phpstan/phpstan-symfony": "^0.12.41",
+        "phpstan/phpstan": "^1.2",
+        "phpstan/phpstan-doctrine": "^1.0",
+        "phpstan/phpstan-symfony": "^1.0",
        "phpunit/php-code-coverage": "^9.2",
        "phpunit/phpunit": "^9.5",
        "roave/security-advisories": "dev-master",
        "shlinkio/php-coding-standard": "~2.2.0",
-        "shlinkio/shlink-test-utils": "^2.2",
-        "symfony/var-dumper": "^5.3",
-        "veewee/composer-run-parallel": "^1.0"
+        "shlinkio/shlink-test-utils": "^2.5",
+        "symfony/var-dumper": "^6.0",
+        "veewee/composer-run-parallel": "^1.1"
    },
    "autoload": {
        "psr-4": {
@@ -106,12 +108,13 @@
        "ci": [
            "@cs",
            "@stan",
+            "@swagger:validate",
            "@test:ci",
            "@infect:ci"
        ],
        "ci:parallel": [
-            "@parallel cs stan test:unit:ci test:db:sqlite:ci test:db:mysql test:db:maria test:db:postgres test:db:ms",
-            "@parallel test:api infect:ci:unit infect:ci:db"
+            "@parallel cs stan swagger:validate test:unit:ci test:db:sqlite:ci test:db:mysql test:db:maria test:db:postgres test:db:ms",
+            "@parallel infect:test:api infect:ci:unit infect:ci:db"
        ],
        "cs": "phpcs",
        "cs:fix": "phpcbf",
@@ -124,11 +127,11 @@
        "test:ci": [
            "@test:unit:ci",
            "@test:db",
-            "@test:api"
+            "@test:api:ci"
        ],
        "test:unit": "@php vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox",
        "test:unit:ci": "@test:unit --coverage-xml=build/coverage-unit/coverage-xml --log-junit=build/coverage-unit/junit.xml",
-        "test:unit:pretty": "@php vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage-unit-html",
+        "test:unit:pretty": "@php vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage-unit/coverage-html",
        "test:db": "@parallel test:db:sqlite:ci test:db:mysql test:db:maria test:db:postgres test:db:ms",
        "test:db:sqlite": "APP_ENV=test php vendor/bin/phpunit --order-by=random --colors=always --testdox -c phpunit-db.xml",
        "test:db:sqlite:ci": "@test:db:sqlite --coverage-php build/coverage-db.cov --coverage-xml=build/coverage-db/coverage-xml --log-junit=build/coverage-db/junit.xml",
@@ -137,18 +140,30 @@
        "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",
+        "test:api:ci": "GENERATE_COVERAGE=yes composer test:api",
        "infect:ci:base": "infection --threads=4 --log-verbosity=default --only-covered --only-covering-test-cases --skip-initial-tests",
        "infect:ci:unit": "@infect:ci:base --coverage=build/coverage-unit --min-msi=80",
        "infect:ci:db": "@infect:ci:base --coverage=build/coverage-db --min-msi=95 --configuration=infection-db.json",
-        "infect:ci": "@parallel infect:ci:unit infect:ci:db",
+        "infect:ci:api": "@infect:ci:base --coverage=build/coverage-api --min-msi=80 --configuration=infection-api.json",
+        "infect:ci": "@parallel infect:ci:unit infect:ci:db infect:ci:api",
        "infect:test": [
-            "@parallel test:unit:ci test:db:sqlite:ci",
+            "@parallel test:unit:ci test:db:sqlite:ci test:api:ci",
            "@infect:ci"
        ],
+        "infect:test:unit": [
+            "@test:unit:ci",
+            "@infect:ci:unit"
+        ],
+        "infect:test:api": [
+            "@test:api:ci",
+            "@infect:ci:api"
+        ],
+        "swagger:validate": "php-openapi validate docs/swagger/swagger.json",
+        "swagger:inline": "php-openapi inline docs/swagger/swagger.json docs/swagger/swagger-inlined.json",
        "clean:dev": "rm -f data/database.sqlite && rm -f config/params/generated_config.php"
    },
    "scripts-descriptions": {
-        "ci": "<fg=blue;options=bold>Alias for \"cs\", \"stan\", \"test:ci\" and \"infect:ci\"</>",
+        "ci": "<fg=blue;options=bold>Alias for \"cs\", \"stan\", \"swagger:validate\", \"test:ci\" and \"infect:ci\"</>",
        "ci:parallel": "<fg=blue;options=bold>Same as \"ci\", but parallelizing tasks as much as possible</>",
        "cs": "<fg=blue;options=bold>Checks coding styles</>",
        "cs:fix": "<fg=blue;options=bold>Fixes coding styles, when possible</>",
@@ -157,6 +172,7 @@
        "test:ci": "<fg=blue;options=bold>Runs all test suites, generating all needed reports and logs for CI envs</>",
        "test:unit": "<fg=blue;options=bold>Runs unit test suites</>",
        "test:unit:ci": "<fg=blue;options=bold>Runs unit test suites, generating all needed reports and logs for CI envs</>",
+        "test:unit:pretty": "<fg=blue;options=bold>Runs unit test suites and generates an HTML code coverage report</>",
        "test:db": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL, MariaDB, PostgreSQL and MsSQL</>",
        "test:db:sqlite": "<fg=blue;options=bold>Runs database test suites on a SQLite database</>",
        "test:db:sqlite:ci": "<fg=blue;options=bold>Runs database test suites on a SQLite database, generating all needed reports and logs for CI envs</>",
@@ -165,15 +181,23 @@
        "test:db:postgres": "<fg=blue;options=bold>Runs database test suites on a PostgreSQL database</>",
        "test:db:ms": "<fg=blue;options=bold>Runs database test suites on a Miscrosoft SQL Server database</>",
        "test:api": "<fg=blue;options=bold>Runs API test suites</>",
-        "test:unit:pretty": "<fg=blue;options=bold>Runs unit test suites and generates an HTML code coverage report</>",
+        "test:api:ci": "<fg=blue;options=bold>Runs API test suites, and generates code coverage reports</>",
        "infect:ci": "<fg=blue;options=bold>Checks unit and db tests quality applying mutation testing with existing reports and logs</>",
        "infect:ci:unit": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing with existing reports and logs</>",
        "infect:ci:db": "<fg=blue;options=bold>Checks db tests quality applying mutation testing with existing reports and logs</>",
        "infect:test": "<fg=blue;options=bold>Runs unit and db tests, then checks tests quality applying mutation testing</>",
+        "swagger:validate": "<fg=blue;options=bold>Validates the swagger docs, making sure they fulfil the spec</>",
+        "swagger:inline": "<fg=blue;options=bold>Inlines swagger docs in a single file</>",
        "clean:dev": "<fg=blue;options=bold>Deletes artifacts which are gitignored and could affect dev env</>"
    },
    "config": {
        "sort-packages": true,
-        "platform-check": false
+        "platform-check": false,
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "infection/extension-installer": true,
+            "veewee/composer-run-parallel": true
+        }
    }
 }
--- a/config/autoload/entity-manager.local.php.dist
+++ b/config/autoload/entity-manager.local.php.dist
@@ -9,9 +9,8 @@ return [
            'user' => 'root',
            'password' => 'root',
            'driver' => 'pdo_mysql',
-            'host' => 'shlink_db',
+            'host' => 'shlink_db_mysql',
            'dbname' => 'shlink',
-            'charset' => 'utf8',
        ],
    ],

--- a/config/autoload/installer.global.php
+++ b/config/autoload/installer.global.php
@@ -56,6 +56,13 @@ return [
            Option\QrCode\DefaultMarginConfigOption::class,
            Option\QrCode\DefaultFormatConfigOption::class,
            Option\QrCode\DefaultErrorCorrectionConfigOption::class,
+            Option\QrCode\DefaultRoundBlockSizeConfigOption::class,
+            Option\RabbitMq\RabbitMqEnabledConfigOption::class,
+            Option\RabbitMq\RabbitMqHostConfigOption::class,
+            Option\RabbitMq\RabbitMqPortConfigOption::class,
+            Option\RabbitMq\RabbitMqUserConfigOption::class,
+            Option\RabbitMq\RabbitMqPasswordConfigOption::class,
+            Option\RabbitMq\RabbitMqVhostConfigOption::class,
        ],

        'installation_commands' => [
--- a/config/autoload/logger.global.php
+++ b/config/autoload/logger.global.php
@@ -82,7 +82,7 @@ return [
        'swoole-http-server' => [
            'logger' => [
                'logger-name' => 'Logger_Access',
-                'format' => '%h %l %u "%r" %>s %b',
+                'format' => '%u "%r" %>s %B',
            ],
        ],
    ],
--- a/config/autoload/logger.local.php.dist
+++ b/config/autoload/logger.local.php.dist
@@ -5,7 +5,7 @@ declare(strict_types=1);
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;

-$isSwoole = extension_loaded('swoole');
+$isSwoole = extension_loaded('openswoole');

 // For swoole, send logs to standard output
 $handler = $isSwoole
--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@@ -17,6 +17,7 @@ return [
        'error-handler' => [
            'middleware' => [
                ContentLengthMiddleware::class,
+                RequestIdMiddleware::class,
                ErrorHandler::class,
                Rest\Middleware\CrossDomainMiddleware::class,
            ],
@@ -24,7 +25,6 @@ return [
        'error-handler-rest' => [
            'path' => '/rest',
            'middleware' => [
-                RequestIdMiddleware::class,
                ProblemDetails\ProblemDetailsMiddleware::class,
            ],
        ],
--- a/config/autoload/qr-codes.global.php
+++ b/config/autoload/qr-codes.global.php
@@ -7,6 +7,7 @@ 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_ROUND_BLOCK_SIZE;
 use const Shlinkio\Shlink\DEFAULT_QR_CODE_SIZE;

 return [
@@ -16,6 +17,7 @@ return [
        '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),
+        'round_block_size' => (bool) env('DEFAULT_QR_CODE_ROUND_BLOCK_SIZE', DEFAULT_QR_CODE_ROUND_BLOCK_SIZE),
    ],

 ];
--- a/config/autoload/rabbit.global.php
+++ b/config/autoload/rabbit.global.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+use Laminas\ServiceManager\Proxy\LazyServiceFactory;
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+
+use function Shlinkio\Shlink\Common\env;
+
+return [
+
+    'rabbitmq' => [
+        'enabled' => (bool) env('RABBITMQ_ENABLED', false),
+        'host' => env('RABBITMQ_HOST'),
+        'port' => (int) env('RABBITMQ_PORT', '5672'),
+        'user' => env('RABBITMQ_USER'),
+        'password' => env('RABBITMQ_PASSWORD'),
+        'vhost' => env('RABBITMQ_VHOST', '/'),
+    ],
+
+    'dependencies' => [
+        'factories' => [
+            AMQPStreamConnection::class => ConfigAbstractFactory::class,
+        ],
+        'delegators' => [
+            AMQPStreamConnection::class => [
+                LazyServiceFactory::class,
+            ],
+        ],
+        'lazy_services' => [
+            'class_map' => [
+                AMQPStreamConnection::class => AMQPStreamConnection::class,
+            ],
+        ],
+    ],
+
+    ConfigAbstractFactory::class => [
+        AMQPStreamConnection::class => [
+            'config.rabbitmq.host',
+            'config.rabbitmq.port',
+            'config.rabbitmq.user',
+            'config.rabbitmq.password',
+            'config.rabbitmq.vhost',
+        ],
+    ],
+
+];
--- a/config/autoload/rabbit.local.php.dist
+++ b/config/autoload/rabbit.local.php.dist
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'rabbitmq' => [
+        'enabled' => true,
+        'host' => 'shlink_rabbitmq',
+        'user' => 'rabbit',
+        'password' => 'rabbit',
+    ],
+
+];
--- a/config/autoload/redirects.global.php
+++ b/config/autoload/redirects.global.php
@@ -10,9 +10,10 @@ use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE;
 return [

    'not_found_redirects' => [
-        'invalid_short_url' => env('INVALID_SHORT_URL_REDIRECT_TO'),
-        'regular_404' => env('REGULAR_404_REDIRECT_TO'),
-        'base_url' => env('BASE_URL_REDIRECT_TO'),
+        // Deprecated env vars
+        'invalid_short_url' => env('DEFAULT_INVALID_SHORT_URL_REDIRECT', env('INVALID_SHORT_URL_REDIRECT_TO')),
+        'regular_404' => env('DEFAULT_REGULAR_404_REDIRECT', env('REGULAR_404_REDIRECT_TO')),
+        'base_url' => env('DEFAULT_BASE_URL_REDIRECT', env('BASE_URL_REDIRECT_TO')),
    ],

    'url_shortener' => [
--- a/config/autoload/swoole.global.php
+++ b/config/autoload/swoole.global.php
@@ -4,22 +4,28 @@ declare(strict_types=1);

 use function Shlinkio\Shlink\Common\env;

-return [
+use const Shlinkio\Shlink\MIN_TASK_WORKERS;

-    'mezzio-swoole' => [
-        // Setting this to true can have unexpected behaviors when running several concurrent slow DB queries
-        'enable_coroutine' => false,
+return (static function () {
+    $taskWorkers = (int) env('TASK_WORKER_NUM', 16);

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

-            'options' => [
-                'worker_num' => (int) env('WEB_WORKER_NUM', 16),
-                'task_worker_num' => (int) env('TASK_WORKER_NUM', 16),
+        'mezzio-swoole' => [
+            // Setting this to true can have unexpected behaviors when running several concurrent slow DB queries
+            'enable_coroutine' => false,
+
+            'swoole-http-server' => [
+                'host' => '0.0.0.0',
+                'port' => (int) env('PORT', 8080),
+                'process-name' => 'shlink',
+
+                'options' => [
+                    'worker_num' => (int) env('WEB_WORKER_NUM', 16),
+                    'task_worker_num' => max($taskWorkers, MIN_TASK_WORKERS),
+                ],
            ],
        ],
-    ],

-];
+    ];
+})();
--- a/config/autoload/url-shortener.global.php
+++ b/config/autoload/url-shortener.global.php
@@ -8,16 +8,28 @@ use const Shlinkio\Shlink\DEFAULT_SHORT_CODES_LENGTH;
 use const Shlinkio\Shlink\MIN_SHORT_CODES_LENGTH;

 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;
-    $useHttps = env('USE_HTTPS'); // Deprecated. For v3, set this to true by default, instead of null
+    $shortCodesLength = max(
+        (int) env('DEFAULT_SHORT_CODES_LENGTH', DEFAULT_SHORT_CODES_LENGTH),
+        MIN_SHORT_CODES_LENGTH,
+    );
+    $resolveSchema = static function (): string {
+        // Deprecated. For v3, IS_HTTPS_ENABLED should be true by default, instead of null
+//        return ((bool) env('IS_HTTPS_ENABLED', true)) ? 'https' : 'http';
+        $isHttpsEnabled = env('IS_HTTPS_ENABLED', env('USE_HTTPS'));
+        if ($isHttpsEnabled !== null) {
+            $boolIsHttpsEnabled = (bool) $isHttpsEnabled;
+            return $boolIsHttpsEnabled ? 'https' : 'http';
+        }
+
+        return env('SHORT_DOMAIN_SCHEMA', 'http');
+    };

    return [

        'url_shortener' => [
            'domain' => [
                // Deprecated SHORT_DOMAIN_* env vars
-                'schema' => $useHttps !== null ? (bool) $useHttps : env('SHORT_DOMAIN_SCHEMA', 'http'),
+                'schema' => $resolveSchema(),
                'hostname' => env('DEFAULT_DOMAIN', env('SHORT_DOMAIN_HOST', '')),
            ],
            'validate_url' => (bool) env('VALIDATE_URLS', false), // Deprecated
--- a/config/autoload/url-shortener.local.php.dist
+++ b/config/autoload/url-shortener.local.php.dist
@@ -2,7 +2,7 @@

 declare(strict_types=1);

-$isSwoole = extension_loaded('swoole');
+$isSwoole = extension_loaded('openswoole');

 return [

--- a/config/config.php
+++ b/config/config.php
@@ -13,11 +13,17 @@ use Mezzio\Swoole;
 use function class_exists;
 use function Shlinkio\Shlink\Common\env;

+use const PHP_SAPI;
+
+$isCli = PHP_SAPI === 'cli';
+
 return (new ConfigAggregator\ConfigAggregator([
    Mezzio\ConfigProvider::class,
    Mezzio\Router\ConfigProvider::class,
    Mezzio\Router\FastRouteRouter\ConfigProvider::class,
-    class_exists(Swoole\ConfigProvider::class) ? Swoole\ConfigProvider::class : new ConfigAggregator\ArrayProvider([]),
+    $isCli && class_exists(Swoole\ConfigProvider::class)
+        ? Swoole\ConfigProvider::class
+        : new ConfigAggregator\ArrayProvider([]),
    ProblemDetails\ConfigProvider::class,
    Diactoros\ConfigProvider::class,
    Common\ConfigProvider::class,
--- a/config/constants.php
+++ b/config/constants.php
@@ -18,3 +18,5 @@ 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';
+const DEFAULT_QR_CODE_ROUND_BLOCK_SIZE = true;
+const MIN_TASK_WORKERS = 4;
--- a/config/test/bootstrap_api_tests.php
+++ b/config/test/bootstrap_api_tests.php
@@ -20,8 +20,7 @@ $config = $container->get('config');
 $em = $container->get(EntityManager::class);
 $httpClient = $container->get('shlink_test_api_client');

-// Start code coverage collecting on swoole process, and stop it when process shuts down
-$httpClient->request('GET', sprintf('http://%s:%s/api-tests/start-coverage', SWOOLE_TESTING_HOST, SWOOLE_TESTING_PORT));
+// Dump code coverage when process shuts down
 register_shutdown_function(function () use ($httpClient): void {
    $httpClient->request(
        'GET',
@@ -29,6 +28,6 @@ register_shutdown_function(function () use ($httpClient): void {
    );
 });

-$testHelper->createTestDb();
+$testHelper->createTestDb(['bin/cli', 'db:create'], ['bin/cli', 'db:migrate']);
 ApiTest\ApiTestCase::setApiClient($httpClient);
 ApiTest\ApiTestCase::setSeedFixturesCallback(fn () => $testHelper->seedFixtures($em, $config['data_fixtures'] ?? []));
--- a/config/test/test_config.global.php
+++ b/config/test/test_config.global.php
@@ -8,13 +8,16 @@ use GuzzleHttp\Client;
 use Laminas\ConfigAggregator\ConfigAggregator;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Laminas\ServiceManager\Factory\InvokableFactory;
-use Laminas\Stdlib\Glob;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use PHPUnit\Runner\Version;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Driver\Selector;
 use SebastianBergmann\CodeCoverage\Filter;
+use SebastianBergmann\CodeCoverage\Report\Html\Facade as Html;
 use SebastianBergmann\CodeCoverage\Report\PHP;
 use SebastianBergmann\CodeCoverage\Report\Xml\Facade as Xml;

@@ -27,18 +30,17 @@ use const ShlinkioTest\Shlink\SWOOLE_TESTING_HOST;
 use const ShlinkioTest\Shlink\SWOOLE_TESTING_PORT;

 $isApiTest = env('TEST_ENV') === 'api';
-if ($isApiTest) {
+$generateCoverage = env('GENERATE_COVERAGE') === 'yes';
+if ($isApiTest && $generateCoverage) {
    $filter = new Filter();
-    foreach (Glob::glob(__DIR__ . '/../../module/*/src') as $item) {
-        $filter->includeDirectory($item);
-    }
+    $filter->includeDirectory(__DIR__ . '/../../module/Core/src');
+    $filter->includeDirectory(__DIR__ . '/../../module/Rest/src');
    $coverage = new CodeCoverage((new Selector())->forLineCoverage($filter), $filter);
 }

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

    return match ($driver) {
@@ -53,7 +55,6 @@ $buildDbConnection = static function (): array {
            'user' => 'postgres',
            'password' => 'root',
            'dbname' => 'shlink_test',
-            'charset' => 'utf8',
        ],
        'mssql' => [
            'driver' => 'pdo_sqlsrv',
@@ -64,12 +65,11 @@ $buildDbConnection = static function (): array {
        ],
        default => [ // mysql and maria
            'driver' => 'pdo_mysql',
-            'host' => $isCi ? '127.0.0.1' : $getMysqlHost($driver),
+            'host' => $isCi ? '127.0.0.1' : sprintf('shlink_db_%s', $driver),
            'port' => $isCi ? $getCiMysqlPort($driver) : '3306',
            'user' => 'root',
            'password' => 'root',
            'dbname' => 'shlink_test',
-            'charset' => 'utf8',
        ],
    };
 };
@@ -113,26 +113,18 @@ return [
    ],

    'routes' => !$isApiTest ? [] : [
-        [
-            'name' => 'start_collecting_coverage',
-            'path' => '/api-tests/start-coverage',
-            'middleware' => middleware(static function () use (&$coverage) {
-                if ($coverage) { // @phpstan-ignore-line
-                    $coverage->start('API tests');
-                }
-                return new EmptyResponse();
-            }),
-            'allowed_methods' => ['GET'],
-        ],
        [
            'name' => 'dump_coverage',
            'path' => '/api-tests/stop-coverage',
            'middleware' => middleware(static function () use (&$coverage) {
+                // TODO I have tried moving this block to a listener so that it's invoked automatically,
+                //      but then the coverage is generated empty ¯\_(ツ)_/¯
                if ($coverage) { // @phpstan-ignore-line
                    $basePath = __DIR__ . '/../../build/coverage-api';
-                    $coverage->stop();
+
                    (new PHP())->process($coverage, $basePath . '.cov');
                    (new Xml(Version::getVersionString()))->process($coverage, $basePath . '/coverage-xml');
+                    (new Html())->process($coverage, $basePath . '/coverage-html');
                }

                return new EmptyResponse();
@@ -141,6 +133,24 @@ return [
        ],
    ],

+    'middleware_pipeline' => !$isApiTest ? [] : [
+        'capture_code_coverage' => [
+            'middleware' => middleware(static function (
+                ServerRequestInterface $req,
+                RequestHandlerInterface $handler,
+            ) use (&$coverage): ResponseInterface {
+                $coverage?->start($req->getHeaderLine('x-coverage-id'));
+
+                try {
+                    return $handler->handle($req);
+                } finally {
+                    $coverage?->stop();
+                }
+            }),
+            'priority' => 9999,
+        ],
+    ],
+
    'mercure' => [
        'public_hub_url' => null,
        'internal_hub_url' => null,
--- a/data/infra/php.Dockerfile
+++ b/data/infra/php.Dockerfile
@@ -1,8 +1,8 @@
-FROM php:8.0.9-fpm-alpine3.14
+FROM php:8.1.0-fpm-alpine3.15
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>

-ENV APCU_VERSION 5.1.20
-ENV PDO_SQLSRV_VERSION 5.9.0
+ENV APCU_VERSION 5.1.21
+ENV PDO_SQLSRV_VERSION 5.10.0beta2
 ENV MS_ODBC_SQL_VERSION 17.5.2.2

 RUN apk update
@@ -34,6 +34,9 @@ RUN docker-php-ext-install pdo_pgsql
 RUN apk add --no-cache gmp-dev
 RUN docker-php-ext-install gmp

+RUN docker-php-ext-install sockets
+RUN docker-php-ext-install bcmath
+
 # Install APCu extension
 ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz
 RUN mkdir -p /usr/src/php/ext/apcu \
--- a/data/infra/swoole.Dockerfile
+++ b/data/infra/swoole.Dockerfile
@@ -1,10 +1,10 @@
-FROM php:8.0.9-alpine3.14
+FROM php:8.1.0-alpine3.15
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>

-ENV APCU_VERSION 5.1.20
+ENV APCU_VERSION 5.1.21
 ENV INOTIFY_VERSION 3.0.0
-ENV SWOOLE_VERSION 4.7.1
-ENV PDO_SQLSRV_VERSION 5.9.0
+ENV OPENSWOOLE_VERSION 4.8.1
+ENV PDO_SQLSRV_VERSION 5.10.0beta2
 ENV MS_ODBC_SQL_VERSION 17.5.2.2

 RUN apk update
@@ -36,6 +36,9 @@ RUN docker-php-ext-install pdo_pgsql
 RUN apk add --no-cache gmp-dev
 RUN docker-php-ext-install gmp

+RUN docker-php-ext-install sockets
+RUN docker-php-ext-install bcmath
+
 # Install APCu extension
 ADD https://pecl.php.net/get/apcu-$APCU_VERSION.tgz /tmp/apcu.tar.gz
 RUN mkdir -p /usr/src/php/ext/apcu \
@@ -54,12 +57,12 @@ RUN mkdir -p /usr/src/php/ext/inotify \
  && docker-php-ext-install inotify \
  && rm /tmp/inotify.tar.gz

-# Install swoole, pcov and mssql driver
+# Install openswoole, pcov and mssql driver
 RUN wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
    apk add --allow-untrusted msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
    apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS unixodbc-dev && \
-    pecl install swoole-${SWOOLE_VERSION} pdo_sqlsrv-${PDO_SQLSRV_VERSION} pcov && \
-    docker-php-ext-enable swoole pdo_sqlsrv pcov && \
+    pecl install openswoole-${OPENSWOOLE_VERSION} pdo_sqlsrv-${PDO_SQLSRV_VERSION} pcov && \
+    docker-php-ext-enable openswoole pdo_sqlsrv pcov && \
    apk del .phpize-deps && \
    rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk

@@ -72,12 +75,12 @@ RUN chmod 777 /home
 VOLUME /home/shlink
 WORKDIR /home/shlink

-# Expose swoole port
+# Expose openswoole port
 EXPOSE 8080

 CMD \
    # Install dependencies if the vendor dir does not exist
    if [[ ! -d "./vendor" ]]; then /usr/local/bin/composer install ; fi && \
-    # When restarting the container, swoole might think it is already in execution
+    # When restarting the container, openswoole might think it is already in execution
    # This forces the app to be started every second until the exit code is 0
    until php ./vendor/bin/laminas mezzio:swoole:start; do sleep 1 ; done
--- a/data/migrations/Version20160819142757.php
+++ b/data/migrations/Version20160819142757.php
@@ -39,6 +39,11 @@ class Version20160819142757 extends AbstractMigration
     */
    public function down(Schema $schema): void
    {
-        $db = $this->connection->getDatabasePlatform()->getName();
+        $this->connection->getDatabasePlatform()->getName();
+    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
    }
 }
--- a/data/migrations/Version20160820191203.php
+++ b/data/migrations/Version20160820191203.php
@@ -73,4 +73,9 @@ class Version20160820191203 extends AbstractMigration
        $schema->dropTable('short_urls_in_tags');
        $schema->dropTable('tags');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20171021093246.php
+++ b/data/migrations/Version20171021093246.php
@@ -45,4 +45,9 @@ class Version20171021093246 extends AbstractMigration
        $shortUrls->dropColumn('valid_since');
        $shortUrls->dropColumn('valid_until');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20171022064541.php
+++ b/data/migrations/Version20171022064541.php
@@ -42,4 +42,9 @@ class Version20171022064541 extends AbstractMigration

        $shortUrls->dropColumn('max_visits');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20180801183328.php
+++ b/data/migrations/Version20180801183328.php
@@ -39,4 +39,9 @@ final class Version20180801183328 extends AbstractMigration
    {
        $schema->getTable('short_urls')->getColumn('short_code')->setLength($size);
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20180913205455.php
+++ b/data/migrations/Version20180913205455.php
@@ -66,4 +66,9 @@ final class Version20180913205455 extends AbstractMigration
    {
        // Nothing to rollback
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20180915110857.php
+++ b/data/migrations/Version20180915110857.php
@@ -47,4 +47,9 @@ final class Version20180915110857 extends AbstractMigration
    {
        // Nothing to run
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20181020060559.php
+++ b/data/migrations/Version20181020060559.php
@@ -65,4 +65,9 @@ final class Version20181020060559 extends AbstractMigration
    {
        // No down
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20181020065148.php
+++ b/data/migrations/Version20181020065148.php
@@ -38,4 +38,9 @@ final class Version20181020065148 extends AbstractMigration
    {
        // No down
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20181110175521.php
+++ b/data/migrations/Version20181110175521.php
@@ -34,4 +34,9 @@ final class Version20181110175521 extends AbstractMigration
    {
        return $schema->getTable('visits')->getColumn('user_agent');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20190824075137.php
+++ b/data/migrations/Version20190824075137.php
@@ -34,4 +34,9 @@ final class Version20190824075137 extends AbstractMigration
    {
        return $schema->getTable('visits')->getColumn('referer');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20190930165521.php
+++ b/data/migrations/Version20190930165521.php
@@ -52,4 +52,9 @@ final class Version20190930165521 extends AbstractMigration
        $schema->getTable('short_urls')->dropColumn('domain_id');
        $schema->dropTable('domains');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20191001201532.php
+++ b/data/migrations/Version20191001201532.php
@@ -46,4 +46,9 @@ final class Version20191001201532 extends AbstractMigration
        $shortUrls->dropIndex('unique_short_code_plus_domain');
        $shortUrls->addUniqueIndex(['short_code']);
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20191020074522.php
+++ b/data/migrations/Version20191020074522.php
@@ -34,4 +34,9 @@ final class Version20191020074522 extends AbstractMigration
    {
        return $schema->getTable('short_urls')->getColumn('original_url');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20200105165647.php
+++ b/data/migrations/Version20200105165647.php
@@ -93,4 +93,9 @@ final class Version20200105165647 extends AbstractMigration
            $visitLocations->dropColumn($colName);
        }
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20200106215144.php
+++ b/data/migrations/Version20200106215144.php
@@ -44,4 +44,9 @@ final class Version20200106215144 extends AbstractMigration
            ]);
        }
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20200110182849.php
+++ b/data/migrations/Version20200110182849.php
@@ -50,4 +50,9 @@ final class Version20200110182849 extends AbstractMigration
    {
        // No need (and no way) to undo this migration
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20200323190014.php
+++ b/data/migrations/Version20200323190014.php
@@ -42,4 +42,9 @@ final class Version20200323190014 extends AbstractMigration

        $visitLocations->dropColumn('is_empty');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20200503170404.php
+++ b/data/migrations/Version20200503170404.php
@@ -24,4 +24,9 @@ final class Version20200503170404 extends AbstractMigration
        $this->skipIf(! $visits->hasIndex(self::INDEX_NAME));
        $visits->dropIndex(self::INDEX_NAME);
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20201023090929.php
+++ b/data/migrations/Version20201023090929.php
@@ -41,4 +41,9 @@ final class Version20201023090929 extends AbstractMigration
        $shortUrls->dropColumn('import_original_short_code');
        $shortUrls->dropIndex('unique_imports');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20201102113208.php
+++ b/data/migrations/Version20201102113208.php
@@ -83,4 +83,9 @@ final class Version20201102113208 extends AbstractMigration
        $shortUrls->removeForeignKey('FK_' . self::API_KEY_COLUMN);
        $shortUrls->dropColumn(self::API_KEY_COLUMN);
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20210102174433.php
+++ b/data/migrations/Version20210102174433.php
@@ -49,4 +49,9 @@ final class Version20210102174433 extends AbstractMigration
        $schema->getTable(self::TABLE_NAME)->dropIndex('UQ_role_plus_api_key');
        $schema->dropTable(self::TABLE_NAME);
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20210118153932.php
+++ b/data/migrations/Version20210118153932.php
@@ -23,4 +23,9 @@ final class Version20210118153932 extends AbstractMigration
    public function down(Schema $schema): void
    {
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20210202181026.php
+++ b/data/migrations/Version20210202181026.php
@@ -33,4 +33,9 @@ final class Version20210202181026 extends AbstractMigration
        $shortUrls->dropColumn(self::TITLE);
        $shortUrls->dropColumn('title_was_auto_resolved');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20210207100807.php
+++ b/data/migrations/Version20210207100807.php
@@ -40,4 +40,9 @@ final class Version20210207100807 extends AbstractMigration
        $visits->dropColumn('visited_url');
        $visits->dropColumn('type');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20210306165711.php
+++ b/data/migrations/Version20210306165711.php
@@ -34,4 +34,9 @@ final class Version20210306165711 extends AbstractMigration

        $apiKeys->dropColumn(self::COLUMN);
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20210522051601.php
+++ b/data/migrations/Version20210522051601.php
@@ -23,4 +23,9 @@ final class Version20210522051601 extends AbstractMigration
        $this->skipIf(! $shortUrls->hasColumn('crawlable'));
        $shortUrls->dropColumn('crawlable');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20210522124633.php
+++ b/data/migrations/Version20210522124633.php
@@ -25,4 +25,9 @@ final class Version20210522124633 extends AbstractMigration
        $this->skipIf(! $visits->hasColumn(self::POTENTIAL_BOT_COLUMN));
        $visits->dropColumn(self::POTENTIAL_BOT_COLUMN);
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20210720143824.php
+++ b/data/migrations/Version20210720143824.php
@@ -38,4 +38,9 @@ final class Version20210720143824 extends AbstractMigration
        $domainsTable->dropColumn('regular_not_found_redirect');
        $domainsTable->dropColumn('invalid_short_url_redirect');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations/Version20211002072605.php
+++ b/data/migrations/Version20211002072605.php
@@ -23,4 +23,9 @@ final class Version20211002072605 extends AbstractMigration
        $this->skipIf(! $shortUrls->hasColumn('forward_query'));
        $shortUrls->dropColumn('forward_query');
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/data/migrations_template.txt
+++ b/data/migrations_template.txt
@@ -18,4 +18,9 @@ final class <className> extends AbstractMigration
    {
 <down>
    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -1,7 +1,7 @@
 version: '3'

 services:
-    shlink_db:
+    shlink_db_mysql:
        environment:
            MYSQL_DATABASE: shlink_test

--- a/docker-compose.override.yml.dist
+++ b/docker-compose.override.yml.dist
@@ -13,7 +13,7 @@ services:
            - /etc/passwd:/etc/passwd:ro
            - /etc/group:/etc/group:ro

-    shlink_db:
+    shlink_db_mysql:
        user: 1000:1000
        volumes:
            - /etc/passwd:/etc/passwd:ro
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,15 +22,18 @@ services:
            - ./:/home/shlink/www
            - ./data/infra/php.ini:/usr/local/etc/php/php.ini
        links:
-            - shlink_db
+            - shlink_db_mysql
            - shlink_db_postgres
            - shlink_db_maria
            - shlink_db_ms
            - shlink_redis
            - shlink_mercure
            - shlink_mercure_proxy
+            - shlink_rabbitmq
        environment:
            LC_ALL: C
+        extra_hosts:
+            - 'host.docker.internal:host-gateway'

    shlink_swoole_proxy:
        container_name: shlink_swoole_proxy
@@ -55,18 +58,21 @@ services:
            - ./:/home/shlink
            - ./data/infra/php.ini:/usr/local/etc/php/php.ini
        links:
-            - shlink_db
+            - shlink_db_mysql
            - shlink_db_postgres
            - shlink_db_maria
            - shlink_db_ms
            - shlink_redis
            - shlink_mercure
            - shlink_mercure_proxy
+            - shlink_rabbitmq
        environment:
            LC_ALL: C
+        extra_hosts:
+            - 'host.docker.internal:host-gateway'

-    shlink_db:
-        container_name: shlink_db
+    shlink_db_mysql:
+        container_name: shlink_db_mysql
        image: mysql:5.7
        ports:
            - "3307:3306"
@@ -131,10 +137,21 @@ services:

    shlink_mercure:
        container_name: shlink_mercure
-        image: dunglas/mercure:v0.10
+        image: dunglas/mercure:v0.13
        ports:
            - "3080:80"
        environment:
-            CORS_ALLOWED_ORIGINS: "*"
-            JWT_KEY: "mercure_jwt_key"
-            USE_FORWARDED_HEADERS: "1"
+            SERVER_NAME: ":80"
+            MERCURE_PUBLISHER_JWT_KEY: mercure_jwt_key
+            MERCURE_SUBSCRIBER_JWT_KEY: mercure_jwt_key
+            MERCURE_EXTRA_DIRECTIVES: "cors_origins https://app.shlink.io http://localhost:3000 http://127.0.0.1:3000"
+
+    shlink_rabbitmq:
+        container_name: shlink_rabbitmq
+        image: rabbitmq:3.9-management-alpine
+        ports:
+            - "15672:15672"
+            - "5672:5672"
+        environment:
+            RABBITMQ_DEFAULT_USER: "rabbit"
+            RABBITMQ_DEFAULT_PASS: "rabbit"
--- a/docker/README.md
+++ b/docker/README.md
@@ -5,14 +5,14 @@

 This image provides an easy way to set up [shlink](https://shlink.io) on a container-based runtime.

-It exposes a shlink instance served with [swoole](https://www.swoole.co.uk/), which can be linked to external databases to persist data.
+It exposes a shlink instance served with [openswoole](https://www.swoole.co.uk/), which can be linked to external databases to persist data.

 ## Usage

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

 * `DEFAULT_DOMAIN`: The default short domain used for this shlink instance. For example **doma.in**.
-* `USE_HTTPS`: Either **true** or **false**.
+* `IS_HTTPS_ENABLED`: Either **true** or **false**. Tells if Shlink is being served with HTTPs or not.
 * `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:
@@ -22,7 +22,7 @@ docker run \
    --name shlink \
    -p 8080:8080 \
    -e DEFAULT_DOMAIN=doma.in \
-    -e USE_HTTPS=true \
+    -e IS_HTTPS_ENABLED=true \
    -e GEOLITE_LICENSE_KEY=kjh23ljkbndskj345 \
    shlinkio/shlink:stable
 ```
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,24 +1,27 @@
 #!/usr/bin/env sh
 set -e

+# If SHELL_VERBOSITY was not explicitly provided, run commands in quite mode (-q)
+[ $SHELL_VERBOSITY ] && flags="" || flags="-q"
+
 cd /etc/shlink

 echo "Creating fresh database if needed..."
-php bin/cli db:create -n -q
+php bin/cli db:create -n ${flags}

 echo "Updating database..."
-php bin/cli db:migrate -n -q
+php bin/cli db:migrate -n ${flags}

 echo "Generating proxies..."
-php vendor/doctrine/orm/bin/doctrine.php orm:generate-proxies -n -q
+php vendor/doctrine/orm/bin/doctrine.php orm:generate-proxies -n ${flags}

 echo "Clearing entities cache..."
-php vendor/doctrine/orm/bin/doctrine.php orm:clear-cache:metadata -n -q
+php vendor/doctrine/orm/bin/doctrine.php orm:clear-cache:metadata -n ${flags}

 # Try to download GeoLite2 db file only if the license key env var was defined
 if [ ! -z "${GEOLITE_LICENSE_KEY}" ]; then
  echo "Downloading GeoLite2 db file..."
-  php bin/cli visit:download-db -n -q
+  php bin/cli visit:download-db -n ${flags}
 fi

 # Periodicaly run visit:locate every hour
@@ -30,6 +33,6 @@ if [ $ENABLE_PERIODIC_VISIT_LOCATE ]; then
  /usr/sbin/crond &
 fi

-# When restarting the container, swoole might think it is already in execution
+# When restarting the container, openswoole might think it is already in execution
 # This forces the app to be started every second until the exit code is 0
 until php vendor/bin/laminas mezzio:swoole:start; do sleep 1 ; done
--- a/docs/async-api/async-api.json
+++ b/docs/async-api/async-api.json
@@ -11,7 +11,7 @@
    },
    "defaultContentType": "application/json",
    "channels": {
-        "http://shlink.io/new-visit": {
+        "https://shlink.io/new-visit": {
            "subscribe": {
                "summary": "Receive information about any new visit occurring on any short URL.",
                "operationId": "newVisit",
@@ -31,7 +31,7 @@
                }
            }
        },
-        "http://shlink.io/new-visit/{shortCode}": {
+        "https://shlink.io/new-visit/{shortCode}": {
            "parameters": {
                "shortCode": {
                    "description": "The short code of the short URL",
@@ -59,7 +59,7 @@
                }
            }
        },
-        "http://shlink.io/new-orphan-visit": {
+        "https://shlink.io/new-orphan-visit": {
            "subscribe": {
                "summary": "Receive information about any new orphan visit.",
                "operationId": "newOrphanVisit",
--- a/docs/swagger/examples/short-url-invalid-args.json
+++ b/docs/swagger/examples/short-url-invalid-args.json
@@ -0,0 +1,9 @@
+{
+    "value": {
+        "title": "Invalid data",
+        "type": "INVALID_ARGUMENT",
+        "detail": "Provided data is not valid",
+        "status": 400,
+        "invalidElements": ["maxVisits", "validSince"]
+    }
+}
--- a/docs/swagger/examples/short-url-not-found.json
+++ b/docs/swagger/examples/short-url-not-found.json
@@ -0,0 +1,9 @@
+{
+    "value": {
+        "detail":"No URL found with short code \"abc123\"",
+        "title":"Short URL not found",
+        "type": "INVALID_SHORTCODE",
+        "status": 404,
+        "shortCode": "abc123"
+    }
+}
--- a/docs/swagger/examples/tag-not-found.json
+++ b/docs/swagger/examples/tag-not-found.json
@@ -0,0 +1,9 @@
+{
+    "value": {
+        "detail": "Tag with name \"foo\" could not be found",
+        "title": "Tag not found",
+        "type": "TAG_NOT_FOUND",
+        "status": 404,
+        "tag":  "foo"
+    }
+}
--- a/docs/swagger/paths/health.json
+++ b/docs/swagger/paths/health.json
@@ -13,16 +13,14 @@
                    "application/json": {
                        "schema": {
                            "$ref": "../definitions/Health.json"
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "status": "pass",
-                        "version": "1.16.0",
-                        "links": {
-                            "about": "https://shlink.io",
-                            "project": "https://github.com/shlinkio/shlink"
+                        },
+                        "example": {
+                            "status": "pass",
+                            "version": "2.10.0",
+                            "links": {
+                                "about": "https://shlink.io",
+                                "project": "https://github.com/shlinkio/shlink"
+                            }
                        }
                    }
                }
@@ -33,21 +31,19 @@
                    "application/json": {
                        "schema": {
                            "$ref": "../definitions/Health.json"
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "status": "fail",
-                        "version": "1.16.0",
-                        "links": {
-                            "about": "https://shlink.io",
-                            "project": "https://github.com/shlinkio/shlink"
+                        },
+                        "example": {
+                            "status": "fail",
+                            "version": "2.10.0",
+                            "links": {
+                                "about": "https://shlink.io",
+                                "project": "https://github.com/shlinkio/shlink"
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/json": {
--- a/docs/swagger/paths/v1_short-urls.json
+++ b/docs/swagger/paths/v1_short-urls.json
@@ -117,79 +117,77 @@
                                    }
                                }
                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "shortUrls": {
-                            "data": [
-                                {
-                                    "shortCode": "12C18",
-                                    "shortUrl": "https://doma.in/12C18",
-                                    "longUrl": "https://store.steampowered.com",
-                                    "dateCreated": "2016-08-21T20:34:16+02:00",
-                                    "visitsCount": 328,
-                                    "tags": [
-                                        "games",
-                                        "tech"
-                                    ],
-                                    "meta": {
-                                        "validSince": "2017-01-21T00:00:00+02:00",
-                                        "validUntil": null,
-                                        "maxVisits": 100
+                        },
+                        "example": {
+                            "shortUrls": {
+                                "data": [
+                                    {
+                                        "shortCode": "12C18",
+                                        "shortUrl": "https://doma.in/12C18",
+                                        "longUrl": "https://store.steampowered.com",
+                                        "dateCreated": "2016-08-21T20:34:16+02:00",
+                                        "visitsCount": 328,
+                                        "tags": [
+                                            "games",
+                                            "tech"
+                                        ],
+                                        "meta": {
+                                            "validSince": "2017-01-21T00:00:00+02:00",
+                                            "validUntil": null,
+                                            "maxVisits": 100
+                                        },
+                                        "domain": null,
+                                        "title": "Welcome to Steam",
+                                        "crawlable": false
                                    },
-                                    "domain": null,
-                                    "title": "Welcome to Steam",
-                                    "crawlable": false
-                                },
-                                {
-                                    "shortCode": "12Kb3",
-                                    "shortUrl": "https://doma.in/12Kb3",
-                                    "longUrl": "https://shlink.io",
-                                    "dateCreated": "2016-05-01T20:34:16+02:00",
-                                    "visitsCount": 1029,
-                                    "tags": [
-                                        "shlink"
-                                    ],
-                                    "meta": {
-                                        "validSince": null,
-                                        "validUntil": null,
-                                        "maxVisits": null
+                                    {
+                                        "shortCode": "12Kb3",
+                                        "shortUrl": "https://doma.in/12Kb3",
+                                        "longUrl": "https://shlink.io",
+                                        "dateCreated": "2016-05-01T20:34:16+02:00",
+                                        "visitsCount": 1029,
+                                        "tags": [
+                                            "shlink"
+                                        ],
+                                        "meta": {
+                                            "validSince": null,
+                                            "validUntil": null,
+                                            "maxVisits": null
+                                        },
+                                        "domain":  null,
+                                        "title": null,
+                                        "crawlable": false
                                    },
-                                    "domain":  null,
-                                    "title": null,
-                                    "crawlable": false
-                                },
-                                {
-                                    "shortCode": "123bA",
-                                    "shortUrl": "https://example.com/123bA",
-                                    "longUrl": "https://www.google.com",
-                                    "dateCreated": "2015-10-01T20:34:16+02:00",
-                                    "visitsCount": 25,
-                                    "tags": [],
-                                    "meta": {
-                                        "validSince": "2017-01-21T00:00:00+02:00",
-                                        "validUntil": null,
-                                        "maxVisits": null
-                                    },
-                                    "domain":  "example.com",
-                                    "title": null,
-                                    "crawlable": false
+                                    {
+                                        "shortCode": "123bA",
+                                        "shortUrl": "https://example.com/123bA",
+                                        "longUrl": "https://www.google.com",
+                                        "dateCreated": "2015-10-01T20:34:16+02:00",
+                                        "visitsCount": 25,
+                                        "tags": [],
+                                        "meta": {
+                                            "validSince": "2017-01-21T00:00:00+02:00",
+                                            "validUntil": null,
+                                            "maxVisits": null
+                                        },
+                                        "domain":  "example.com",
+                                        "title": null,
+                                        "crawlable": false
+                                    }
+                                ],
+                                "pagination": {
+                                    "currentPage": 5,
+                                    "pagesCount": 12,
+                                    "itemsPerPage": 10,
+                                    "itemsInCurrentPage": 10,
+                                    "totalItems": 115
                                }
-                            ],
-                            "pagination": {
-                                "currentPage": 5,
-                                "pagesCount": 12,
-                                "itemsPerPage": 10,
-                                "itemsInCurrentPage": 10,
-                                "totalItems": 115
                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
@@ -267,28 +265,26 @@
                    "application/json": {
                        "schema": {
                            "$ref": "../definitions/ShortUrl.json"
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "shortCode": "12C18",
-                        "shortUrl": "https://doma.in/12C18",
-                        "longUrl": "https://store.steampowered.com",
-                        "dateCreated": "2016-08-21T20:34:16+02:00",
-                        "visitsCount": 0,
-                        "tags": [
-                            "games",
-                            "tech"
-                        ],
-                        "meta": {
-                            "validSince": "2017-01-21T00:00:00+02:00",
-                            "validUntil": null,
-                            "maxVisits": 500
                        },
-                        "domain": null,
-                        "title": null,
-                        "crawlable": false
+                        "example": {
+                            "shortCode": "12C18",
+                            "shortUrl": "https://doma.in/12C18",
+                            "longUrl": "https://store.steampowered.com",
+                            "dateCreated": "2016-08-21T20:34:16+02:00",
+                            "visitsCount": 0,
+                            "tags": [
+                                "games",
+                                "tech"
+                            ],
+                            "meta": {
+                                "validSince": "2017-01-21T00:00:00+02:00",
+                                "validUntil": null,
+                                "maxVisits": 500
+                            },
+                            "domain": null,
+                            "title": null,
+                            "crawlable": false
+                        }
                    }
                }
            },
@@ -326,15 +322,42 @@
                                        "customSlug": {
                                            "type": "string",
                                            "description": "Provided custom slug when the error type is INVALID_SLUG"
+                                        },
+                                        "domain": {
+                                            "type": "string",
+                                            "description": "The domain for which you were trying to create the new short URL"
                                        }
                                    }
                                }
                            ]
+                        },
+                        "examples": {
+                            "Invalid arguments": {
+                                "$ref": "../examples/short-url-invalid-args.json"
+                            },
+                            "Invalid long URL": {
+                                "value": {
+                                    "title": "Invalid URL",
+                                    "type": "INVALID_URL",
+                                    "detail": "Provided URL foo is invalid. Try with a different one.",
+                                    "status": 400,
+                                    "url": "https://invalid-url.com"
+                                }
+                            },
+                            "Non-unique slug": {
+                                "value": {
+                                    "title": "Invalid custom slug",
+                                    "type": "INVALID_SLUG",
+                                    "detail": "Provided slug \"my-slug\" is already in use.",
+                                    "status": 400,
+                                    "customSlug": "my-slug"
+                                }
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/v1_short-urls_shorten.json
+++ b/docs/swagger/paths/v1_short-urls_shorten.json
@@ -49,35 +49,33 @@
                    "application/json": {
                        "schema": {
                            "$ref": "../definitions/ShortUrl.json"
+                        },
+                        "example": {
+                            "longUrl": "https://github.com/shlinkio/shlink",
+                            "shortUrl": "https://doma.in/abc123",
+                            "shortCode": "abc123",
+                            "dateCreated": "2016-08-21T20:34:16+02:00",
+                            "visitsCount": 0,
+                            "tags": [
+                                "games",
+                                "tech"
+                            ],
+                            "meta": {
+                                "validSince": "2017-01-21T00:00:00+02:00",
+                                "validUntil": null,
+                                "maxVisits": 100
+                            },
+                            "domain": null,
+                            "title": null,
+                            "crawlable": false
                        }
                    },
                    "text/plain": {
                        "schema": {
                            "type": "string"
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "longUrl": "https://github.com/shlinkio/shlink",
-                        "shortUrl": "https://doma.in/abc123",
-                        "shortCode": "abc123",
-                        "dateCreated": "2016-08-21T20:34:16+02:00",
-                        "visitsCount": 0,
-                        "tags": [
-                            "games",
-                            "tech"
-                        ],
-                        "meta": {
-                            "validSince": "2017-01-21T00:00:00+02:00",
-                            "validUntil": null,
-                            "maxVisits": 100
                        },
-                        "domain": null,
-                        "title": null,
-                        "crawlable": false
-                    },
-                    "text/plain": "https://doma.in/abc123"
+                        "example": "https://doma.in/abc123"
+                    }
                }
            },
            "400": {
@@ -86,26 +84,24 @@
                    "application/problem+json": {
                        "schema": {
                            "$ref": "../definitions/Error.json"
+                        },
+                        "example": {
+                            "title": "Invalid URL",
+                            "type": "INVALID_URL",
+                            "detail": "Provided URL foo is invalid. Try with a different one.",
+                            "status": 400,
+                            "url": "https://invalid-url.com"
                        }
                    },
                    "text/plain": {
                        "schema": {
                            "type": "string"
-                        }
+                        },
+                        "example": "INVALID_URL"
                    }
-                },
-                "examples": {
-                    "application/problem+json": {
-                        "title": "Invalid URL",
-                        "type": "INVALID_URL",
-                        "detail": "Provided URL foo is invalid. Try with a different one.",
-                        "status": 400,
-                        "url": "https://invalid-url.com"
-                    },
-                    "text/plain": "INVALID_URL"
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
@@ -118,13 +114,6 @@
                            "type": "string"
                        }
                    }
-                },
-                "examples": {
-                    "application/problem+json": {
-                        "error": "INTERNAL_SERVER_ERROR",
-                        "message": "Unexpected error occurred"
-                    },
-                    "text/plain": "INTERNAL_SERVER_ERROR"
                }
            }
        }
--- a/docs/swagger/paths/v1_short-urls_{shortCode}.json
+++ b/docs/swagger/paths/v1_short-urls_{shortCode}.json
@@ -35,27 +35,25 @@
                    "application/json": {
                        "schema": {
                            "$ref": "../definitions/ShortUrl.json"
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "shortCode": "12Kb3",
-                        "shortUrl": "https://doma.in/12Kb3",
-                        "longUrl": "https://shlink.io",
-                        "dateCreated": "2016-05-01T20:34:16+02:00",
-                        "visitsCount": 1029,
-                        "tags": [
-                            "shlink"
-                        ],
-                        "meta": {
-                            "validSince": "2017-01-21T00:00:00+02:00",
-                            "validUntil": null,
-                            "maxVisits": 100
                        },
-                        "domain": null,
-                        "title": null,
-                        "crawlable": false
+                        "example": {
+                            "shortCode": "12Kb3",
+                            "shortUrl": "https://doma.in/12Kb3",
+                            "longUrl": "https://shlink.io",
+                            "dateCreated": "2016-05-01T20:34:16+02:00",
+                            "visitsCount": 1029,
+                            "tags": [
+                                "shlink"
+                            ],
+                            "meta": {
+                                "validSince": "2017-01-21T00:00:00+02:00",
+                                "validUntil": null,
+                                "maxVisits": 100
+                            },
+                            "domain": null,
+                            "title": null,
+                            "crawlable": false
+                        }
                    }
                }
            },
@@ -64,12 +62,35 @@
                "content": {
                    "application/problem+json": {
                        "schema": {
-                            "$ref": "../definitions/Error.json"
+                            "allOf": [
+                                {
+                                    "$ref": "../definitions/Error.json"
+                                },
+                                {
+                                    "type": "object",
+                                    "required": ["shortCode"],
+                                    "properties": {
+                                        "shortCode": {
+                                            "type": "string",
+                                            "description": "The short code with which we tried to find the short URL"
+                                        },
+                                        "domain": {
+                                            "type": "string",
+                                            "description": "The domain with which we tried to find the short URL"
+                                        }
+                                    }
+                                }
+                            ]
+                        },
+                        "examples": {
+                            "Not found": {
+                                "$ref": "../examples/short-url-not-found.json"
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
@@ -129,27 +150,25 @@
                    "application/json": {
                        "schema": {
                            "$ref": "../definitions/ShortUrl.json"
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "shortCode": "12Kb3",
-                        "shortUrl": "https://doma.in/12Kb3",
-                        "longUrl": "https://shlink.io",
-                        "dateCreated": "2016-05-01T20:34:16+02:00",
-                        "visitsCount": 1029,
-                        "tags": [
-                            "shlink"
-                        ],
-                        "meta": {
-                            "validSince": "2017-01-21T00:00:00+02:00",
-                            "validUntil": null,
-                            "maxVisits": 100
                        },
-                        "domain": null,
-                        "title": "Shlink - The URL shortener",
-                        "crawlable": false
+                        "example": {
+                            "shortCode": "12Kb3",
+                            "shortUrl": "https://doma.in/12Kb3",
+                            "longUrl": "https://shlink.io",
+                            "dateCreated": "2016-05-01T20:34:16+02:00",
+                            "visitsCount": 1029,
+                            "tags": [
+                                "shlink"
+                            ],
+                            "meta": {
+                                "validSince": "2017-01-21T00:00:00+02:00",
+                                "validUntil": null,
+                                "maxVisits": 100
+                            },
+                            "domain": null,
+                            "title": "Shlink - The URL shortener",
+                            "crawlable": false
+                        }
                    }
                }
            },
@@ -182,21 +201,49 @@
                                    }
                                }
                            ]
+                        },
+                        "examples": {
+                            "Invalid arguments": {
+                                "$ref": "../examples/short-url-invalid-args.json"
+                            }
                        }
                    }
                }
            },
            "404": {
-                "description": "No short URL was found for provided short code.",
+                "description": "No URL was found for provided short code.",
                "content": {
                    "application/problem+json": {
                        "schema": {
-                            "$ref": "../definitions/Error.json"
+                            "allOf": [
+                                {
+                                    "$ref": "../definitions/Error.json"
+                                },
+                                {
+                                    "type": "object",
+                                    "required": ["shortCode"],
+                                    "properties": {
+                                        "shortCode": {
+                                            "type": "string",
+                                            "description": "The short code with which we tried to find the short URL"
+                                        },
+                                        "domain": {
+                                            "type": "string",
+                                            "description": "The domain with which we tried to find the short URL"
+                                        }
+                                    }
+                                }
+                            ]
+                        },
+                        "examples": {
+                            "Not found": {
+                                "$ref": "../examples/short-url-not-found.json"
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
@@ -247,30 +294,75 @@
                "content": {
                    "application/problem+json": {
                        "schema": {
-                            "$ref": "../definitions/Error.json"
+                            "allOf": [
+                                {
+                                    "$ref": "../definitions/Error.json"
+                                },
+                                {
+                                    "type": "object",
+                                    "required": ["shortCode", "threshold"],
+                                    "properties": {
+                                        "shortCode": {
+                                            "type": "string",
+                                            "description": "The short code with which we tried to find the short URL to delete"
+                                        },
+                                        "domain": {
+                                            "type": "string",
+                                            "description": "The domain with which we tried to find the short URL to delete"
+                                        },
+                                        "threshold": {
+                                            "type": "number",
+                                            "description": "The amount of visits currently configured as threshold to allow deleting short UYRLs or not"
+                                        }
+                                    }
+                                }
+                            ]
+                        },
+                        "example": {
+                            "title": "Cannot delete short URL",
+                            "type": "INVALID_SHORTCODE_DELETION",
+                            "detail": "Impossible to delete short URL with short code \"abc123\", since it has more than \"15\" visits.",
+                            "status": 422,
+                            "shortCode": "abc123",
+                            "threshold": 15
                        }
                    }
-                },
-                "examples": {
-                    "application/problem+json": {
-                        "title": "Cannot delete short URL",
-                        "type": "INVALID_SHORTCODE_DELETION",
-                        "detail": "It is not possible to delete URL with short code \"abc123\" because it has reached more than \"15\" visits.",
-                        "status": 422
-                    }
                }
            },
            "404": {
-                "description": "No short URL was found for provided short code.",
+                "description": "No URL was found for provided short code.",
                "content": {
                    "application/problem+json": {
                        "schema": {
-                            "$ref": "../definitions/Error.json"
+                            "allOf": [
+                                {
+                                    "$ref": "../definitions/Error.json"
+                                },
+                                {
+                                    "type": "object",
+                                    "required": ["shortCode"],
+                                    "properties": {
+                                        "shortCode": {
+                                            "type": "string",
+                                            "description": "The short code with which we tried to find the short URL"
+                                        },
+                                        "domain": {
+                                            "type": "string",
+                                            "description": "The domain with which we tried to find the short URL"
+                                        }
+                                    }
+                                }
+                            ]
+                        },
+                        "examples": {
+                            "Not found": {
+                                "$ref": "../examples/short-url-not-found.json"
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/v1_short-urls_{shortCode}_tags.json
+++ b/docs/swagger/paths/v1_short-urls_{shortCode}_tags.json
@@ -69,14 +69,6 @@
                            }
                        }
                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "tags": [
-                            "games",
-                            "tech"
-                        ]
-                    }
                }
            },
            "400": {
@@ -99,7 +91,7 @@
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/json": {
--- a/docs/swagger/paths/v1_short-urls_{shortCode}_visits.json
+++ b/docs/swagger/paths/v1_short-urls_{shortCode}_visits.json
@@ -97,49 +97,47 @@
                                    }
                                }
                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "visits": {
-                            "data": [
-                                {
-                                    "referer": "https://twitter.com",
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0",
-                                    "visitLocation": null,
-                                    "potentialBot": false
-                                },
-                                {
-                                    "referer": "https://t.co",
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
-                                    "visitLocation": {
-                                        "cityName": "Cupertino",
-                                        "countryCode": "US",
-                                        "countryName": "United States",
-                                        "latitude": 37.3042,
-                                        "longitude": -122.0946,
-                                        "regionName": "California",
-                                        "timezone": "America/Los_Angeles"
+                        },
+                        "example": {
+                            "visits": {
+                                "data": [
+                                    {
+                                        "referer": "https://twitter.com",
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0",
+                                        "visitLocation": null,
+                                        "potentialBot": false
                                    },
-                                    "potentialBot": false
-                                },
-                                {
-                                    "referer": null,
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "userAgent": "some_web_crawler/1.4",
-                                    "visitLocation": null,
-                                    "potentialBot": true
+                                    {
+                                        "referer": "https://t.co",
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
+                                        "visitLocation": {
+                                            "cityName": "Cupertino",
+                                            "countryCode": "US",
+                                            "countryName": "United States",
+                                            "latitude": 37.3042,
+                                            "longitude": -122.0946,
+                                            "regionName": "California",
+                                            "timezone": "America/Los_Angeles"
+                                        },
+                                        "potentialBot": false
+                                    },
+                                    {
+                                        "referer": null,
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "some_web_crawler/1.4",
+                                        "visitLocation": null,
+                                        "potentialBot": true
+                                    }
+                                ],
+                                "pagination": {
+                                    "currentPage": 5,
+                                    "pagesCount": 12,
+                                    "itemsPerPage": 10,
+                                    "itemsInCurrentPage": 10,
+                                    "totalItems": 115
                                }
-                            ],
-                            "pagination": {
-                                "currentPage": 5,
-                                "pagesCount": 12,
-                                "itemsPerPage": 10,
-                                "itemsInCurrentPage": 10,
-                                "totalItems": 115
                            }
                        }
                    }
@@ -151,11 +149,16 @@
                    "application/problem+json": {
                        "schema": {
                            "$ref": "../definitions/Error.json"
+                        },
+                        "examples": {
+                            "Short URL not found": {
+                                "$ref": "../examples/short-url-not-found.json"
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/v1_tags.json
+++ b/docs/swagger/paths/v1_tags.json
@@ -57,23 +57,47 @@
                                    }
                                }
                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "tags": {
-                            "data": [
-                                "games",
-                                "php",
-                                "shlink",
-                                "tech"
-                            ]
+                        },
+                        "examples": {
+                            "Without stats": {
+                                "value": {
+                                    "tags": {
+                                        "data": [
+                                            "games",
+                                            "php",
+                                            "shlink",
+                                            "tech"
+                                        ]
+                                    }
+                                }
+                            },
+                            "With stats": {
+                                "value": {
+                                    "tags": {
+                                        "data": [
+                                            "games",
+                                            "shlink"
+                                        ],
+                                        "stats": [
+                                            {
+                                                "tag": "games",
+                                                "shortUrlsCount": 10,
+                                                "visitsCount": 521
+                                            },
+                                            {
+                                                "tag": "shlink",
+                                                "shortUrlsCount": 7,
+                                                "visitsCount": 1087
+                                            }
+                                        ]
+                                    }
+                                }
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
@@ -149,21 +173,9 @@
                            }
                        }
                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "tags": {
-                            "data": [
-                                "games",
-                                "php",
-                                "shlink",
-                                "tech"
-                            ]
-                        }
-                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
@@ -228,6 +240,13 @@
                    "application/problem+json": {
                        "schema": {
                            "$ref": "../definitions/Error.json"
+                        },
+                        "example": {
+                            "title": "Invalid data",
+                            "type": "INVALID_ARGUMENT",
+                            "detail": "Provided data is not valid",
+                            "status": 400,
+                            "invalidElements": ["oldName", "newName"]
                        }
                    }
                }
@@ -238,6 +257,12 @@
                    "application/problem+json": {
                        "schema": {
                            "$ref": "../definitions/Error.json"
+                        },
+                        "example": {
+                            "detail": "You are not allowed to rename tags",
+                            "title": "Forbidden tag operation",
+                            "type": "FORBIDDEN_OPERATION",
+                            "status": 403
                        }
                    }
                }
@@ -248,6 +273,11 @@
                    "application/problem+json": {
                        "schema": {
                            "$ref": "../definitions/Error.json"
+                        },
+                        "examples": {
+                            "Tag not found": {
+                                "$ref": "../examples/tag-not-found.json"
+                            }
                        }
                    }
                }
@@ -258,11 +288,19 @@
                    "application/problem+json": {
                        "schema": {
                            "$ref": "../definitions/Error.json"
+                        },
+                        "example": {
+                            "detail": "You cannot rename tag foo, because it already exists",
+                            "title": "Tag conflict",
+                            "type": "TAG_CONFLICT",
+                            "status": 409,
+                            "oldName": "bar",
+                            "newName": "foo"
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
@@ -314,11 +352,17 @@
                    "application/problem+json": {
                        "schema": {
                            "$ref": "../definitions/Error.json"
+                        },
+                        "example": {
+                            "detail": "You are not allowed to delete tags",
+                            "title": "Forbidden tag operation",
+                            "type": "FORBIDDEN_OPERATION",
+                            "status": 403
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/v2_domains.json
+++ b/docs/swagger/paths/v2_domains.json
@@ -4,8 +4,8 @@
        "tags": [
            "Domains"
        ],
-        "summary": "List existing domains",
-        "description": "Returns the list of all domains ever used, with a flag that tells if they are the default domain",
+        "summary": "List configured domains",
+        "description": "Returns the list of all domains that have been either used for some short URL, or have explicitly configured redirects.<br/>It also includes the domain redirects, plus the default redirects that will be used for any non-explicitly-configured one.",
        "security": [
            {
                "ApiKey": []
@@ -46,50 +46,56 @@
                                                    }
                                                }
                                            }
+                                        },
+                                        "defaultRedirects": {
+                                            "$ref": "../definitions/NotFoundRedirects.json"
                                        }
                                    }
                                }
                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "domains": {
-                            "data": [
-                                {
-                                    "domain": "example.com",
-                                    "isDefault": true,
-                                    "redirects": {
-                                        "baseUrlRedirect": "https://example.com/my-landing-page",
-                                        "regular404Redirect": null,
-                                        "invalidShortUrlRedirect": "https://example.com/invalid-url"
-                                    }
-                                },
-                                {
-                                    "domain": "aaa.com",
-                                    "isDefault": false,
-                                    "redirects":  {
-                                        "baseUrlRedirect": null,
-                                        "regular404Redirect": null,
-                                        "invalidShortUrlRedirect": null
-                                    }
-                                },
-                                {
-                                    "domain": "bbb.com",
-                                    "isDefault": false,
-                                    "redirects":  {
-                                        "baseUrlRedirect": null,
-                                        "regular404Redirect": null,
-                                        "invalidShortUrlRedirect": "https://example.com/invalid-url"
+                        },
+                        "example": {
+                            "domains": {
+                                "data": [
+                                    {
+                                        "domain": "example.com",
+                                        "isDefault": true,
+                                        "redirects": {
+                                            "baseUrlRedirect": "https://example.com/my-landing-page",
+                                            "regular404Redirect": null,
+                                            "invalidShortUrlRedirect": "https://example.com/invalid-url"
+                                        }
+                                    },
+                                    {
+                                        "domain": "aaa.com",
+                                        "isDefault": false,
+                                        "redirects":  {
+                                            "baseUrlRedirect": null,
+                                            "regular404Redirect": null,
+                                            "invalidShortUrlRedirect": null
+                                        }
+                                    },
+                                    {
+                                        "domain": "bbb.com",
+                                        "isDefault": false,
+                                        "redirects":  {
+                                            "baseUrlRedirect": null,
+                                            "regular404Redirect": null,
+                                            "invalidShortUrlRedirect": "https://example.com/invalid-url"
+                                        }
                                    }
+                                ],
+                                "defaultRedirects": {
+                                    "baseUrlRedirect": "https://somewhere.com",
+                                    "regular404Redirect": null,
+                                    "invalidShortUrlRedirect": null
                                }
-                            ]
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/v2_domains_redirects.json
+++ b/docs/swagger/paths/v2_domains_redirects.json
@@ -55,15 +55,13 @@
                                    "$ref": "../definitions/NotFoundRedirects.json"
                                }
                            ]
+                        },
+                        "example": {
+                            "baseUrlRedirect": "https://example.com/my-landing-page",
+                            "regular404Redirect": null,
+                            "invalidShortUrlRedirect": "https://example.com/invalid-url"
                        }
                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "baseUrlRedirect": "https://example.com/my-landing-page",
-                        "regular404Redirect": null,
-                        "invalidShortUrlRedirect": "https://example.com/invalid-url"
-                    }
                }
            },
            "400": {
@@ -95,21 +93,18 @@
                                    }
                                }
                            ]
+                        },
+                        "example": {
+                            "title": "Invalid data",
+                            "type": "INVALID_ARGUMENT",
+                            "detail": "Provided data is not valid",
+                            "status": 400,
+                            "invalidElements": ["domain", "invalidShortUrlRedirect"]
                        }
                    }
                }
            },
-            "403": {
-                "description": "Default domain was provided, and it cannot be edited this way.",
-                "content": {
-                    "application/problem+json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
-            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/v2_mercure-info.json
+++ b/docs/swagger/paths/v2_mercure-info.json
@@ -23,15 +23,13 @@
                    "application/json": {
                        "schema": {
                            "$ref": "../definitions/MercureInfo.json"
+                        },
+                        "example": {
+                            "mercureHubUrl": "https://example.com/.well-known/mercure",
+                            "jwt": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJTaGxpbmsiLCJpYXQiOjE1ODY2ODY3MzIsImV4cCI6MTU4Njk0NTkzMiwibWVyY3VyZSI6eyJzdWJzY3JpYmUiOltdfX0.P-519lgU7dFz0bbNlRG1CXyqugGbaHon4kw6fu4QBdQ",
+                            "jwtExpiration":  "2020-04-15T12:18:52+02:00"
                        }
                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "mercureHubUrl": "https://example.com/.well-known/mercure",
-                        "jwt": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJTaGxpbmsiLCJpYXQiOjE1ODY2ODY3MzIsImV4cCI6MTU4Njk0NTkzMiwibWVyY3VyZSI6eyJzdWJzY3JpYmUiOltdfX0.P-519lgU7dFz0bbNlRG1CXyqugGbaHon4kw6fu4QBdQ",
-                        "jwtExpiration":  "2020-04-15T12:18:52+02:00"
-                    }
                }
            },
            "501": {
@@ -40,19 +38,17 @@
                    "application/problem+json": {
                        "schema": {
                            "$ref": "../definitions/Error.json"
+                        },
+                        "example": {
+                            "title": "Mercure integration not configured",
+                            "type": "MERCURE_NOT_CONFIGURED",
+                            "detail": "This Shlink instance is not integrated with a mercure hub.",
+                            "status": 501
                        }
                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "title": "Mercure integration not configured",
-                        "type": "MERCURE_NOT_CONFIGURED",
-                        "detail": "This Shlink instance is not integrated with a mercure hub.",
-                        "status": 501
-                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/v2_tags_{tag}_visits.json
+++ b/docs/swagger/paths/v2_tags_{tag}_visits.json
@@ -94,49 +94,47 @@
                                    }
                                }
                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "visits": {
-                            "data": [
-                                {
-                                    "referer": "https://twitter.com",
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0",
-                                    "visitLocation": null,
-                                    "potentialBot": false
-                                },
-                                {
-                                    "referer": "https://t.co",
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
-                                    "visitLocation": {
-                                        "cityName": "Cupertino",
-                                        "countryCode": "US",
-                                        "countryName": "United States",
-                                        "latitude": 37.3042,
-                                        "longitude": -122.0946,
-                                        "regionName": "California",
-                                        "timezone": "America/Los_Angeles"
+                        },
+                        "example": {
+                            "visits": {
+                                "data": [
+                                    {
+                                        "referer": "https://twitter.com",
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0",
+                                        "visitLocation": null,
+                                        "potentialBot": false
                                    },
-                                    "potentialBot": false
-                                },
-                                {
-                                    "referer": null,
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "userAgent": "some_web_crawler/1.4",
-                                    "visitLocation": null,
-                                    "potentialBot": true
+                                    {
+                                        "referer": "https://t.co",
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
+                                        "visitLocation": {
+                                            "cityName": "Cupertino",
+                                            "countryCode": "US",
+                                            "countryName": "United States",
+                                            "latitude": 37.3042,
+                                            "longitude": -122.0946,
+                                            "regionName": "California",
+                                            "timezone": "America/Los_Angeles"
+                                        },
+                                        "potentialBot": false
+                                    },
+                                    {
+                                        "referer": null,
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "some_web_crawler/1.4",
+                                        "visitLocation": null,
+                                        "potentialBot": true
+                                    }
+                                ],
+                                "pagination": {
+                                    "currentPage": 5,
+                                    "pagesCount": 12,
+                                    "itemsPerPage": 10,
+                                    "itemsInCurrentPage": 10,
+                                    "totalItems": 115
                                }
-                            ],
-                            "pagination": {
-                                "currentPage": 5,
-                                "pagesCount": 12,
-                                "itemsPerPage": 10,
-                                "itemsInCurrentPage": 10,
-                                "totalItems": 115
                            }
                        }
                    }
@@ -148,11 +146,16 @@
                    "application/problem+json": {
                        "schema": {
                            "$ref": "../definitions/Error.json"
+                        },
+                        "examples": {
+                            "Tag not found": {
+                                "$ref": "../examples/tag-not-found.json"
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/v2_visits.json
+++ b/docs/swagger/paths/v2_visits.json
@@ -28,19 +28,17 @@
                                    "$ref": "../definitions/VisitStats.json"
                                }
                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "visits": {
-                            "visitsCount": 1569874,
-                            "orphanVisitsCount": 71345
+                        },
+                        "example": {
+                            "visits": {
+                                "visitsCount": 1569874,
+                                "orphanVisitsCount": 71345
+                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/v2_visits_orphan.json
+++ b/docs/swagger/paths/v2_visits_orphan.json
@@ -85,61 +85,59 @@
                                    }
                                }
                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "visits": {
-                            "data": [
-                                {
-                                    "referer": "https://twitter.com",
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0",
-                                    "visitLocation": null,
-                                    "potentialBot": false,
-                                    "visitedUrl": "https://doma.in",
-                                    "type": "base_url"
-                                },
-                                {
-                                    "referer": "https://t.co",
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
-                                    "visitLocation": {
-                                        "cityName": "Cupertino",
-                                        "countryCode": "US",
-                                        "countryName": "United States",
-                                        "latitude": 37.3042,
-                                        "longitude": -122.0946,
-                                        "regionName": "California",
-                                        "timezone": "America/Los_Angeles"
+                        },
+                        "example": {
+                            "visits": {
+                                "data": [
+                                    {
+                                        "referer": "https://twitter.com",
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0",
+                                        "visitLocation": null,
+                                        "potentialBot": false,
+                                        "visitedUrl": "https://doma.in",
+                                        "type": "base_url"
                                    },
-                                    "potentialBot": false,
-                                    "visitedUrl": "https://doma.in/foo",
-                                    "type": "invalid_short_url"
-                                },
-                                {
-                                    "referer": null,
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "userAgent": "some_web_crawler/1.4",
-                                    "visitLocation": null,
-                                    "potentialBot": true,
-                                    "visitedUrl": "https://doma.in/foo/bar/baz",
-                                    "type": "regular_404"
+                                    {
+                                        "referer": "https://t.co",
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
+                                        "visitLocation": {
+                                            "cityName": "Cupertino",
+                                            "countryCode": "US",
+                                            "countryName": "United States",
+                                            "latitude": 37.3042,
+                                            "longitude": -122.0946,
+                                            "regionName": "California",
+                                            "timezone": "America/Los_Angeles"
+                                        },
+                                        "potentialBot": false,
+                                        "visitedUrl": "https://doma.in/foo",
+                                        "type": "invalid_short_url"
+                                    },
+                                    {
+                                        "referer": null,
+                                        "date": "2015-08-20T05:05:03+04:00",
+                                        "userAgent": "some_web_crawler/1.4",
+                                        "visitLocation": null,
+                                        "potentialBot": true,
+                                        "visitedUrl": "https://doma.in/foo/bar/baz",
+                                        "type": "regular_404"
+                                    }
+                                ],
+                                "pagination": {
+                                    "currentPage": 5,
+                                    "pagesCount": 12,
+                                    "itemsPerPage": 10,
+                                    "itemsInCurrentPage": 10,
+                                    "totalItems": 115
                                }
-                            ],
-                            "pagination": {
-                                "currentPage": 5,
-                                "pagesCount": 12,
-                                "itemsPerPage": 10,
-                                "itemsInCurrentPage": 10,
-                                "totalItems": 115
                            }
                        }
                    }
                }
            },
-            "500": {
+            "default": {
                "description": "Unexpected error.",
                "content": {
                    "application/problem+json": {
--- a/docs/swagger/paths/{shortCode}_qr-code.json
+++ b/docs/swagger/paths/{shortCode}_qr-code.json
@@ -60,6 +60,17 @@
                    "enum": ["L", "M", "Q", "H"],
                    "default": "L"
                }
+            },
+            {
+                "name": "roundBlockSize",
+                "in": "query",
+                "description": "Allows to disable block size rounding, which might reduce the readability of the QR code, but ensures no extra margin is added.",
+                "required": false,
+                "schema": {
+                    "type": "string",
+                    "enum": ["true", "false"],
+                    "default": "false"
+                }
            }
        ],
        "responses": {
--- a/docs/swagger/paths/{shortCode}_qr-code_{size}.json
+++ b/docs/swagger/paths/{shortCode}_qr-code_{size}.json
@@ -21,7 +21,7 @@
                "name": "size",
                "in": "path",
                "description": "The size of the image to be returned.",
-                "required": false,
+                "required": true,
                "schema": {
                    "type": "integer",
                    "minimum": 50,
--- a/infection-api.json
+++ b/infection-api.json
@@ -0,0 +1,23 @@
+{
+    "source": {
+        "directories": [
+            "module/*/src"
+        ]
+    },
+    "timeout": 5,
+    "logs": {
+        "text": "build/infection-api/infection-log.txt",
+        "summary": "build/infection-api/summary-log.txt",
+        "debug": "build/infection-api/debug-log.txt"
+    },
+    "tmpDir": "build/infection-api/temp",
+    "phpUnit": {
+        "configDir": "."
+    },
+    "testFrameworkOptions": "--configuration=phpunit-api.xml",
+    "mutators": {
+        "@default": true,
+        "IdenticalEqual": false,
+        "NotIdenticalNotEqual": false
+    }
+}
--- a/infection.json
+++ b/infection.json
@@ -8,7 +8,10 @@
    "logs": {
        "text": "build/infection-unit/infection-log.txt",
        "summary": "build/infection-unit/summary-log.txt",
-        "debug": "build/infection-unit/debug-log.txt"
+        "debug": "build/infection-unit/debug-log.txt",
+        "badge": {
+            "branch": "develop"
+        }
    },
    "tmpDir": "build/infection-unit/temp",
    "phpUnit": {
--- a/module/CLI/config/cli.config.php
+++ b/module/CLI/config/cli.config.php
@@ -8,7 +8,7 @@ return [

    'cli' => [
        'commands' => [
-            Command\ShortUrl\GenerateShortUrlCommand::NAME => Command\ShortUrl\GenerateShortUrlCommand::class,
+            Command\ShortUrl\CreateShortUrlCommand::NAME => Command\ShortUrl\CreateShortUrlCommand::class,
            Command\ShortUrl\ResolveUrlCommand::NAME => Command\ShortUrl\ResolveUrlCommand::class,
            Command\ShortUrl\ListShortUrlsCommand::NAME => Command\ShortUrl\ListShortUrlsCommand::class,
            Command\ShortUrl\GetVisitsCommand::NAME => Command\ShortUrl\GetVisitsCommand::class,
--- a/module/CLI/config/dependencies.config.php
+++ b/module/CLI/config/dependencies.config.php
@@ -39,7 +39,7 @@ return [

            ApiKey\RoleResolver::class => ConfigAbstractFactory::class,

-            Command\ShortUrl\GenerateShortUrlCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\CreateShortUrlCommand::class => ConfigAbstractFactory::class,
            Command\ShortUrl\ResolveUrlCommand::class => ConfigAbstractFactory::class,
            Command\ShortUrl\ListShortUrlsCommand::class => ConfigAbstractFactory::class,
            Command\ShortUrl\GetVisitsCommand::class => ConfigAbstractFactory::class,
@@ -75,10 +75,11 @@ return [
        Util\ProcessRunner::class => [SymfonyCli\Helper\ProcessHelper::class],
        ApiKey\RoleResolver::class => [DomainService::class],

-        Command\ShortUrl\GenerateShortUrlCommand::class => [
+        Command\ShortUrl\CreateShortUrlCommand::class => [
            Service\UrlShortener::class,
            ShortUrlStringifier::class,
            'config.url_shortener.default_short_codes_length',
+            'config.url_shortener.domain.hostname',
        ],
        Command\ShortUrl\ResolveUrlCommand::class => [Service\ShortUrl\ShortUrlResolver::class],
        Command\ShortUrl\ListShortUrlsCommand::class => [
--- a/module/CLI/src/Command/Db/CreateDatabaseCommand.php
+++ b/module/CLI/src/Command/Db/CreateDatabaseCommand.php
@@ -67,11 +67,11 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand

        // In order to create the new database, we have to use a connection where the dbname was not set.
        // Otherwise, it will fail to connect and will not be able to create the new database
-        $schemaManager = $this->noDbNameConn->getSchemaManager();
+        $schemaManager = $this->noDbNameConn->createSchemaManager();
        $databases = $schemaManager->listDatabases();
        $shlinkDatabase = $this->regularConn->getDatabase();

-        if (! contains($databases, $shlinkDatabase)) {
+        if ($shlinkDatabase !== null && ! contains($databases, $shlinkDatabase)) {
            $schemaManager->createDatabase($shlinkDatabase);
        }
    }
@@ -80,7 +80,7 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
    {
        // If at least one of the shlink tables exist, we will consider the database exists somehow.
        // Any inconsistency should be taken care by the migrations
-        $schemaManager = $this->regularConn->getSchemaManager();
+        $schemaManager = $this->regularConn->createSchemaManager();
        return ! empty($schemaManager->listTableNames());
    }
 }
--- a/module/CLI/src/Command/ShortUrl/GenerateShortUrlCommand.php
+++ b/module/CLI/src/Command/ShortUrl/GenerateShortUrlCommand.php
@@ -26,14 +26,17 @@ use function method_exists;
 use function sprintf;
 use function str_contains;

-class GenerateShortUrlCommand extends BaseCommand
+class CreateShortUrlCommand extends BaseCommand
 {
-    public const NAME = 'short-url:generate';
+    public const NAME = 'short-url:create';
+
+    private ?SymfonyStyle $io;

    public function __construct(
        private UrlShortenerInterface $urlShortener,
        private ShortUrlStringifierInterface $stringifier,
        private int $defaultShortCodeLength,
+        private string $defaultDomain,
    ) {
        parent::__construct();
    }
@@ -42,6 +45,7 @@ class GenerateShortUrlCommand extends BaseCommand
    {
        $this
            ->setName(self::NAME)
+            ->setAliases(['short-url:generate']) // Deprecated
            ->setDescription('Generates a short URL for provided long URL and returns it')
            ->addArgument('longUrl', InputArgument::REQUIRED, 'The long URL to parse')
            ->addOption(
@@ -122,21 +126,33 @@ class GenerateShortUrlCommand extends BaseCommand

    protected function interact(InputInterface $input, OutputInterface $output): void
    {
-        $io = new SymfonyStyle($input, $output);
+        $this->verifyLongUrlArgument($input, $output);
+        $this->verifyDomainArgument($input);
+    }
+
+    private function verifyLongUrlArgument(InputInterface $input, OutputInterface $output): void
+    {
        $longUrl = $input->getArgument('longUrl');
        if (! empty($longUrl)) {
            return;
        }

+        $io = $this->getIO($input, $output);
        $longUrl = $io->ask('Which URL do you want to shorten?');
        if (! empty($longUrl)) {
            $input->setArgument('longUrl', $longUrl);
        }
    }

+    private function verifyDomainArgument(InputInterface $input): void
+    {
+        $domain = $input->getOption('domain');
+        $input->setOption('domain', $domain === $this->defaultDomain ? null : $domain);
+    }
+
    protected function execute(InputInterface $input, OutputInterface $output): ?int
    {
-        $io = new SymfonyStyle($input, $output);
+        $io = $this->getIO($input, $output);
        $longUrl = $input->getArgument('longUrl');
        if (empty($longUrl)) {
            $io->error('A URL was not provided!');
@@ -196,4 +212,9 @@ class GenerateShortUrlCommand extends BaseCommand

        return null;
    }
+
+    private function getIO(InputInterface $input, OutputInterface $output): SymfonyStyle
+    {
+        return $this->io ?? ($this->io = new SymfonyStyle($input, $output));
+    }
 }
--- a/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php
+++ b/module/CLI/src/Command/ShortUrl/ListShortUrlsCommand.php
@@ -131,7 +131,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
        ];

        if ($all) {
-            $data[ShortUrlsParamsInputFilter::ITEMS_PER_PAGE] = -1;
+            $data[ShortUrlsParamsInputFilter::ITEMS_PER_PAGE] = Paginator::ALL_ITEMS;
        }

        do {
--- a/module/CLI/src/Command/Tag/ListTagsCommand.php
+++ b/module/CLI/src/Command/Tag/ListTagsCommand.php
@@ -45,7 +45,8 @@ class ListTagsCommand extends Command

        return map(
            $tags,
-            fn (TagInfo $tagInfo) => [(string) $tagInfo->tag(), $tagInfo->shortUrlsCount(), $tagInfo->visitsCount()],
+            static fn (TagInfo $tagInfo) =>
+                [$tagInfo->tag()->__toString(), $tagInfo->shortUrlsCount(), $tagInfo->visitsCount()],
        );
    }
 }
--- a/module/CLI/src/Util/ProcessRunner.php
+++ b/module/CLI/src/Util/ProcessRunner.php
@@ -34,7 +34,7 @@ class ProcessRunner implements ProcessRunnerInterface
        }

        /** @var DebugFormatterHelper $formatter */
-        $formatter = $this->helper->getHelperSet()->get('debug_formatter');
+        $formatter = $this->helper->getHelperSet()?->get('debug_formatter') ?? new DebugFormatterHelper();
        /** @var Process $process */
        $process = ($this->createProcess)($cmd);

--- a/module/CLI/test/Command/Api/ListKeysCommandTest.php
+++ b/module/CLI/test/Command/Api/ListKeysCommandTest.php
@@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace ShlinkioTest\Shlink\CLI\Command\Api;

+use Cake\Chronos\Chronos;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Api\ListKeysCommand;
@@ -45,19 +46,25 @@ class ListKeysCommandTest extends TestCase

    public function provideKeysAndOutputs(): iterable
    {
+        $dateInThePast = Chronos::createFromFormat('Y-m-d H:i:s', '2020-01-01 00:00:00');
+
        yield 'all keys' => [
-            [$apiKey1 = ApiKey::create(), $apiKey2 = ApiKey::create(), $apiKey3 = ApiKey::create()],
+            [
+                $apiKey1 = ApiKey::create()->disable(),
+                $apiKey2 = ApiKey::fromMeta(ApiKeyMeta::withExpirationDate($dateInThePast)),
+                $apiKey3 = ApiKey::create(),
+            ],
            false,
            <<<OUTPUT
-            +--------------------------------------+------+------------+-----------------+-------+
-            | Key                                  | Name | Is enabled | Expiration date | Roles |
-            +--------------------------------------+------+------------+-----------------+-------+
-            | {$apiKey1} | -    | +++        | -               | Admin |
-            +--------------------------------------+------+------------+-----------------+-------+
-            | {$apiKey2} | -    | +++        | -               | Admin |
-            +--------------------------------------+------+------------+-----------------+-------+
-            | {$apiKey3} | -    | +++        | -               | Admin |
-            +--------------------------------------+------+------------+-----------------+-------+
+            +--------------------------------------+------+------------+---------------------------+-------+
+            | Key                                  | Name | Is enabled | Expiration date           | Roles |
+            +--------------------------------------+------+------------+---------------------------+-------+
+            | {$apiKey1} | -    | ---        | -                         | Admin |
+            +--------------------------------------+------+------------+---------------------------+-------+
+            | {$apiKey2} | -    | ---        | 2020-01-01T00:00:00+00:00 | Admin |
+            +--------------------------------------+------+------------+---------------------------+-------+
+            | {$apiKey3} | -    | +++        | -                         | Admin |
+            +--------------------------------------+------+------------+---------------------------+-------+

            OUTPUT,
        ];
--- a/module/CLI/test/Command/Db/CreateDatabaseCommandTest.php
+++ b/module/CLI/test/Command/Db/CreateDatabaseCommandTest.php
@@ -46,10 +46,10 @@ class CreateDatabaseCommandTest extends TestCase
        $this->databasePlatform = $this->prophesize(AbstractPlatform::class);

        $this->regularConn = $this->prophesize(Connection::class);
-        $this->regularConn->getSchemaManager()->willReturn($this->schemaManager->reveal());
+        $this->regularConn->createSchemaManager()->willReturn($this->schemaManager->reveal());
        $this->regularConn->getDatabasePlatform()->willReturn($this->databasePlatform->reveal());
        $noDbNameConn = $this->prophesize(Connection::class);
-        $noDbNameConn->getSchemaManager()->willReturn($this->schemaManager->reveal());
+        $noDbNameConn->createSchemaManager()->willReturn($this->schemaManager->reveal());

        $command = new CreateDatabaseCommand(
            $locker->reveal(),
--- a/module/CLI/test/Command/Domain/DomainRedirectsCommandTest.php
+++ b/module/CLI/test/Command/Domain/DomainRedirectsCommandTest.php
@@ -126,8 +126,8 @@ class DomainRedirectsCommandTest extends TestCase

        $listDomains = $this->domainService->listDomains()->willReturn([
            DomainItem::forDefaultDomain('default-domain.com', new NotFoundRedirectOptions()),
-            DomainItem::forExistingDomain(Domain::withAuthority('existing-one.com')),
-            DomainItem::forExistingDomain(Domain::withAuthority($domainAuthority)),
+            DomainItem::forNonDefaultDomain(Domain::withAuthority('existing-one.com')),
+            DomainItem::forNonDefaultDomain(Domain::withAuthority($domainAuthority)),
        ]);
        $findDomain = $this->domainService->findByAuthority($domainAuthority)->willReturn($domain);
        $configureRedirects = $this->domainService->configureNotFoundRedirects(
@@ -156,8 +156,8 @@ class DomainRedirectsCommandTest extends TestCase

        $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')),
+            DomainItem::forNonDefaultDomain(Domain::withAuthority('existing-one.com')),
+            DomainItem::forNonDefaultDomain(Domain::withAuthority('existing-two.com')),
        ]);
        $findDomain = $this->domainService->findByAuthority($domainAuthority)->willReturn($domain);
        $configureRedirects = $this->domainService->configureNotFoundRedirects(
--- a/module/CLI/test/Command/Domain/ListDomainsCommandTest.php
+++ b/module/CLI/test/Command/Domain/ListDomainsCommandTest.php
@@ -47,8 +47,8 @@ class ListDomainsCommandTest extends TestCase
                'base_url' => 'https://foo.com/default/base',
                'invalid_short_url' => 'https://foo.com/default/invalid',
            ])),
-            DomainItem::forExistingDomain(Domain::withAuthority('bar.com')),
-            DomainItem::forExistingDomain($bazDomain),
+            DomainItem::forNonDefaultDomain(Domain::withAuthority('bar.com')),
+            DomainItem::forNonDefaultDomain($bazDomain),
        ]);

        $this->commandTester->execute($input);
--- a/module/CLI/test/Command/ShortUrl/GenerateShortUrlCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/GenerateShortUrlCommandTest.php
@@ -8,7 +8,7 @@ use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\ShortUrl\GenerateShortUrlCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\CreateShortUrlCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
@@ -19,10 +19,12 @@ use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
 use ShlinkioTest\Shlink\CLI\CliTestUtilsTrait;
 use Symfony\Component\Console\Tester\CommandTester;

-class GenerateShortUrlCommandTest extends TestCase
+class CreateShortUrlCommandTest extends TestCase
 {
    use CliTestUtilsTrait;

+    private const DEFAULT_DOMAIN = 'default.com';
+
    private CommandTester $commandTester;
    private ObjectProphecy $urlShortener;
    private ObjectProphecy $stringifier;
@@ -33,7 +35,12 @@ class GenerateShortUrlCommandTest extends TestCase
        $this->stringifier = $this->prophesize(ShortUrlStringifierInterface::class);
        $this->stringifier->stringify(Argument::type(ShortUrl::class))->willReturn('');

-        $command = new GenerateShortUrlCommand($this->urlShortener->reveal(), $this->stringifier->reveal(), 5);
+        $command = new CreateShortUrlCommand(
+            $this->urlShortener->reveal(),
+            $this->stringifier->reveal(),
+            5,
+            self::DEFAULT_DOMAIN,
+        );
        $this->commandTester = $this->testerForCommand($command);
    }

@@ -110,6 +117,34 @@ class GenerateShortUrlCommandTest extends TestCase
        $stringify->shouldHaveBeenCalledOnce();
    }

+    /**
+     * @test
+     * @dataProvider provideDomains
+     */
+    public function properlyProcessesProvidedDomain(array $input, ?string $expectedDomain): void
+    {
+        $shorten = $this->urlShortener->shorten(
+            Argument::that(function (ShortUrlMeta $meta) use ($expectedDomain) {
+                Assert::assertEquals($expectedDomain, $meta->getDomain());
+                return true;
+            }),
+        )->willReturn(ShortUrl::createEmpty());
+
+        $input['longUrl'] = 'http://domain.com/foo/bar';
+        $this->commandTester->execute($input);
+
+        self::assertEquals(ExitCodes::EXIT_SUCCESS, $this->commandTester->getStatusCode());
+        $shorten->shouldHaveBeenCalledOnce();
+    }
+
+    public function provideDomains(): iterable
+    {
+        yield 'no domain' => [[], null];
+        yield 'non-default domain foo' => [['--domain' => 'foo.com'], 'foo.com'];
+        yield 'non-default domain bar' => [['-d' => 'bar.com'], 'bar.com'];
+        yield 'default domain' => [['--domain' => self::DEFAULT_DOMAIN], null];
+    }
+
    /**
     * @test
     * @dataProvider provideFlags
--- a/module/CLI/test/Command/ShortUrl/DeleteShortUrlCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/DeleteShortUrlCommandTest.php
@@ -83,7 +83,10 @@ class DeleteShortUrlCommandTest extends TestCase
                $ignoreThreshold = array_pop($args);

                if (!$ignoreThreshold) {
-                    throw Exception\DeleteShortUrlException::fromVisitsThreshold(10, $shortCode);
+                    throw Exception\DeleteShortUrlException::fromVisitsThreshold(
+                        10,
+                        ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
+                    );
                }
            },
        );
@@ -93,7 +96,7 @@ class DeleteShortUrlCommandTest extends TestCase
        $output = $this->commandTester->getDisplay();

        self::assertStringContainsString(sprintf(
-            'Impossible to delete short URL with short code "%s" since it has more than "10" visits.',
+            'Impossible to delete short URL with short code "%s", since it has more than "10" visits.',
            $shortCode,
        ), $output);
        self::assertStringContainsString($expectedMessage, $output);
@@ -112,7 +115,10 @@ class DeleteShortUrlCommandTest extends TestCase
    {
        $shortCode = 'abc123';
        $deleteByShortCode = $this->service->deleteByShortCode(new ShortUrlIdentifier($shortCode), false)->willThrow(
-            Exception\DeleteShortUrlException::fromVisitsThreshold(10, $shortCode),
+            Exception\DeleteShortUrlException::fromVisitsThreshold(
+                10,
+                ShortUrlIdentifier::fromShortCodeAndDomain($shortCode),
+            ),
        );
        $this->commandTester->setInputs(['no']);

@@ -120,7 +126,7 @@ class DeleteShortUrlCommandTest extends TestCase
        $output = $this->commandTester->getDisplay();

        self::assertStringContainsString(sprintf(
-            'Impossible to delete short URL with short code "%s" since it has more than "10" visits.',
+            'Impossible to delete short URL with short code "%s", since it has more than "10" visits.',
            $shortCode,
        ), $output);
        self::assertStringContainsString('Short URL was not deleted.', $output);
--- a/module/CLI/test/Command/ShortUrl/ListShortUrlsCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/ListShortUrlsCommandTest.php
@@ -271,7 +271,7 @@ class ListShortUrlsCommandTest extends TestCase
            'startDate' => null,
            'endDate' => null,
            'orderBy' => null,
-            'itemsPerPage' => -1,
+            'itemsPerPage' => Paginator::ALL_ITEMS,
        ]))->willReturn(new Paginator(new ArrayAdapter([])));

        $this->commandTester->execute(['--all' => true]);
--- a/module/CLI/test/Command/Tag/ListTagsCommandTest.php
+++ b/module/CLI/test/Command/Tag/ListTagsCommandTest.php
@@ -49,12 +49,18 @@ class ListTagsCommandTest extends TestCase
        $this->commandTester->execute([]);
        $output = $this->commandTester->getDisplay();

-        self::assertStringContainsString('| foo', $output);
-        self::assertStringContainsString('| bar', $output);
-        self::assertStringContainsString('| 10 ', $output);
-        self::assertStringContainsString('| 2 ', $output);
-        self::assertStringContainsString('| 7 ', $output);
-        self::assertStringContainsString('| 32 ', $output);
+        self::assertEquals(
+            <<<OUTPUT
+            +------+-------------+---------------+
+            | Name | URLs amount | Visits amount |
+            +------+-------------+---------------+
+            | foo  | 10          | 2             |
+            | bar  | 7           | 32            |
+            +------+-------------+---------------+
+            
+            OUTPUT,
+            $output,
+        );
        $tagsInfo->shouldHaveBeenCalled();
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alejandro Celaya	356b33ced0	Merge pull request #1350 from acelaya-forks/feature/fix-memory-leak Updated to shlink-common 4.4, which no longer uses doctrine/cache	2022-01-23 18:14:00 +01:00
Alejandro Celaya	77088d55f9	Updated to shlink-common 4.4, which no longer uses doctrine/cache	2022-01-23 17:54:49 +01:00
Alejandro Celaya	470c62d993	Merge pull request #1313 from acelaya-forks/feature/redis-memory-usage Added a default lifetime for cache entries when using redis	2022-01-07 21:50:31 +01:00
Alejandro Celaya	364734094b	Added a default lifetime for cache entries when using redis	2022-01-07 21:37:24 +01:00
Alejandro Celaya	dc648b0142	Merge pull request #1311 from acelaya-forks/feature/ip-in-logs Ensured remote IP address is not logged when using swoole/openswoole	2022-01-07 14:44:19 +01:00
Alejandro Celaya	1d14140986	Ensured remote IP address is not logged when using swoole/openswoole	2022-01-07 14:30:06 +01:00
Alejandro Celaya	2b693dc492	Merge pull request #1310 from acelaya-forks/feature/title-max-length Feature/title max length	2022-01-07 14:24:58 +01:00
Alejandro Celaya	38bea6c086	Added edge case tests for SHortUrlMetaTest on title field	2022-01-07 14:07:07 +01:00
Alejandro Celaya	cbdc5f121e	Updated changelog	2022-01-07 14:04:21 +01:00
Alejandro Celaya	562763199a	Ensured URL titles are trimmed to avoid error when persisted in database	2022-01-07 13:13:45 +01:00
Alejandro Celaya	30207ce0c2	Merge pull request #1287 from acelaya-forks/bugfix/db-error Bugfix/db error	2021-12-21 14:43:13 +01:00
Alejandro Celaya	0f37f1cb23	Updated changelog	2021-12-21 14:25:21 +01:00
Alejandro Celaya	99a905cdee	Updated to latest shlink-common with support to close EM on middleware	2021-12-21 14:22:11 +01:00
Alejandro Celaya	6eac079440	Ensured EM is closed and not cleared after running an async task	2021-12-21 14:10:06 +01:00
Alejandro Celaya	4a1e7b8d5a	Changed condition to pipe RequestIdMiddleware, so that it applies to non-rest requests too	2021-12-19 10:23:55 +01:00
Alejandro Celaya	351e36b273	Added missing 8.1 to clean-artifacts job in publish-release pipeline	2021-12-12 17:45:56 +01:00
Alejandro Celaya	ca06040efc	Fixed publish-release and publish-swagger-spec pipelines	2021-12-12 17:38:50 +01:00
Alejandro Celaya	2102cc4e9a	Merge pull request #1270 from shlinkio/develop Release 2.10.0	2021-12-12 17:27:21 +01:00
Alejandro Celaya	14d3493db8	Merge pull request #1269 from acelaya-forks/feature/replace-ip-lib Feature/replace ip lib	2021-12-12 17:21:08 +01:00
Alejandro Celaya	d082d208e1	Tagged specific versions for shlink packages	2021-12-12 17:08:26 +01:00
Alejandro Celaya	959efd17c8	Updated changelog	2021-12-12 13:31:08 +01:00
Alejandro Celaya	30a7c55e84	Migrated to a new lib to match IP addresses with ranges	2021-12-12 13:30:18 +01:00
Alejandro Celaya	2aec759857	Merge pull request #1267 from acelaya-forks/feature/rabbitmq Feature/rabbitmq	2021-12-12 11:43:43 +01:00
Alejandro Celaya	54dcaaac0c	Updated to an installer version with support for RabbitMQ	2021-12-12 11:24:58 +01:00
Alejandro Celaya	8e5730f374	Renamed Rabbit instances to use RabbitMq	2021-12-12 10:32:57 +01:00
Alejandro Celaya	cb1705b6e8	Created NotifyVisitToRabbitTest	2021-12-11 22:18:46 +01:00
Alejandro Celaya	0bcefda60d	Added sockets and bcmath extensions to docker image	2021-12-11 21:44:56 +01:00
Alejandro Celaya	966620f840	Created event listener to send visits to a RabbitMQ instance	2021-12-11 21:04:16 +01:00
Alejandro Celaya	bd3bb67949	Added dependencies and config to integrate with Rabbit MQ	2021-12-11 17:07:40 +01:00
Alejandro Celaya	69f4daa9d2	Added dev container with RabbitMQ	2021-12-11 16:19:38 +01:00
Alejandro Celaya	ec11155c9c	Updated publish swagger workflow to be triggered for tags	2021-12-11 13:17:45 +01:00
Alejandro Celaya	c48a3a24f7	Fix yet another typo in pipeline	2021-12-11 13:09:39 +01:00
Alejandro Celaya	1b8bc9f0ff	Ensured version subfolder is preserved when publishing swagger spec	2021-12-11 13:04:45 +01:00
Alejandro Celaya	5bf25c7eca	Added custom token for swagger publishing	2021-12-11 12:55:50 +01:00
Alejandro Celaya	5a7f0ad340	Fixed another typo...	2021-12-11 12:35:34 +01:00
Alejandro Celaya	8a93922da0	Added missing space in mv command	2021-12-11 12:27:45 +01:00
Alejandro Celaya	295de5be8e	Changed how version is determined	2021-12-11 12:18:55 +01:00
Alejandro Celaya	5c114b584d	Fixed typo	2021-12-11 12:11:22 +01:00
Alejandro Celaya	dad58b7610	Disabled env step on publis-swagger workflow	2021-12-11 11:53:18 +01:00
Alejandro Celaya	23c1dadb4c	Merge pull request #1265 from acelaya-forks/feature/publish-swagger-workflow Feature/publish swagger workflow	2021-12-11 11:44:12 +01:00
Alejandro Celaya	05332e0606	Created workflow to publish swagger specs	2021-12-11 11:40:59 +01:00
Alejandro Celaya	453842246f	Ensured docker publish is run under ubuntu 20.04	2021-12-11 11:30:03 +01:00
Alejandro Celaya	38280b9027	Merge pull request #1264 from acelaya-forks/feature/unify-ci-jobs Unified jobs in ci pipeline as much as possible	2021-12-11 10:47:10 +01:00
Alejandro Celaya	7d7c0011bb	Fixed references to test:api and test:api:ci inside composer.json and added missing driver for MS SQL	2021-12-11 10:33:00 +01:00
Alejandro Celaya	de2d87a6d9	Unified jobs in ci pipeline as much as possible	2021-12-11 10:26:23 +01:00
Alejandro Celaya	537152450f	Merge pull request #1263 from acelaya-forks/feature/api-tests-coverage Feature/api tests coverage	2021-12-10 18:25:38 +01:00
Alejandro Celaya	87f6b19207	Updated changelog	2021-12-10 18:12:46 +01:00
Alejandro Celaya	064fef5d8a	Added comment to explain why API tests coverage is generated the way it is	2021-12-10 18:12:00 +01:00
Alejandro Celaya	6aebaa94af	Added mutations to API tests	2021-12-10 17:45:55 +01:00
Alejandro Celaya	a1a6ac9c08	Merge pull request #1262 from acelaya-forks/feature/env-var-fix Added new IS_HTTPS_ENABLED env var and deprecated USE_HTTPS	2021-12-10 16:55:58 +01:00
Alejandro Celaya	0d936425c2	Added new IS_HTTPS_ENABLED env var and deprecated USE_HTTPS	2021-12-10 16:24:38 +01:00
Alejandro Celaya	00f867c6ee	Merge pull request #1259 from acelaya-forks/feature/83-msi Feature/83 msi	2021-12-10 14:17:20 +01:00
Alejandro Celaya	bfea3f35f0	Updated changelog	2021-12-10 14:01:58 +01:00
Alejandro Celaya	3f3cf5e20e	Explicitly required an MSI of 83 for unit tests	2021-12-10 14:00:59 +01:00
Alejandro Celaya	0786a962e7	Increased MIS to 83%	2021-12-10 13:42:33 +01:00
Alejandro Celaya	f7c0486101	Added swagger:validate to ci and ci:parallel commands	2021-12-10 12:52:36 +01:00
Alejandro Celaya	2e3798b282	Merge pull request #1256 from acelaya-forks/feature/api-examples Feature/api examples	2021-12-09 19:09:02 +01:00
Alejandro Celaya	181740c3e9	Fixed typo in swagger docs	2021-12-09 18:55:17 +01:00
Alejandro Celaya	23c51a1d5f	Updated changelog	2021-12-09 18:52:27 +01:00
Alejandro Celaya	15ce529c09	Added swagger validation to CI pipeline	2021-12-09 18:51:26 +01:00
Alejandro Celaya	0fd941401b	Added extra examples for error responses in swagger docs	2021-12-09 18:28:52 +01:00
Alejandro Celaya	808ae6a442	Fixed existing examples for API	2021-12-09 15:27:18 +01:00
Alejandro Celaya	ada8d18fa1	Merge pull request #1255 from acelaya-forks/feature/consistent-default-domain-redirects Feature/consistent default domain redirects	2021-12-09 13:03:08 +01:00
Alejandro Celaya	9752abff19	Refactored method in DomainRepo, as one fo their arguments was no longer used	2021-12-09 12:43:49 +01:00
Alejandro Celaya	ee43e68a57	Changed behavior of domains list so that it does not return configured redirects as redirects for default domain	2021-12-09 12:32:53 +01:00
Alejandro Celaya	348ac78f5a	Enhanced ListDomainsAction so that it returns default redirects in the response	2021-12-09 12:11:09 +01:00
Alejandro Celaya	0b22fb933c	Defined new env vars for not-found redirects, deprecating old ones	2021-12-09 10:30:33 +01:00
Alejandro Celaya	cbd4b4849f	Ensured default domain is stripped when creating short URLs from CLI	2021-12-09 10:24:58 +01:00
Alejandro Celaya	f8a48c16f0	Renamed GenerateShortUrlCommand to CreateShortUrlCommand	2021-12-09 09:45:15 +01:00
Alejandro Celaya	8cc4e4bfca	Merge branch 'develop' into feature/consistent-default-domain-redirects	2021-12-09 09:18:17 +01:00
Alejandro Celaya	6c01bb87bf	Replaced tabs by spaces in phpstan.neon config	2021-12-08 17:52:17 +01:00
Alejandro Celaya	02d5a6f15e	Merge pull request #1253 from acelaya-forks/feature/php8.1 Feature/php8.1	2021-12-08 17:49:15 +01:00
Alejandro Celaya	f361403888	Updated paginator types	2021-12-08 17:36:40 +01:00
Alejandro Celaya	3a4550fe24	Updated dependencies to corresponding versions supporting PHP 8.1	2021-12-08 09:40:43 +01:00
Alejandro Celaya	5e722c830f	Allowed to set redirects for default domain via command line or API	2021-12-07 21:13:47 +01:00
Alejandro Celaya	5a56982ad9	Merge pull request #1252 from acelaya-forks/feature/docker-debug-fix Updated docker entry point to make sure debugging and verbosity of co…	2021-12-07 19:27:43 +01:00
Alejandro Celaya	13d70cd12a	Updated docker entry point to make sure debugging and verbosity of commands works as expected	2021-12-07 19:14:56 +01:00
Alejandro Celaya	bb87bdce8a	Updated docker images to use PHP 8.1	2021-12-07 10:43:36 +01:00
Alejandro Celaya	cc7ded1be7	Removed allowed failures in CI pipeline for PHP 8.1	2021-12-07 09:55:06 +01:00
Alejandro Celaya	d8735e6a91	Merge pull request #1250 from acelaya-forks/feature/qr-round-block-size Feature/qr round block size	2021-12-06 18:19:53 +01:00
Alejandro Celaya	813ae71aad	Added test checking if auto margin is added to QR codes	2021-12-06 18:06:29 +01:00
Alejandro Celaya	1a75bd87d8	Updated installer with support for QR code block size rounding	2021-12-06 17:35:32 +01:00
Alejandro Celaya	bdc89e2056	Fixed execution on non-swoole contexts	2021-12-06 17:15:19 +01:00
Alejandro Celaya	bf09990f9c	Added support to disable rounding on block size for QR codes	2021-12-06 17:10:10 +01:00
Alejandro Celaya	81ba8dc518	Merge pull request #1249 from acelaya-forks/feature/yourls-import Added support to import from YOURLS	2021-12-05 15:38:41 +01:00
Alejandro Celaya	e519aaaf1e	Added support to import from YOURLS	2021-12-05 15:16:41 +01:00
Alejandro Celaya	5a90a5e6c7	Merge pull request #1248 from acelaya-forks/feature/openswoole Feature/openswoole	2021-12-05 10:21:20 +01:00
Alejandro Celaya	b855ea92a9	Updated changelog	2021-12-05 10:09:06 +01:00
Alejandro Celaya	7e74d06cdd	Added support for openswoole and migrated docker images from swoole to openswoole	2021-12-05 10:08:10 +01:00
Alejandro Celaya	1e7602bc36	Merge pull request #1247 from acelaya-forks/feature/mutation-badge Added mutation score badge	2021-12-05 09:24:44 +01:00
Alejandro Celaya	7477e672fe	Added mutation score badge	2021-12-05 08:55:05 +01:00
Alejandro Celaya	4a4522dfa3	Merge pull request #1246 from acelaya-forks/feature/mssql-updates Updated dependencies	2021-12-02 21:11:39 +01:00
Alejandro Celaya	8afe058cfc	Updated dependencies	2021-12-02 20:57:06 +01:00
Alejandro Celaya	e13103a925	Merge pull request #1245 from acelaya-forks/feature/mssqlsrv-beta2 Update ci.yml	2021-12-02 19:44:32 +01:00
Alejandro Celaya	8e167ff174	Merge pull request #1244 from acelaya-forks/feature/missing-domain-in-error Added domain to DeleteShortUrlException	2021-12-02 19:34:02 +01:00
Alejandro Celaya	c0dcd31819	Update ci.yml	2021-12-02 19:33:01 +01:00
Alejandro Celaya	a83ae996db	Ensured a formatter is resolved	2021-11-30 21:47:23 +01:00
Alejandro Celaya	a66ddabe8a	Added domain to DeleteShortUrlException	2021-11-30 21:38:09 +01:00
Alejandro Celaya	cdab1e9cae	Pulled	2021-11-15 19:56:10 +01:00
Alejandro Celaya	f2140d1eb0	Fixed merge conflicts	2021-11-15 19:55:07 +01:00
Alejandro Celaya	4a3fa85b5f	Merge pull request #1234 from acelaya-forks/feature/sql-injection Enforced doctrine/dbal 3.1.4	2021-11-15 19:53:01 +01:00
Alejandro Celaya	ade23a9650	Enforced doctrine/dbal 3.1.4	2021-11-15 19:41:38 +01:00
Alejandro Celaya	fc547e6c47	Merge pull request #1224 from acelaya-forks/feature/phpstan-1.0 Updated to phpstan 1.0	2021-11-04 21:38:31 +01:00
Alejandro Celaya	f532b5edee	Added LC_ALL: C env var during ms db tests	2021-11-04 21:31:51 +01:00
Alejandro Celaya	da76eb5cf4	Updated to phpstan 1.0	2021-11-04 21:17:31 +01:00
Alejandro Celaya	ac89f352ce	Updated shlink libs	2021-11-01 11:27:44 +01:00
Alejandro Celaya	198b2a2ace	Merge pull request #1220 from acelaya-forks/feature/update-dev-mercure Updated mercure on dev env from v0.10 to 0.13	2021-10-31 20:00:46 +01:00
Alejandro Celaya	93a3d78111	Updated mercure on dev env from v0.10 to 0.13	2021-10-31 19:42:40 +01:00
Alejandro Celaya	494997d021	Merge pull request #1219 from acelaya-forks/feature/symfony-mercure-0.6 Updated to symfony/mercure 0.6	2021-10-31 13:24:34 +01:00
Alejandro Celaya	eb1345e5c3	Updated to symfony/mercure 0.6	2021-10-31 13:02:58 +01:00
Alejandro Celaya	dc8f5d002d	Merge pull request #1215 from shlinkio/develop Release 2.9.2	2021-10-23 16:52:47 +02:00
Alejandro Celaya	9030e5e6eb	Merge pull request #1214 from acelaya-forks/feature/min-task-workers Feature/min task workers	2021-10-23 16:47:18 +02:00
Alejandro Celaya	2b827baeed	Updated changelog	2021-10-23 16:35:38 +02:00
Alejandro Celaya	cc6fa312f0	Ensured minimum amount of task workers provided via config option or env var is 4	2021-10-23 16:32:06 +02:00
Alejandro Celaya	b8eba5b643	Merge pull request #1213 from acelaya-forks/feature/migrations-3.3 Feature/migrations 3.3	2021-10-23 16:18:39 +02:00
Alejandro Celaya	0c3f98cc37	Replaced implicit false in migration by a check on the platform	2021-10-23 16:04:54 +02:00
Alejandro Celaya	cd35770d26	Ensured migrations are not transactional when run in mysql	2021-10-23 16:02:29 +02:00
Alejandro Celaya	bd3a59e9ca	Updated to doctrine-migrations 3.3	2021-10-23 15:44:56 +02:00
Alejandro Celaya	ff50d601b3	Merge pull request #1212 from acelaya-forks/feature/wrong-transactionality Removed transactionality when dispatching async events	2021-10-23 13:49:09 +02:00
Alejandro Celaya	a4fde0f9e6	Changed mechanism to determine if connection to database worked for health endpoint	2021-10-23 13:36:27 +02:00
Alejandro Celaya	c7a621cb31	Removed transactionality when dispatching async events, as they run in different processes with different db connections	2021-10-23 13:22:42 +02:00
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