Merge pull request #1313 from acelaya-forks/feature/redis-memory-usage

Added a default lifetime for cache entries when using redis

.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.6.7
-          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,185 +22,90 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: swoole-4.6.7
+          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: ['7.4', '8.0']
+        php-version: ['8.0', '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.6.7
+          extensions: openswoole-4.8.1
           coverage: pcov
           ini-values: pcov.directory=module
       - run: composer install --no-interaction --prefer-dist
-      - run: composer test:unit:ci
+      - run: composer test:${{ matrix.test-group }}:ci
       - uses: actions/upload-artifact@v2
-        if: ${{ matrix.php-version == '7.4' }}
+        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: ['7.4', '8.0']
+        php-version: ['8.0', '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.6.7
+          extensions: openswoole-4.8.1, pdo_sqlsrv-5.10.0beta2
           coverage: pcov
           ini-values: pcov.directory=module
       - run: composer install --no-interaction --prefer-dist
-      - run: composer test:db:sqlite:ci
-      - uses: actions/upload-artifact@v2
-        if: ${{ matrix.php-version == '7.4' }}
+      - 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: ['7.4', '8.0']
-    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.6.7
-          coverage: none
-      - run: composer install --no-interaction --prefer-dist
-      - run: composer test:db:mysql
-
-  db-tests-maria:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['7.4', '8.0']
-    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.6.7
-          coverage: none
-      - run: composer install --no-interaction --prefer-dist
-      - run: composer test:db:maria
-
-  db-tests-postgres:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['7.4', '8.0']
-    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.6.7
-          coverage: none
-      - run: composer install --no-interaction --prefer-dist
-      - run: composer test:db:postgres
-
-  db-tests-ms:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        php-version: ['7.4', '8.0']
-    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
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          tools: composer
-          extensions: swoole-4.6.7, pdo_sqlsrv-5.9.0
-          coverage: none
-      - 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: ['7.4', '8.0']
-    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.6.7
-          coverage: pcov
-          ini-values: pcov.directory=module
-      - run: composer install --no-interaction --prefer-dist
-      - run: bin/test/run-api-tests.sh
-      - uses: actions/upload-artifact@v2
-        if: ${{ matrix.php-version == '7.4' }}
-        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: ['7.4', '8.0']
-        test-group: ['unit', 'db']
+        php-version: ['8.0', '8.1']
+        test-group: ['unit', 'db', 'api']
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -226,20 +114,24 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: swoole-4.6.7
+          extensions: openswoole-4.8.1
           coverage: pcov
           ini-values: pcov.directory=module
       - 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:

.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

.github/workflows/publish-release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php-version: ['7.4', '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' }}
@@ -43,7 +43,6 @@ jobs:
         uses: docker://antonyurchenko/git-release:latest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          ALLOW_TAG_PREFIX: "true"
           ALLOW_EMPTY_CHANGELOG: "true"
         with:
           args: |
@@ -54,7 +53,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php-version: [ '7.4', '8.0' ]
+        php-version: [ '8.0', '8.1' ]
         swoole: [ 'yes', 'no' ]
     steps:
       - uses: geekyeggo/delete-artifact@v1

.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

.gitignore

@@ -11,3 +11,4 @@ docs/swagger-ui*
 docs/mercure.html
 docker-compose.override.yml
 .phpunit.result.cache
+docs/swagger/swagger-inlined.json

CHANGELOG.md

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

CONTRIBUTING.md

@@ -121,7 +121,7 @@ Depending on the kind of contribution, maybe not all kinds of tests are needed,
     For example, `test:db:postgres`.
 
 * Run `./indocker composer test:api` to run API E2E tests. For these, the Postgres database engine is used.
-* Run `./indocker composer infect:test` ti run both unit and database tests (over sqlite) and then apply mutations to them with [infection](https://infection.github.io/).
+* Run `./indocker composer infect:test` to run both unit and database tests (over sqlite) and then apply mutations to them with [infection](https://infection.github.io/).
 * Run `./indocker composer ci` to run all previous commands together. This command is run during the project's continuous integration.
 * Run `./indocker composer ci:parallel` to do the same as in previous case, but parallelizing non-conflicting tasks as much as possible.
 

Dockerfile

@@ -1,18 +1,18 @@
-FROM php:8.0.6-alpine3.13 as base
+FROM php:8.1.0-alpine3.15 as base
 
 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION ${SHLINK_VERSION}
-ENV SWOOLE_VERSION 4.6.7
-ENV PDO_SQLSRV_VERSION 5.9.0
-ENV MS_ODBC_SQL_VERSION 17.5.2.1
+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"
 
 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,17 +65,22 @@ 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
 
-# Expose params config dir, since the user is expected to provide custom config from there
-VOLUME /etc/shlink/config/params
-# Expose data dir to allow persistent runtime data and SQLite db
-VOLUME /etc/shlink/data
-
 # Copy config specific for the image
 COPY docker/docker-entrypoint.sh docker-entrypoint.sh
 COPY docker/config/shlink_in_docker.local.php config/autoload/shlink_in_docker.local.php
 COPY docker/config/php.ini ${PHP_INI_DIR}/conf.d/
 
+# Change the ownership of /etc/shlink/data to be writable, then change the user to non-root
+# FIXME Disabled for now, as it conflicts with ENABLE_PERIODIC_VISIT_LOCATE, which is used to configure a cron as root.
+#       Ref: https://github.com/shlinkio/shlink/issues/1132
+#RUN chown 1001 /etc/shlink/data
+#RUN chown 1001 /etc/shlink/data/locks
+#RUN chown 1001 /etc/shlink/data/proxies
+#RUN chown 1001 /etc/shlink/data/cache
+#RUN chown 1001 /etc/shlink/data/log
+#USER 1001
+
 ENTRYPOINT ["/bin/sh", "./docker-entrypoint.sh"]

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 7.4 or 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.
 

bin/cli

@@ -3,5 +3,8 @@
 
 declare(strict_types=1);
 
-$run = require __DIR__ . '/../config/run.php';
-$run(true);
+use Symfony\Component\Console\Application;
+
+/** @var Application $app */
+$app = require __DIR__ . '/../config/cli-app.php';
+$app->run();

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
 

composer.json

@@ -12,68 +12,72 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
         "ext-pdo": "*",
-        "akrabat/ip-address-middleware": "^2.0",
-        "cakephp/chronos": "^2.0",
+        "akrabat/ip-address-middleware": "^2.1",
+        "cakephp/chronos": "^2.3",
         "cocur/slugify": "^4.0",
-        "doctrine/cache": "^1.9",
-        "doctrine/migrations": "^3.1.1",
-        "doctrine/orm": "^2.8.4",
-        "endroid/qr-code": "^4.0",
-        "geoip2/geoip2": "^2.9",
-        "guzzlehttp/guzzle": "^7.0",
+        "doctrine/migrations": "^3.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.3",
-        "laminas/laminas-config-aggregator": "^1.1",
-        "laminas/laminas-diactoros": "^2.1.3",
-        "laminas/laminas-inputfilter": "^2.10",
-        "laminas/laminas-servicemanager": "^3.6",
-        "laminas/laminas-stdlib": "^3.2",
-        "lcobucci/jwt": "^4.0",
-        "league/uri": "^6.2",
+        "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.3",
-        "mezzio/mezzio-fastroute": "^3.1",
-        "mezzio/mezzio-problem-details": "^1.3",
-        "mezzio/mezzio-swoole": "^3.3",
-        "monolog/monolog": "^2.0",
+        "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.5",
+        "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",
-        "shlinkio/shlink-common": "^3.7",
-        "shlinkio/shlink-config": "^1.0",
-        "shlinkio/shlink-event-dispatcher": "^2.1",
-        "shlinkio/shlink-importer": "^2.3",
-        "shlinkio/shlink-installer": "^6.0",
-        "shlinkio/shlink-ip-geolocation": "^1.5",
-        "symfony/console": "^5.1",
-        "symfony/filesystem": "^5.1",
-        "symfony/lock": "^5.1",
-        "symfony/mercure": "^0.5.1",
-        "symfony/process": "^5.1",
-        "symfony/string": "^5.1"
+        "pugx/shortid-php": "^1.0",
+        "ramsey/uuid": "^4.2",
+        "shlinkio/shlink-common": "^4.3",
+        "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.2.1",
+        "dms/phpunit-arraysubset-asserts": "^0.3.0",
         "eaglewu/swoole-ide-helper": "dev-master",
-        "infection/infection": "^0.21.0",
+        "infection/infection": "^0.25.4",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpstan/phpstan": "^0.12.64",
+        "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.1.1",
-        "shlinkio/shlink-test-utils": "^2.1",
-        "symfony/var-dumper": "^5.2",
-        "veewee/composer-run-parallel": "^0.1.0"
+        "shlinkio/php-coding-standard": "~2.2.0",
+        "shlinkio/shlink-test-utils": "^2.5",
+        "symfony/var-dumper": "^6.0",
+        "veewee/composer-run-parallel": "^1.1"
     },
     "autoload": {
         "psr-4": {
@@ -82,6 +86,7 @@
             "Shlinkio\\Shlink\\Core\\": "module/Core/src"
         },
         "files": [
+            "config/constants.php",
             "module/Core/functions/functions.php"
         ]
     },
@@ -103,16 +108,17 @@
         "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",
-        "stan": "phpstan analyse module/*/src/ module/*/config config docker/config data/migrations --level=6",
+        "stan": "APP_ENV=test php vendor/bin/phpstan analyse module/*/src module/*/config config docker/config data/migrations --level=8",
         "test": [
             "@test:unit",
             "@test:db",
@@ -121,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",
@@ -134,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",
-        "infect:ci:base": "infection --threads=4 --log-verbosity=default --only-covered --skip-initial-tests",
+        "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</>",
@@ -154,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</>",
@@ -162,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
+        }
     }
 }

config/autoload/delete_short_urls.global.php

@@ -4,11 +4,15 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
+use function Shlinkio\Shlink\Common\env;
+
+use const Shlinkio\Shlink\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
+
 return [
 
     'delete_short_urls' => [
-        'visits_threshold' => 15,
         'check_visits_threshold' => true,
+        'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', DEFAULT_DELETE_SHORT_URL_THRESHOLD),
     ],
 
 ];

config/autoload/entity-manager.global.php

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

config/autoload/entity-manager.local.php.dist

@@ -9,7 +9,8 @@ return [
             'user' => 'root',
             'password' => 'root',
             'driver' => 'pdo_mysql',
-            'host' => 'shlink_db',
+            'host' => 'shlink_db_mysql',
+            'dbname' => 'shlink',
         ],
     ],
 

config/autoload/geolite2.global.php

@@ -2,12 +2,14 @@
 
 declare(strict_types=1);
 
+use function Shlinkio\Shlink\Common\env;
+
 return [
 
     'geolite2' => [
         'db_location' => __DIR__ . '/../../data/GeoLite2-City.mmdb',
         'temp_dir' => __DIR__ . '/../../data',
-        'license_key' => 'G4Lm0C60yJsnkdPi', // Deprecated. Remove hardcoded license on v3
+        'license_key' => env('GEOLITE_LICENSE_KEY', 'G4Lm0C60yJsnkdPi'), // Deprecated. Remove hardcoded license on v3
     ],
 
 ];

config/autoload/installer.global.php

@@ -24,6 +24,7 @@ return [
             Option\UrlShortener\ShortDomainSchemaConfigOption::class,
             Option\UrlShortener\ValidateUrlConfigOption::class,
             Option\Visit\VisitsWebhooksConfigOption::class,
+            Option\Visit\OrphanVisitsWebhooksConfigOption::class,
             Option\Redirect\BaseUrlRedirectConfigOption::class,
             Option\Redirect\InvalidShortUrlRedirectConfigOption::class,
             Option\Redirect\Regular404RedirectConfigOption::class,
@@ -42,13 +43,26 @@ return [
             Option\UrlShortener\RedirectStatusCodeConfigOption::class,
             Option\UrlShortener\RedirectCacheLifeTimeConfigOption::class,
             Option\UrlShortener\AutoResolveTitlesConfigOption::class,
+            Option\UrlShortener\AppendExtraPathConfigOption::class,
             Option\Tracking\IpAnonymizationConfigOption::class,
             Option\Tracking\OrphanVisitsTrackingConfigOption::class,
             Option\Tracking\DisableTrackParamConfigOption::class,
+            Option\Tracking\DisableTrackingFromConfigOption::class,
             Option\Tracking\DisableTrackingConfigOption::class,
             Option\Tracking\DisableIpTrackingConfigOption::class,
             Option\Tracking\DisableReferrerTrackingConfigOption::class,
             Option\Tracking\DisableUaTrackingConfigOption::class,
+            Option\QrCode\DefaultSizeConfigOption::class,
+            Option\QrCode\DefaultMarginConfigOption::class,
+            Option\QrCode\DefaultFormatConfigOption::class,
+            Option\QrCode\DefaultErrorCorrectionConfigOption::class,
+            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' => [

config/autoload/locks.global.php

@@ -3,12 +3,13 @@
 declare(strict_types=1);
 
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Shlinkio\Shlink\Common\Cache\RedisFactory;
-use Shlinkio\Shlink\Common\Lock\RetryLockStoreDelegatorFactory;
+use Predis\ClientInterface as PredisClient;
 use Shlinkio\Shlink\Common\Logger\LoggerAwareDelegatorFactory;
 use Symfony\Component\Lock;
 
-use const Shlinkio\Shlink\Core\LOCAL_LOCK_FACTORY;
+use function Shlinkio\Shlink\Common\env;
+
+use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;
 
 return [
 
@@ -24,16 +25,12 @@ return [
             LOCAL_LOCK_FACTORY => ConfigAbstractFactory::class,
         ],
         'aliases' => [
-            // With this config, a user could alias 'lock_store' => 'redis_lock_store' to override the default
-            'lock_store' => 'local_lock_store',
+            'lock_store' => env('REDIS_SERVERS') === null ? 'local_lock_store' : 'redis_lock_store',
 
             'redis_lock_store' => Lock\Store\RedisStore::class,
             'local_lock_store' => Lock\Store\FlockStore::class,
         ],
         'delegators' => [
-            Lock\Store\RedisStore::class => [
-                RetryLockStoreDelegatorFactory::class,
-            ],
             Lock\LockFactory::class => [
                 LoggerAwareDelegatorFactory::class,
             ],
@@ -42,7 +39,7 @@ return [
 
     ConfigAbstractFactory::class => [
         Lock\Store\FlockStore::class => ['config.locks.locks_dir'],
-        Lock\Store\RedisStore::class => [RedisFactory::SERVICE_NAME],
+        Lock\Store\RedisStore::class => [PredisClient::class],
         Lock\LockFactory::class => ['lock_store'],
         LOCAL_LOCK_FACTORY => ['local_lock_store'],
     ],

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',
             ],
         ],
     ],

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

config/autoload/mercure.global.php

@@ -7,30 +7,36 @@ use Shlinkio\Shlink\Common\Mercure\LcobucciJwtProvider;
 use Symfony\Component\Mercure\Hub;
 use Symfony\Component\Mercure\HubInterface;
 
-return [
+use function Shlinkio\Shlink\Common\env;
 
-    'mercure' => [
-        'public_hub_url' => null,
-        'internal_hub_url' => null,
-        'jwt_secret' => null,
-        'jwt_issuer' => 'Shlink',
-    ],
+return (static function (): array {
+    $publicUrl = env('MERCURE_PUBLIC_HUB_URL');
 
-    'dependencies' => [
-        'delegators' => [
-            LcobucciJwtProvider::class => [
-                LazyServiceFactory::class,
+    return [
+
+        'mercure' => [
+            'public_hub_url' => $publicUrl,
+            'internal_hub_url' => env('MERCURE_INTERNAL_HUB_URL', $publicUrl),
+            'jwt_secret' => env('MERCURE_JWT_SECRET'),
+            'jwt_issuer' => 'Shlink',
+        ],
+
+        'dependencies' => [
+            'delegators' => [
+                LcobucciJwtProvider::class => [
+                    LazyServiceFactory::class,
+                ],
+                Hub::class => [
+                    LazyServiceFactory::class,
+                ],
             ],
-            Hub::class => [
-                LazyServiceFactory::class,
+            'lazy_services' => [
+                'class_map' => [
+                    LcobucciJwtProvider::class => LcobucciJwtProvider::class,
+                    Hub::class => HubInterface::class,
+                ],
             ],
         ],
-        'lazy_services' => [
-            'class_map' => [
-                LcobucciJwtProvider::class => LcobucciJwtProvider::class,
-                Hub::class => HubInterface::class,
-            ],
-        ],
-    ],
 
-];
+    ];
+})();

config/autoload/middleware-pipeline.global.php

@@ -17,14 +17,14 @@ return [
         'error-handler' => [
             'middleware' => [
                 ContentLengthMiddleware::class,
+                RequestIdMiddleware::class,
                 ErrorHandler::class,
+                Rest\Middleware\CrossDomainMiddleware::class,
             ],
         ],
         'error-handler-rest' => [
             'path' => '/rest',
             'middleware' => [
-                Rest\Middleware\CrossDomainMiddleware::class,
-                RequestIdMiddleware::class,
                 ProblemDetails\ProblemDetailsMiddleware::class,
             ],
         ],
@@ -68,6 +68,7 @@ return [
                 // This middleware is in front of tracking actions explicitly. Putting here for orphan visits tracking
                 IpAddress::class,
                 Core\ErrorHandler\NotFoundTypeResolverMiddleware::class,
+                Core\ShortUrl\Middleware\ExtraPathRedirectMiddleware::class,
                 Core\ErrorHandler\NotFoundTrackerMiddleware::class,
                 Core\ErrorHandler\NotFoundRedirectHandler::class,
                 Core\ErrorHandler\NotFoundTemplateHandler::class,

config/autoload/qr-codes.global.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+use function Shlinkio\Shlink\Common\env;
+
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_ERROR_CORRECTION;
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_FORMAT;
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_MARGIN;
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_ROUND_BLOCK_SIZE;
+use const Shlinkio\Shlink\DEFAULT_QR_CODE_SIZE;
+
+return [
+
+    'qr_codes' => [
+        'size' => (int) env('DEFAULT_QR_CODE_SIZE', DEFAULT_QR_CODE_SIZE),
+        'margin' => (int) env('DEFAULT_QR_CODE_MARGIN', DEFAULT_QR_CODE_MARGIN),
+        'format' => env('DEFAULT_QR_CODE_FORMAT', DEFAULT_QR_CODE_FORMAT),
+        'error_correction' => env('DEFAULT_QR_CODE_ERROR_CORRECTION', DEFAULT_QR_CODE_ERROR_CORRECTION),
+        'round_block_size' => (bool) env('DEFAULT_QR_CODE_ROUND_BLOCK_SIZE', DEFAULT_QR_CODE_ROUND_BLOCK_SIZE),
+    ],
+
+];

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',
+        ],
+    ],
+
+];

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',
+    ],
+
+];

config/autoload/redirects.global.php

@@ -2,12 +2,24 @@
 
 declare(strict_types=1);
 
+use function Shlinkio\Shlink\Common\env;
+
+use const Shlinkio\Shlink\DEFAULT_REDIRECT_CACHE_LIFETIME;
+use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE;
+
 return [
 
     'not_found_redirects' => [
-        'invalid_short_url' => null,
-        'regular_404' => null,
-        'base_url' => null,
+        // 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' => [
+        // TODO Move these options to their own config namespace. Maybe "redirects".
+        'redirect_status_code' => (int) env('REDIRECT_STATUS_CODE', DEFAULT_REDIRECT_STATUS_CODE),
+        'redirect_cache_lifetime' => (int) env('REDIRECT_CACHE_LIFETIME', DEFAULT_REDIRECT_CACHE_LIFETIME),
     ],
 
 ];

config/autoload/redis.global.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use function Shlinkio\Shlink\Common\env;
+
+return (static function (): array {
+    $redisServers = env('REDIS_SERVERS');
+
+    return match (true) {
+        $redisServers === null => [],
+        default => [
+            'cache' => [
+                'default_lifetime' => 86400, // 24h
+                'redis' => [
+                    'servers' => $redisServers,
+                    'sentinel_service' => env('REDIS_SENTINEL_SERVICE'),
+                ],
+            ],
+        ],
+    };
+})();

config/autoload/router.global.php

@@ -4,10 +4,12 @@ declare(strict_types=1);
 
 use Mezzio\Router\FastRouteRouter;
 
+use function Shlinkio\Shlink\Common\env;
+
 return [
 
     'router' => [
-        'base_path' => '',
+        'base_path' => env('BASE_PATH', ''),
 
         'fastroute' => [
             FastRouteRouter::CONFIG_CACHE_ENABLED => true,

config/autoload/swoole.global.php

@@ -2,21 +2,30 @@
 
 declare(strict_types=1);
 
-return [
+use function Shlinkio\Shlink\Common\env;
 
-    'mezzio-swoole' => [
-        // Setting this to true can have unexpected behaviors when running several concurrent slow DB queries
-        'enable_coroutine' => false,
+use const Shlinkio\Shlink\MIN_TASK_WORKERS;
 
-        'swoole-http-server' => [
-            'host' => '0.0.0.0',
-            'process-name' => 'shlink',
+return (static function () {
+    $taskWorkers = (int) env('TASK_WORKER_NUM', 16);
 
-            'options' => [
-                'worker_num' => 16,
-                'task_worker_num' => 16,
+    return [
+
+        '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),
+                ],
             ],
         ],
-    ],
 
-];
+    ];
+})();

config/autoload/tracking.global.php

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

config/autoload/url-shortener.global.php

@@ -2,23 +2,41 @@
 
 declare(strict_types=1);
 
-use const Shlinkio\Shlink\Core\DEFAULT_REDIRECT_CACHE_LIFETIME;
-use const Shlinkio\Shlink\Core\DEFAULT_REDIRECT_STATUS_CODE;
-use const Shlinkio\Shlink\Core\DEFAULT_SHORT_CODES_LENGTH;
+use function Shlinkio\Shlink\Common\env;
 
-return [
+use const Shlinkio\Shlink\DEFAULT_SHORT_CODES_LENGTH;
+use const Shlinkio\Shlink\MIN_SHORT_CODES_LENGTH;
 
-    'url_shortener' => [
-        'domain' => [
-            'schema' => 'https',
-            'hostname' => '',
+return (static function (): array {
+    $shortCodesLength = 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' => $resolveSchema(),
+                'hostname' => env('DEFAULT_DOMAIN', env('SHORT_DOMAIN_HOST', '')),
+            ],
+            'validate_url' => (bool) env('VALIDATE_URLS', false), // Deprecated
+            'default_short_codes_length' => $shortCodesLength,
+            'auto_resolve_titles' => (bool) env('AUTO_RESOLVE_TITLES', false),
+            'append_extra_path' => (bool) env('REDIRECT_APPEND_EXTRA_PATH', false),
         ],
-        'validate_url' => false, // Deprecated
-        'visits_webhooks' => [],
-        'default_short_codes_length' => DEFAULT_SHORT_CODES_LENGTH,
-        'redirect_status_code' => DEFAULT_REDIRECT_STATUS_CODE,
-        'redirect_cache_lifetime' => DEFAULT_REDIRECT_CACHE_LIFETIME,
-        'auto_resolve_titles' => false,
-    ],
 
-];
+    ];
+})();

config/autoload/url-shortener.local.php.dist

@@ -2,13 +2,16 @@
 
 declare(strict_types=1);
 
+$isSwoole = extension_loaded('openswoole');
+
 return [
 
     'url_shortener' => [
         'domain' => [
             'schema' => 'http',
-            'hostname' => 'localhost:8080',
+            'hostname' => sprintf('localhost:%s', $isSwoole ? '8080' : '8000'),
         ],
+        'auto_resolve_titles' => true,
     ],
 
 ];

config/autoload/webhooks.global.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use function Shlinkio\Shlink\Common\env;
+
+return (static function (): array {
+    $webhooks = env('VISITS_WEBHOOKS');
+
+    return [
+
+        'url_shortener' => [
+            // TODO Move these options to their own config namespace
+            'visits_webhooks' => $webhooks === null ? [] : explode(',', $webhooks),
+            'notify_orphan_visits_to_webhooks' => (bool) env('NOTIFY_ORPHAN_VISITS_TO_WEBHOOKS', false),
+        ],
+
+    ];
+})();

config/cli-app.php

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

config/cli-config.php

@@ -4,12 +4,9 @@ declare(strict_types=1);
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
-use Psr\Container\ContainerInterface;
-
-return (function () {
-    /** @var ContainerInterface $container */
-    $container = include __DIR__ . '/container.php';
-    $em = $container->get(EntityManager::class);
 
+return (static function () {
+    /** @var EntityManager $em */
+    $em = include __DIR__ . '/entity-manager.php';
     return ConsoleRunner::createHelperSet($em);
 })();

config/config.php

@@ -8,16 +8,22 @@ use Laminas\ConfigAggregator;
 use Laminas\Diactoros;
 use Mezzio;
 use Mezzio\ProblemDetails;
-use Mezzio\Swoole\ConfigProvider as SwooleConfigProvider;
+use Mezzio\Swoole;
 
 use function class_exists;
 use function Shlinkio\Shlink\Common\env;
 
+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(SwooleConfigProvider::class) ? SwooleConfigProvider::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,
@@ -31,6 +37,7 @@ return (new ConfigAggregator\ConfigAggregator([
     new ConfigAggregator\PhpFileProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
     env('APP_ENV') === 'test'
         ? new ConfigAggregator\PhpFileProvider('config/test/*.global.php')
+        // Deprecated. When the SimplifiedConfigParser is removed, load only generated_config.php here
         : new ConfigAggregator\LaminasConfigProvider('config/params/{generated_config.php,*.config.{php,json}}'),
 ], 'data/cache/app_config.php', [
     Core\Config\SimplifiedConfigParser::class,

config/constants.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink;
+
+use Fig\Http\Message\StatusCodeInterface;
+
+const DEFAULT_DELETE_SHORT_URL_THRESHOLD = 15;
+const DEFAULT_SHORT_CODES_LENGTH = 5;
+const MIN_SHORT_CODES_LENGTH = 4;
+const DEFAULT_REDIRECT_STATUS_CODE = StatusCodeInterface::STATUS_FOUND;
+const DEFAULT_REDIRECT_CACHE_LIFETIME = 30;
+const LOCAL_LOCK_FACTORY = 'Shlinkio\Shlink\LocalLockFactory';
+const CUSTOM_SLUGS_REGEXP = '/[^\pL\pN._~]/u'; // Any unicode letter or number, plus ".", "_" and "~" chars
+const TITLE_TAG_VALUE = '/<title[^>]*>(.*?)<\/title>/i'; // Matches the value inside an html title tag
+const DEFAULT_QR_CODE_SIZE = 300;
+const DEFAULT_QR_CODE_MARGIN = 0;
+const DEFAULT_QR_CODE_FORMAT = 'png';
+const DEFAULT_QR_CODE_ERROR_CORRECTION = 'l';
+const DEFAULT_QR_CODE_ROUND_BLOCK_SIZE = true;
+const MIN_TASK_WORKERS = 4;

config/container.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 use Laminas\ServiceManager\ServiceManager;
 use Symfony\Component\Lock;
 
-use const Shlinkio\Shlink\Core\LOCAL_LOCK_FACTORY;
+use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;
 
 chdir(dirname(__DIR__));
 

config/entity-manager.php

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

config/run.php

@@ -4,12 +4,11 @@ declare(strict_types=1);
 
 use Mezzio\Application;
 use Psr\Container\ContainerInterface;
-use Symfony\Component\Console\Application as CliApp;
 
-return function (bool $isCli = false): void {
+return static function (): void {
     /** @var ContainerInterface $container */
     $container = include __DIR__ . '/container.php';
-    $app = $container->get($isCli ? CliApp::class : Application::class);
+    $app = $container->get(Application::class);
 
     $app->run();
 };

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'] ?? []));

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,34 +30,24 @@ 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 = function (): array {
+$buildDbConnection = static function (): array {
     $driver = env('DB_DRIVER', 'sqlite');
     $isCi = env('CI', false);
-    $getMysqlHost = fn (string $driver) => sprintf('shlink_db%s', $driver === 'mysql' ? '' : '_maria');
-    $getCiMysqlPort = fn (string $driver) => $driver === 'mysql' ? '3307' : '3308';
+    $getCiMysqlPort = static fn (string $driver) => $driver === 'mysql' ? '3307' : '3308';
 
-    $driverConfigMap = [
+    return match ($driver) {
         'sqlite' => [
             'driver' => 'pdo_sqlite',
             'path' => sys_get_temp_dir() . '/shlink-tests.db',
         ],
-        'mysql' => [
-            'driver' => 'pdo_mysql',
-            'host' => $isCi ? '127.0.0.1' : $getMysqlHost($driver),
-            'port' => $isCi ? $getCiMysqlPort($driver) : '3306',
-            'user' => 'root',
-            'password' => 'root',
-            'dbname' => 'shlink_test',
-            'charset' => 'utf8',
-        ],
         'postgres' => [
             'driver' => 'pdo_pgsql',
             'host' => $isCi ? '127.0.0.1' : 'shlink_db_postgres',
@@ -62,7 +55,6 @@ $buildDbConnection = function (): array {
             'user' => 'postgres',
             'password' => 'root',
             'dbname' => 'shlink_test',
-            'charset' => 'utf8',
         ],
         'mssql' => [
             'driver' => 'pdo_sqlsrv',
@@ -71,10 +63,15 @@ $buildDbConnection = function (): array {
             'password' => 'Passw0rd!',
             'dbname' => 'shlink_test',
         ],
-    ];
-    $driverConfigMap['maria'] = $driverConfigMap['mysql'];
-
-    return $driverConfigMap[$driver] ?? [];
+        default => [ // mysql and maria
+            'driver' => 'pdo_mysql',
+            'host' => $isCi ? '127.0.0.1' : sprintf('shlink_db_%s', $driver),
+            'port' => $isCi ? $getCiMysqlPort($driver) : '3306',
+            'user' => 'root',
+            'password' => 'root',
+            'dbname' => 'shlink_test',
+        ],
+    };
 };
 
 $buildTestLoggerConfig = fn (string $handlerName, string $filename) => [
@@ -116,26 +113,18 @@ return [
     ],
 
     'routes' => !$isApiTest ? [] : [
-        [
-            'name' => 'start_collecting_coverage',
-            'path' => '/api-tests/start-coverage',
-            'middleware' => middleware(static function () use (&$coverage) {
-                if ($coverage) {
-                    $coverage->start('API tests');
-                }
-                return new EmptyResponse();
-            }),
-            'allowed_methods' => ['GET'],
-        ],
         [
             'name' => 'dump_coverage',
             'path' => '/api-tests/stop-coverage',
             'middleware' => middleware(static function () use (&$coverage) {
-                if ($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();
@@ -144,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,

data/infra/examples/nginx-vhost.conf

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

data/infra/php.Dockerfile

@@ -1,9 +1,9 @@
-FROM php:8.0.6-fpm-alpine3.13
+FROM php:8.1.0-fpm-alpine3.15
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV APCU_VERSION 5.1.19
-ENV PDO_SQLSRV_VERSION 5.9.0
-ENV MS_ODBC_SQL_VERSION 17.5.2.1
+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 \

data/infra/swoole.Dockerfile

@@ -1,11 +1,11 @@
-FROM php:8.0.6-alpine3.13
+FROM php:8.1.0-alpine3.15
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV APCU_VERSION 5.1.19
-ENV PDO_SQLSRV_VERSION 5.9.0
+ENV APCU_VERSION 5.1.21
 ENV INOTIFY_VERSION 3.0.0
-ENV SWOOLE_VERSION 4.6.7
-ENV MS_ODBC_SQL_VERSION 17.5.2.1
+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

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';
     }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

data/migrations/Version20180913205455.php

@@ -57,7 +57,7 @@ final class Version20180913205455 extends AbstractMigration
 
         try {
             return (string) IpAddress::fromString($addr)->getAnonymizedCopy();
-        } catch (InvalidArgumentException $e) {
+        } catch (InvalidArgumentException) {
             return null;
         }
     }
@@ -66,4 +66,9 @@ final class Version20180913205455 extends AbstractMigration
     {
         // Nothing to rollback
     }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

data/migrations/Version20200106215144.php

@@ -44,4 +44,9 @@ final class Version20200106215144 extends AbstractMigration
             ]);
         }
     }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

data/migrations/Version20201102113208.php

@@ -60,10 +60,7 @@ final class Version20201102113208 extends AbstractMigration
            ->execute();
     }
 
-    /**
-     * @return string|int|null
-     */
-    private function resolveOneApiKeyId(Result $result)
+    private function resolveOneApiKeyId(Result $result): string|int|null
     {
         $results = [];
         while ($row = $result->fetchAssociative()) {
@@ -86,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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

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';
+    }
 }

data/migrations/Version20210720143824.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20210720143824 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $domainsTable = $schema->getTable('domains');
+        $this->skipIf($domainsTable->hasColumn('base_url_redirect'));
+
+        $this->createRedirectColumn($domainsTable, 'base_url_redirect');
+        $this->createRedirectColumn($domainsTable, 'regular_not_found_redirect');
+        $this->createRedirectColumn($domainsTable, 'invalid_short_url_redirect');
+    }
+
+    private function createRedirectColumn(Table $table, string $columnName): void
+    {
+        $table->addColumn($columnName, Types::STRING, [
+            'notnull' => false,
+            'default' => null,
+        ]);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $domainsTable = $schema->getTable('domains');
+        $this->skipIf(! $domainsTable->hasColumn('base_url_redirect'));
+
+        $domainsTable->dropColumn('base_url_redirect');
+        $domainsTable->dropColumn('regular_not_found_redirect');
+        $domainsTable->dropColumn('invalid_short_url_redirect');
+    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
+}

data/migrations/Version20211002072605.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20211002072605 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        $this->skipIf($shortUrls->hasColumn('forward_query'));
+        $shortUrls->addColumn('forward_query', Types::BOOLEAN, ['default' => true]);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        $this->skipIf(! $shortUrls->hasColumn('forward_query'));
+        $shortUrls->dropColumn('forward_query');
+    }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
+}

data/migrations_template.txt

@@ -18,4 +18,9 @@ final class <className> extends AbstractMigration
     {
 <down>
     }
+
+    public function isTransactional(): bool
+    {
+        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+    }
 }

docker-compose.ci.yml

@@ -1,7 +1,7 @@
 version: '3'
 
 services:
-    shlink_db:
+    shlink_db_mysql:
         environment:
             MYSQL_DATABASE: shlink_test
 

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

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"

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.
 
-* `SHORT_DOMAIN_HOST`: The custom short domain used for this shlink instance. For example **doma.in**.
-* `SHORT_DOMAIN_SCHEMA`: Either **http** or **https**.
+* `DEFAULT_DOMAIN`: The default short domain used for this shlink instance. For example **doma.in**.
+* `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:
@@ -21,8 +21,8 @@ To run shlink on top of a local docker service, and using an internal SQLite dat
 docker run \
     --name shlink \
     -p 8080:8080 \
-    -e SHORT_DOMAIN_HOST=doma.in \
-    -e SHORT_DOMAIN_SCHEMA=https \
+    -e DEFAULT_DOMAIN=doma.in \
+    -e IS_HTTPS_ENABLED=true \
     -e GEOLITE_LICENSE_KEY=kjh23ljkbndskj345 \
     shlinkio/shlink:stable
 ```

docker/config/php.ini

@@ -1,3 +1,4 @@
 log_errors_max_len=0
 zend.assertions=1
 assert.exception=1
+memory_limit=256M

docker/config/shlink_in_docker.local.php

@@ -7,127 +7,8 @@ namespace Shlinkio\Shlink;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 
-use function explode;
-use function Functional\contains;
-use function Shlinkio\Shlink\Common\env;
-
-use const Shlinkio\Shlink\Core\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
-use const Shlinkio\Shlink\Core\DEFAULT_REDIRECT_CACHE_LIFETIME;
-use const Shlinkio\Shlink\Core\DEFAULT_REDIRECT_STATUS_CODE;
-use const Shlinkio\Shlink\Core\DEFAULT_SHORT_CODES_LENGTH;
-use const Shlinkio\Shlink\Core\MIN_SHORT_CODES_LENGTH;
-
-$helper = new class {
-    private const DB_DRIVERS_MAP = [
-        'mysql' => 'pdo_mysql',
-        'maria' => 'pdo_mysql',
-        'postgres' => 'pdo_pgsql',
-        'mssql' => 'pdo_sqlsrv',
-    ];
-    private const DB_PORTS_MAP = [
-        'mysql' => '3306',
-        'maria' => '3306',
-        'postgres' => '5432',
-        'mssql' => '1433',
-    ];
-
-    public function getDbConfig(): array
-    {
-        $driver = env('DB_DRIVER');
-        $isMysql = contains(['maria', 'mysql'], $driver);
-        if ($driver === null || $driver === 'sqlite') {
-            return [
-                'driver' => 'pdo_sqlite',
-                'path' => 'data/database.sqlite',
-            ];
-        }
-
-        return [
-            'driver' => self::DB_DRIVERS_MAP[$driver],
-            'dbname' => env('DB_NAME', 'shlink'),
-            'user' => env('DB_USER'),
-            'password' => env('DB_PASSWORD'),
-            'host' => env('DB_HOST', $driver === 'postgres' ? env('DB_UNIX_SOCKET') : null),
-            'port' => env('DB_PORT', self::DB_PORTS_MAP[$driver]),
-            'unix_socket' => $isMysql ? env('DB_UNIX_SOCKET') : null,
-        ];
-    }
-
-    public function getNotFoundRedirectsConfig(): array
-    {
-        return [
-            'invalid_short_url' => env('INVALID_SHORT_URL_REDIRECT_TO'),
-            'regular_404' => env('REGULAR_404_REDIRECT_TO'),
-            'base_url' => env('BASE_URL_REDIRECT_TO'),
-        ];
-    }
-
-    public function getVisitsWebhooks(): array
-    {
-        $webhooks = env('VISITS_WEBHOOKS');
-        return $webhooks === null ? [] : explode(',', $webhooks);
-    }
-
-    public function getRedisConfig(): ?array
-    {
-        $redisServers = env('REDIS_SERVERS');
-        return $redisServers === null ? null : ['servers' => $redisServers];
-    }
-
-    public function getDefaultShortCodesLength(): int
-    {
-        $value = (int) env('DEFAULT_SHORT_CODES_LENGTH', DEFAULT_SHORT_CODES_LENGTH);
-        return $value < MIN_SHORT_CODES_LENGTH ? MIN_SHORT_CODES_LENGTH : $value;
-    }
-
-    public function getMercureConfig(): array
-    {
-        $publicUrl = env('MERCURE_PUBLIC_HUB_URL');
-
-        return [
-            'public_hub_url' => $publicUrl,
-            'internal_hub_url' => env('MERCURE_INTERNAL_HUB_URL', $publicUrl),
-            'jwt_secret' => env('MERCURE_JWT_SECRET'),
-        ];
-    }
-};
-
 return [
 
-    'delete_short_urls' => [
-        'check_visits_threshold' => true,
-        'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', DEFAULT_DELETE_SHORT_URL_THRESHOLD),
-    ],
-
-    'entity_manager' => [
-        'connection' => $helper->getDbConfig(),
-    ],
-
-    'url_shortener' => [
-        'domain' => [
-            'schema' => env('SHORT_DOMAIN_SCHEMA', 'http'),
-            'hostname' => env('SHORT_DOMAIN_HOST', ''),
-        ],
-        'validate_url' => (bool) env('VALIDATE_URLS', false),
-        'visits_webhooks' => $helper->getVisitsWebhooks(),
-        'default_short_codes_length' => $helper->getDefaultShortCodesLength(),
-        'redirect_status_code' => (int) env('REDIRECT_STATUS_CODE', DEFAULT_REDIRECT_STATUS_CODE),
-        'redirect_cache_lifetime' => (int) env('REDIRECT_CACHE_LIFETIME', DEFAULT_REDIRECT_CACHE_LIFETIME),
-        'auto_resolve_titles' => (bool) env('AUTO_RESOLVE_TITLES', false),
-    ],
-
-    'tracking' => [
-        'anonymize_remote_addr' => (bool) env('ANONYMIZE_REMOTE_ADDR', true),
-        'track_orphan_visits' => (bool) env('TRACK_ORPHAN_VISITS', true),
-        'disable_track_param' => env('DISABLE_TRACK_PARAM'),
-        'disable_tracking' => (bool) env('DISABLE_TRACKING', false),
-        'disable_ip_tracking' => (bool) env('DISABLE_IP_TRACKING', false),
-        'disable_referrer_tracking' => (bool) env('DISABLE_REFERRER_TRACKING', false),
-        'disable_ua_tracking' => (bool) env('DISABLE_UA_TRACKING', false),
-    ],
-
-    'not_found_redirects' => $helper->getNotFoundRedirectsConfig(),
-
     'logger' => [
         'Shlink' => [
             'handlers' => [
@@ -142,34 +23,4 @@ return [
         ],
     ],
 
-    'dependencies' => [
-        'aliases' => env('REDIS_SERVERS') === null ? [] : [
-            'lock_store' => 'redis_lock_store',
-        ],
-    ],
-
-    'cache' => [
-        'redis' => $helper->getRedisConfig(),
-    ],
-
-    'router' => [
-        'base_path' => env('BASE_PATH', ''),
-    ],
-
-    'mezzio-swoole' => [
-        'swoole-http-server' => [
-            'port' => (int) env('PORT', 8080),
-            'options' => [
-                'worker_num' => (int) env('WEB_WORKER_NUM', 16),
-                'task_worker_num' => (int) env('TASK_WORKER_NUM', 16),
-            ],
-        ],
-    ],
-
-    'geolite2' => [
-        'license_key' => env('GEOLITE_LICENSE_KEY', 'G4Lm0C60yJsnkdPi'), // Deprecated. Remove the default value
-    ],
-
-    'mercure' => $helper->getMercureConfig(),
-
 ];

docker/docker-entrypoint.sh

@@ -1,26 +1,38 @@
 #!/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
 
-# When restarting the container, swoole might think it is already in execution
+# Periodicaly run visit:locate every hour
+# https://shlink.io/documentation/long-running-tasks/#locate-visits
+# set env var "ENABLE_PERIODIC_VISIT_LOCATE=true" to enable
+if [ $ENABLE_PERIODIC_VISIT_LOCATE ]; then
+  echo "Configuring periodic visit locate..."
+  echo "0 * * * * php /etc/shlink/bin/cli visit:locate -q" > /etc/crontabs/root
+  /usr/sbin/crond &
+fi
+
+# 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

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

@@ -0,0 +1,59 @@
+# Migrate to a new caching library
+
+* Status: Accepted
+* Date: 2021-08-05
+
+## Context and problem statement
+
+Shlink has always used the `doctrine/cache` library to handle anything related with cache.
+
+It was convenient, as it provided several adapters, and it was the library used by other doctrine packages.
+
+However, after the creation of the caching PSRs ([PSR-6 - Cache](https://www.php-fig.org/psr/psr-6) and [PSR-16 - Simple cache](https://www.php-fig.org/psr/psr-16)), most library authors have moved to those interfaces, and the doctrine team has decided to recommend using any other existing package and decommission their own solution.
+
+Also, Shlink needs support for Redis clusters and Redis sentinels, which is not supported by `doctrine/cache` Redis adapters.
+
+## Considered option
+
+After some research, the only packages that seem to support the capabilities required by Shlink and also seem healthy, are these:
+
+* [Symfony cache](https://symfony.com/doc/current/components/cache.html)
+    * 🟢 PSR-6 compliant: **yes**
+    * 🟢 PSR-16 compliant: **yes**
+    * 🟢 APCu support: **yes**
+    * 🟢 Redis support: **yes**
+    * 🟢 Redis cluster support: **yes**
+    * 🟢 Redis sentinel support: **yes**
+    * 🟢 Can use redis through Predis: **yes**
+    * 🔴 Individual packages per adapter: **no**
+* [Laminas cache](https://docs.laminas.dev/laminas-cache/)
+    * 🟢 PSR-6 compliant: **yes**
+    * 🟢 PSR-16 compliant: **yes**
+    * 🟢 APCu support: **yes**
+    * 🟢 Redis support: **yes**
+    * 🟢 Redis cluster support: **yes**
+    * 🔴 Redis sentinel support: **no**
+    * 🔴 Can use redis through Predis: **no**
+    * 🟢 Individual packages per adapter: **yes**
+
+## Decision outcome
+
+Even though Symfony packs all their adapters in a single component, which means we will install some code that will never be used, Laminas relies on the native redis extension for anything related with redis.
+
+That would make Shlink more complex to install, so it seems Symfony's package is the option where it's easier to migrate to.
+
+Also, it's important that the cache component can share the Redis integration (through `Predis`, in this case), as it's also used by other components (the lock component, to name one).
+
+## Pros and Cons of the Options
+
+### Symfony cache
+
+* Good because it supports Redis Sentinel.
+* Good because it allows using a external `Predis` instance.
+* Bad because it packs all the adapters in a single component.
+
+### Laminas cache
+
+* Good because allows installing only the adapters you are going to use, through separated packages.
+* Bad because it requires the php-redis native extension in order to interact with Redis.
+* Bad because it does ot seem to support Redis Sentinels.

docs/adr/README.md

@@ -2,5 +2,6 @@
 
 Here listed you will find the different architectural decisions taken in the project, including all the reasoning behind it, options considered, and final outcome.
 
+* [2021-08-05 Migrate to a new caching library](2021-08-05-migrate-to-a-new-caching-library.md)
 * [2021-02-07 Track visits to 'base_url', 'invalid_short_url' and 'regular_404'](2021-02-07-track-visits-to-base-url-invalid-short-url-and-regular-404.md)
 * [2021-01-17 Support restrictions and permissions in API keys](2021-01-17-support-restrictions-and-permissions-in-api-keys.md)

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",

docs/swagger/definitions/NotFoundRedirects.json

@@ -0,0 +1,20 @@
+{
+    "type": "object",
+    "properties": {
+        "baseUrlRedirect": {
+            "type": "string",
+            "nullable": true,
+            "description": "URL to redirect to when a user hits the domain's base URL"
+        },
+        "regular404Redirect": {
+            "type": "string",
+            "nullable": true,
+            "description": "URL to redirect to when a user hits a not found URL other than an invalid short URL"
+        },
+        "invalidShortUrlRedirect": {
+            "type": "string",
+            "nullable": true,
+            "description": "URL to redirect to when a user hits an invalid short URL"
+        }
+    }
+}

docs/swagger/definitions/ShortUrl.json

@@ -1,5 +1,18 @@
 {
     "type": "object",
+    "required": [
+        "shortCode",
+        "shortUrl",
+        "longUrl",
+        "dateCreated",
+        "visitsCount",
+        "tags",
+        "meta",
+        "domain",
+        "title",
+        "crawlable",
+        "forwardQuery"
+    ],
     "properties": {
         "shortCode": {
             "type": "string",
@@ -45,6 +58,10 @@
         "crawlable": {
             "type": "boolean",
             "description": "Tells if this URL will be included as 'Allow' in Shlink's robots.txt."
+        },
+        "forwardQuery": {
+            "type": "boolean",
+            "description": "Tells if this URL will forward the query params to the long URL when visited, as explained in [the docs](https://shlink.io/documentation/some-features/#query-params-forwarding)."
         }
     }
 }

docs/swagger/definitions/ShortUrlEdition.json

@@ -0,0 +1,48 @@
+{
+    "type": "object",
+    "properties": {
+        "longUrl": {
+            "description": "The long URL this short URL will redirect to",
+            "type": "string"
+        },
+        "validSince": {
+            "description": "The date (in ISO-8601 format) from which this short code will be valid",
+            "type": "string",
+            "nullable": true
+        },
+        "validUntil": {
+            "description": "The date (in ISO-8601 format) until which this short code will be valid",
+            "type": "string",
+            "nullable": true
+        },
+        "maxVisits": {
+            "description": "The maximum number of allowed visits for this short code",
+            "type": "number",
+            "nullable": true
+        },
+        "validateUrl": {
+            "description": "Tells if the long URL (if provided) should or should not be validated as a reachable URL. If not provided, it will fall back to app-level config",
+            "type": "boolean"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            },
+            "description": "The list of tags to set to the short URL."
+        },
+        "title": {
+            "type": "string",
+            "description": "A descriptive title of the short URL.",
+            "nullable": true
+        },
+        "crawlable": {
+            "type": "boolean",
+            "description": "Tells if this URL will be included as 'Allow' in Shlink's robots.txt."
+        },
+        "forwardQuery": {
+            "type": "boolean",
+            "description": "Tells if the query params should be forwarded from the short URL to the long one, as explained in [the docs](https://shlink.io/documentation/some-features/#query-params-forwarding)."
+        }
+    }
+}

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"]
+    }
+}

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"
+    }
+}

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"
+    }
+}

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": {

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": {
@@ -225,63 +223,37 @@
             "content": {
                 "application/json": {
                     "schema": {
-                        "type": "object",
-                        "required": [
-                            "longUrl"
-                        ],
-                        "properties": {
-                            "longUrl": {
-                                "description": "The URL to parse",
-                                "type": "string"
+                        "allOf": [
+                            {
+                                "$ref": "../definitions/ShortUrlEdition.json"
                             },
-                            "tags": {
-                                "description": "The URL to parse",
-                                "type": "array",
-                                "items": {
-                                    "type": "string"
+                            {
+                                "type": "object",
+                                "required": ["longUrl"],
+                                "properties": {
+                                    "customSlug": {
+                                        "description": "A unique custom slug to be used instead of the generated short code",
+                                        "type": "string"
+                                    },
+                                    "findIfExists": {
+                                        "description": "Will force existing matching URL to be returned if found, instead of creating a new one",
+                                        "type": "boolean"
+                                    },
+                                    "domain": {
+                                        "description": "The domain to which the short URL will be attached",
+                                        "type": "string"
+                                    },
+                                    "shortCodeLength": {
+                                        "description": "The length for generated short code. It has to be at least 4 and defaults to 5. It will be ignored when customSlug is provided",
+                                        "type": "number"
+                                    },
+                                    "validateUrl": {
+                                        "description": "Tells if the long URL should or should not be validated as a reachable URL. If not provided, it will fall back to app-level config",
+                                        "type": "boolean"
+                                    }
                                 }
-                            },
-                            "validSince": {
-                                "description": "The date (in ISO-8601 format) from which this short code will be valid",
-                                "type": "string"
-                            },
-                            "validUntil": {
-                                "description": "The date (in ISO-8601 format) until which this short code will be valid",
-                                "type": "string"
-                            },
-                            "customSlug": {
-                                "description": "A unique custom slug to be used instead of the generated short code",
-                                "type": "string"
-                            },
-                            "maxVisits": {
-                                "description": "The maximum number of allowed visits for this short code",
-                                "type": "number"
-                            },
-                            "findIfExists": {
-                                "description": "Will force existing matching URL to be returned if found, instead of creating a new one",
-                                "type": "boolean"
-                            },
-                            "domain": {
-                                "description": "The domain to which the short URL will be attached",
-                                "type": "string"
-                            },
-                            "shortCodeLength": {
-                                "description": "The length for generated short code. It has to be at least 4 and defaults to 5. It will be ignored when customSlug is provided",
-                                "type": "number"
-                            },
-                            "validateUrl": {
-                                "description": "Tells if the long URL should or should not be validated as a reachable URL. If not provided, it will fall back to app-level config",
-                                "type": "boolean"
-                            },
-                            "title": {
-                                "type": "string",
-                                "description": "A descriptive title of the short URL."
-                            },
-                            "crawlable": {
-                                "type": "boolean",
-                                "description": "Tells if this URL will be included as 'Allow' in Shlink's robots.txt."
                             }
-                        }
+                        ]
                     }
                 }
             }
@@ -293,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
+                        }
                     }
                 }
             },
@@ -352,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": {

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"
                 }
             }
         }

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": {
@@ -112,48 +133,7 @@
             "content": {
                 "application/json": {
                     "schema": {
-                        "type": "object",
-                        "properties": {
-                            "longUrl": {
-                                "description": "The long URL this short URL will redirect to",
-                                "type": "string"
-                            },
-                            "validSince": {
-                                "description": "The date (in ISO-8601 format) from which this short code will be valid",
-                                "type": "string",
-                                "nullable": true
-                            },
-                            "validUntil": {
-                                "description": "The date (in ISO-8601 format) until which this short code will be valid",
-                                "type": "string",
-                                "nullable": true
-                            },
-                            "maxVisits": {
-                                "description": "The maximum number of allowed visits for this short code",
-                                "type": "number",
-                                "nullable": true
-                            },
-                            "validateUrl": {
-                                "description": "Tells if the long URL (if provided) should or should not be validated as a reachable URL. If not provided, it will fall back to app-level config",
-                                "type": "boolean"
-                            },
-                            "tags": {
-                                "type": "array",
-                                "items": {
-                                    "type": "string"
-                                },
-                                "description": "The list of tags to set to the short URL."
-                            },
-                            "title": {
-                                "type": "string",
-                                "description": "A descriptive title of the short URL.",
-                                "nullable": true
-                            },
-                            "crawlable": {
-                                "type": "boolean",
-                                "description": "Tells if this URL will be included as 'Allow' in Shlink's robots.txt."
-                            }
-                        }
+                        "$ref": "../definitions/ShortUrlEdition.json"
                     }
                 }
             }
@@ -170,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
+                        }
                     }
                 }
             },
@@ -223,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": {
@@ -288,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": {

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": {

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": {

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": {

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": []
@@ -18,7 +18,7 @@
         ],
         "responses": {
             "200": {
-                "description": "The list of tags",
+                "description": "The list of domains",
                 "content": {
                     "application/json": {
                         "schema": {
@@ -33,45 +33,69 @@
                                             "type": "array",
                                             "items": {
                                                 "type": "object",
-                                                "required": ["domain", "isDefault"],
+                                                "required": ["domain", "isDefault", "redirects"],
                                                 "properties": {
                                                     "domain":  {
                                                         "type": "string"
                                                     },
                                                     "isDefault": {
                                                         "type": "boolean"
+                                                    },
+                                                    "redirects": {
+                                                        "$ref": "../definitions/NotFoundRedirects.json"
                                                     }
                                                 }
                                             }
+                                        },
+                                        "defaultRedirects": {
+                                            "$ref": "../definitions/NotFoundRedirects.json"
                                         }
                                     }
                                 }
                             }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "domains": {
-                            "data": [
-                                {
-                                    "domain": "example.com",
-                                    "isDefault": true
-                                },
-                                {
-                                    "domain": "aaa.com",
-                                    "isDefault": false
-                                },
-                                {
-                                    "domain": "bbb.com",
-                                    "isDefault": false
+                        },
+                        "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": {