Merge pull request #1351 from shlinkio/develop

Release 3.0.0

.dockerignore

@@ -9,6 +9,7 @@ data/GeoLite2-City*
 data/database.sqlite
 data/shlink-tests.db
 CHANGELOG.md
+CONTRIBUTING.md
 UPGRADE.md
 composer.lock
 vendor

.github/ISSUE_TEMPLATE/Bug.md

@@ -18,7 +18,7 @@ With that said, please fill in the information requested next. More information
 
 * Shlink Version: x.y.z
 * PHP Version: x.y.z
-* How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted swoole|Docker image
+* How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted openswoole|Docker image
 * Database engine used: MySQL|MariaDB|PostgreSQL|MicrosoftSQL|SQLite (x.y.z)
 
 #### Summary

.github/ISSUE_TEMPLATE/Question_Support.md

@@ -18,7 +18,7 @@ With that said, please fill in the information requested next. More information
 
 * Shlink Version: x.y.z
 * PHP Version: x.y.z
-* How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted swoole|Docker image
+* How do you serve Shlink: Self-hosted Apache|Self-hosted nginx|Self-hosted openswoole|Docker image
 * Database engine used: MySQL|MariaDB|PostgreSQL|MicrosoftSQL|SQLite (x.y.z)
 
 #### Summary

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
     branches:
       - main
       - develop
+      - 2.x
 
 jobs:
   static-analysis:
@@ -22,7 +23,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.8.1
+          extensions: openswoole-4.9.1
           coverage: none
       - run: composer install --no-interaction --prefer-dist
       - run: composer ${{ matrix.command }}
@@ -44,7 +45,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.8.1
+          extensions: openswoole-4.9.1
           coverage: pcov
           ini-values: pcov.directory=module
       - run: composer install --no-interaction --prefer-dist
@@ -79,7 +80,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.8.1, pdo_sqlsrv-5.10.0beta2
+          extensions: openswoole-4.9.1, pdo_sqlsrv-5.10.0beta2
           coverage: pcov
           ini-values: pcov.directory=module
       - run: composer install --no-interaction --prefer-dist
@@ -114,7 +115,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.8.1
+          extensions: openswoole-4.9.1
           coverage: pcov
           ini-values: pcov.directory=module
       - run: composer install --no-interaction --prefer-dist

.github/workflows/publish-release.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.8.1
+          extensions: openswoole-4.9.1
       - if: ${{ matrix.swoole == 'yes' }}
         run: ./build.sh ${GITHUB_REF#refs/tags/v}
       - if: ${{ matrix.swoole == 'no' }}

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

@@ -23,7 +23,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer
-          extensions: openswoole-4.8.1
+          extensions: openswoole-4.9.1
           coverage: none
       - run: composer install --no-interaction --prefer-dist
       - run: composer swagger:inline

CHANGELOG.md

@@ -4,6 +4,54 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [3.0.0] - 2022-01-28
+### Added
+* [#767](https://github.com/shlinkio/shlink/issues/767) Added full support to use emojis everywhere, whether it is custom slugs, titles, referrers, etc.
+* [#1274](https://github.com/shlinkio/shlink/issues/1274) Added support to filter short URLs lists by all provided tags.
+
+  The `GET /short-urls` endpoint now accepts a `tagsMode=all` param which will make only short URLs matching **all** the tags in the `tags[]` query param, to be returned.
+
+  The `short-urls:list` command now accepts a `-i`/`--including-all-tags` flag which behaves the same.
+
+* [#1273](https://github.com/shlinkio/shlink/issues/1273) Added support for pagination in tags lists, allowing to improve performance by loading subsets of tags.
+
+  For backwards compatibility, lists continue returning all items by default, but the `GET /tags` endpoint now supports `page` and `itemsPerPage` query params, to make sure only a subset of the tags is returned.
+
+  This is supported both when invoking the endpoint with and without `withStats=true` query param.
+
+  Additionally, the endpoint also supports filtering by `searchTerm` query param. When provided, only tags matching it will be returned.
+
+* [#1063](https://github.com/shlinkio/shlink/issues/1063) Added new endpoint that allows fetching all existing non-orphan visits, in case you need a global view of all visits received by your Shlink instance.
+
+  This can be achieved using the `GET /visits/non-orphan` endpoint.
+
+### Changed
+* [#1277](https://github.com/shlinkio/shlink/issues/1277) Reduced docker image size to 45% of the original size.
+* [#1268](https://github.com/shlinkio/shlink/issues/1268) Updated dependencies, including symfony/console 6 and mezzio/mezzio-swoole 4.
+* [#1283](https://github.com/shlinkio/shlink/issues/1283) Changed behavior of `DELETE_SHORT_URL_THRESHOLD` env var, disabling the feature if a value was not provided.
+* [#1300](https://github.com/shlinkio/shlink/issues/1300) Changed default ordering for short URLs list, returning always from newest to oldest.
+* [#1299](https://github.com/shlinkio/shlink/issues/1299) Updated to the latest base docker images, based in PHP 8.1.1, and bumped openswoole to v4.9.1.
+* [#1282](https://github.com/shlinkio/shlink/issues/1282) Env vars now have precedence over installer options.
+* [#1328](https://github.com/shlinkio/shlink/issues/1328) Refactored ShortUrlsRepository to use DTOs in methods with too many arguments.
+
+### Deprecated
+* [#1315](https://github.com/shlinkio/shlink/issues/1315) Deprecated `GET /tags?withStats=true` endpoint. Use `GET /tags/stats` instead.
+
+### Removed
+* [#1275](https://github.com/shlinkio/shlink/issues/1275) Removed everything that was deprecated in Shlink 2.x.
+
+  See [UPGRADE](UPGRADE.md#from-v2x-to-v3x) doc in order to get details on how to migrate to this version.
+
+* [#1347](https://github.com/shlinkio/shlink/issues/1347) Dropped support for regular swoole in favor of openswoole.
+
+  Since openswoole support was introduced in the previous release version, Shlink will still consider the swoole extension as openswoole, as at the moment, functionality hasn't deviated too much, and will simplify migrating to Shlink 3.0.0
+
+  However, there's no longer active testing with regular swoole, and it is considered no longer supported. If some incompatibility arises, the only supported solution will be to migrate to openswoole.
+
+### Fixed
+* *Nothing*
+
+
 ## [2.10.3] - 2022-01-23
 ### Added
 * *Nothing*
@@ -906,7 +954,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
     * Preview generation feature completely removed.
     * Authentication against REST API using JWT is no longer supported.
 
-    See [UPGRADE](UPGRADE.md) doc in order to get details on how to migrate to this version.
+    See [UPGRADE](UPGRADE.md#from-v1x-to-v2x) doc in order to get details on how to migrate to this version.
 
 ### Fixed
 * [#600](https://github.com/shlinkio/shlink/issues/600) Fixed health action so that it works with and without version in the path.

CONTRIBUTING.md

@@ -31,7 +31,7 @@ Then you will have to follow these steps:
 * Run `./indocker bin/cli db:migrate` to get database migrations up to date.
 * Run `./indocker bin/cli api-key:generate` to get your first API key generated.
 
-Once you finish this, you will have the project exposed in ports `8000` through nginx+php-fpm and `8080` through swoole.
+Once you finish this, you will have the project exposed in ports `8000` through nginx+php-fpm and `8080` through openswoole.
 
 > Note: The `indocker` shell script is a helper tool used to run commands inside the main docker container.
 
@@ -80,7 +80,7 @@ The purposes of every folder are:
 * `data`: Common runtime-generated git-ignored assets, like logs, caches, etc.
 * `docs`: Any project documentation is stored here, like API spec definitions or architectural decision records.
 * `module`: Contains a subfolder for every module in the project. Modules contain the source code, tests and configurations for every context in the project.
-* `public`: Few assets (like `favicon.ico` or `robots.txt`) and the web entry point are stored here. This web entry point is not used when serving the app with swoole.
+* `public`: Few assets (like `favicon.ico` or `robots.txt`) and the web entry point are stored here. This web entry point is not used when serving the app with openswoole.
 
 ## Project tests
 
@@ -96,7 +96,7 @@ In order to ensure stability and no regressions are introduced while developing
 
     The project provides some tooling to run them against any of the supported database engines.
 
-* **API tests**: These are E2E tests that spin up an instance of the app with swoole, and test it from the outside by interacting with the REST API.
+* **API tests**: These are E2E tests that spin up an instance of the app with openswoole, and test it from the outside by interacting with the REST API.
 
     These are the best tests to catch regressions, and to verify everything behaves as expected.
 

Dockerfile

@@ -1,8 +1,8 @@
-FROM php:8.1.0-alpine3.15 as base
+FROM php:8.1.1-alpine3.15 as base
 
 ARG SHLINK_VERSION=latest
 ENV SHLINK_VERSION ${SHLINK_VERSION}
-ENV OPENSWOOLE_VERSION 4.8.1
+ENV OPENSWOOLE_VERSION 4.9.1
 ENV PDO_SQLSRV_VERSION 5.10.0beta2
 ENV MS_ODBC_SQL_VERSION 17.5.2.2
 ENV LC_ALL "C"
@@ -11,42 +11,28 @@ WORKDIR /etc/shlink
 
 # Install required PHP extensions
 RUN \
-    # 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 && \
+    # Temp install dev dependencies needed to compile the extensions
+    apk add --no-cache --virtual .dev-deps sqlite-dev postgresql-dev icu-dev libzip-dev zlib-dev libpng-dev && \
+    docker-php-ext-install -j"$(nproc)" pdo_mysql pdo_pgsql intl calendar sockets bcmath zip gd && \
+    apk add --no-cache sqlite-libs && \
     docker-php-ext-install -j"$(nproc)" pdo_sqlite && \
-    # Install postgres
-    apk add --no-cache postgresql-dev && \
-    docker-php-ext-install -j"$(nproc)" pdo_pgsql && \
-    # Install intl
-    apk add --no-cache icu-dev && \
-    docker-php-ext-install -j"$(nproc)" intl && \
-    # Install zip and gd
-    apk add --no-cache libzip-dev zlib-dev libpng-dev && \
-    docker-php-ext-install -j"$(nproc)" zip gd && \
-    # Install gmp
-    apk add --no-cache gmp-dev && \
-    docker-php-ext-install -j"$(nproc)" gmp
+    # Remove temp dev extensions, and install prod equivalents that are required at runtime
+    apk del .dev-deps && \
+    apk add --no-cache postgresql icu libzip libpng
 
-# Install sqlsrv driver
-RUN if [ $(uname -m) == "x86_64" ]; then \
-      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 pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \
-      docker-php-ext-enable pdo_sqlsrv && \
-      apk del .phpize-deps && \
-      rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk ; \
-    fi
-
-# Install openswoole
-RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} && \
+# Install openswoole and sqlsrv driver for x86_64 builds
+RUN apk add --no-cache --virtual .phpize-deps ${PHPIZE_DEPS} unixodbc-dev && \
     pecl install openswoole-${OPENSWOOLE_VERSION} && \
     docker-php-ext-enable openswoole && \
+    if [ $(uname -m) == "x86_64" ]; then \
+      wget https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
+      apk add --no-cache --allow-untrusted msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk && \
+      pecl install pdo_sqlsrv-${PDO_SQLSRV_VERSION} && \
+      docker-php-ext-enable pdo_sqlsrv && \
+      rm msodbcsql17_${MS_ODBC_SQL_VERSION}-1_amd64.apk ; \
+    fi; \
     apk del .phpize-deps
 
-
 # Install shlink
 FROM base as builder
 COPY . .

README.md

@@ -6,9 +6,10 @@
 [![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)
+[![Twitter](https://img.shields.io/twitter/follow/shlinkio?color=blue&label=follow&logo=twitter&style=flat-square)](https://twitter.com/shlinkio)
 [![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://slnk.to/donate)
 
-A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own custom domain.
+A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own domain.
 
 ## Table of Contents
 
@@ -26,7 +27,7 @@ This document contains the very basics to get started with Shlink. If you want t
 
 ## Docker image
 
-Starting with version 1.15.0, an official docker image is provided. You can learn how to use it by reading [the docs](https://shlink.io/documentation/install-docker-image/).
+You can learn how to use the official docker image by reading [the docs](https://shlink.io/documentation/install-docker-image/).
 
 The idea is that you can just generate a container using the image and provide the custom config via env vars.
 
@@ -36,11 +37,11 @@ First, make sure the host where you are going to run shlink fulfills these requi
 
 * 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 or openswoole.
+    * apcu extension is recommended if you don't plan to use openswoole.
     * xml extension is required if you want to generate QR codes in svg format.
     * sockets and bcmath extensions are required if you want to integrate with a RabbitMQ instance.
 * MySQL, MariaDB, PostgreSQL, Microsoft SQL Server or SQLite.
-* The web server of your choice with PHP integration (Apache or Nginx recommended).
+* [Openswoole](https://openswoole.com/) or the web server of your choice with PHP integration (Apache or Nginx recommended).
 
 ### Download
 
@@ -50,7 +51,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/openswoole 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 openswoole integration.
 
     Finally, decompress the file in the location of your choice.
 
@@ -60,7 +61,7 @@ In order to run Shlink, you will need a built version of the project. There are
 
     * Clone the project with git (`git clone https://github.com/shlinkio/shlink.git`), or download it by clicking the **Clone or download** green button.
     * Download the [Composer](https://getcomposer.org/download/) PHP package manager inside the project folder.
-    * Run `./build.sh 1.0.0`, replacing the version with the version number you are going to build (the version number is used as part of the generated dist file name, and to set the value returned when running `shlink -V` from the command line).
+    * Run `./build.sh 3.0.0`, replacing the version with the version number you are going to build (the version number is used as part of the generated dist file name, and to set the value returned when running `shlink -V` from the command line).
 
     After that, you will have a dist file inside the `build` directory, that you need to decompress in the location of your choice.
 
@@ -72,24 +73,24 @@ Despite how you built the project, you now need to configure it, by following th
 
 * If you are going to use MySQL, MariaDB, PostgreSQL or Microsoft SQL Server, create an empty database with the name of your choice.
 * Recursively grant write permissions to the `data` directory. Shlink uses it to cache some information.
-* Setup the application by running the `bin/install` script. It is a command line tool that will guide you through the installation process. **Take into account that this tool has to be run directly on the server where you plan to host Shlink. Do not run it before uploading/moving it there.**
-* Generate your first API key by running `bin/cli api-key:generate`. You will need the key in order to interact with shlink's API.
+* Set up the application by running the `vendor/bin/shlink-installer install` script. It is a command line tool that will guide you through the installation process. **Take into account that this tool has to be run directly on the server where you plan to host Shlink. Do not run it before uploading/moving it there.**
+* Generate your first API key by running `bin/cli api-key:generate`. You will need the key in order to interact with Shlink's API.
 
 ## Using shlink
 
 Once shlink is installed, there are two main ways to interact with it:
 
-* **The command line**. Try running `bin/cli` and see all the [available commands](#shlink-cli-help).
+* **The command line**: Try running `bin/cli` to see all the available commands.
 
-    All of those commands can be run with the `--help`/`-h` flag in order to see how to use them and all the available options.
+    All of them can be run with the `--help`/`-h` flag in order to see how to use them and all the available options.
 
     It is probably a good idea to symlink the CLI entry point (`bin/cli`) to somewhere in your path, so that you can run shlink from any directory.
 
-* **The REST API**. The complete docs on how to use the API can be found [here](https://shlink.io/documentation/api-docs), and a sandbox which also documents every endpoint can be found in the [API Spec](https://api-spec.shlink.io/) portal.
+* **The REST API**: The complete docs on how to use the API can be found [here](https://shlink.io/documentation/api-docs), and a sandbox which also documents every endpoint can be found in the [API Spec](https://api-spec.shlink.io/) portal.
 
     However, you probably don't want to consume the raw API yourself. That's why a nice [web client](https://github.com/shlinkio/shlink-web-client) is provided that can be directly used from [https://app.shlink.io](https://app.shlink.io), or hosted by yourself.
 
-Both the API and CLI allow you to do the same operations, except for API key management, which can be done from the command line interface only.
+Both the API and CLI allow you to do mostly the same operations, except for API key management, which can be done from the command line interface only.
 
 ## Contributing
 

UPGRADE.md

@@ -1,5 +1,53 @@
 # Upgrading
 
+## From v2.x to v3.x
+
+### Changes in REST API
+
+* The `type` property returned when trying to delete a URL that reached the visits threshold, when using the `DELETE /short-urls/{shortCode}` endpoint, is now `INVALID_SHORT_URL_DELETION` instead of `INVALID_SHORTCODE_DELETION`.
+* The `INVALID_AUTHORIZATION` error no longer includes the `expectedTypes` property. Use `expectedHeaders` one instead.
+* The `GET /rest/v2/short-urls` endpoint no longer allows ordering by `visitsCount`, `visitCount` or `originalUrl`. Use `visits` instead of the first two, and `longUrl` instead of the last one.
+* The `GET /rest/v2/short-urls` endpoint no longer allows providing the ordering params with array notation, as in `/shortUrls?orderBy[longUrl]=DESC`. Instead, use the following notation `/shortUrls?orderBy=longUrl-DESC`.
+* The `GET /rest/v2/short-urls` endpoint now has a default ordering of newest-to-oldest. Use `/shortUrls?orderBy=dateCreated-ASC` in order to keep the oldest-to-newest behavior.
+* Requests expecting a body no longer support url-encoded payloads. Instead, always use JSON bodies with `Content-Type: application/json`.
+* The next endpoints have been removed:
+  * `PUT /rest/v2/short-urls/{shortCode}/tags`: Use the `PATCH /rest/v2/short-urls/{shortCode}` endpoint to set the short URL tags.
+  * `POST /rest/v2/tags`: Use `POST /rest/v2/short-urls` or `PATCH /rest/v2/short-urls/{shortCodes}` to create new tags already attached to a short URL. Creating orphan tags makes no sense.
+
+### Changes in CLI
+
+* The next commands have been removed:
+  * `short-url:generate`: Use `short-url:create` instead.
+  * `tag:create`: Creating orphan tags makes no sense.
+* Params in camelCase format are no longer supported. They all have an equivalent kebab-case replacement. (for example, from `--startDate` to `--start-date`).
+* The `short-url:create` command no longer accepts the `--no-validate-url` flag. Now URLs are never validated, unless `--validate-url` is passed.
+* The CLI installer tool entry-points have changed.
+  * `bin/install`: replaced by `vendor/bin/shlink-installer install`
+  * `bin/update`: replaced by `vendor/bin/shlink-installer update`
+  * `bin/set-option`: replaced by `vendor/bin/shlink-installer set-option`
+
+### Changes in config
+
+* The next env vars have been removed:
+  * `INVALID_SHORT_URL_REDIRECT_TO`: Replaced by `DEFAULT_INVALID_SHORT_URL_REDIRECT`.
+  * `REGULAR_404_REDIRECT_TO`: Replaced by `DEFAULT_REGULAR_404_REDIRECT`.
+  * `BASE_URL_REDIRECT_TO`: Replaced by `DEFAULT_BASE_URL_REDIRECT`.
+  * `SHORT_DOMAIN_HOST`: Replaced by `DEFAULT_DOMAIN`.
+  * `SHORT_DOMAIN_SCHEMA`: Replaced by `IS_HTTPS_ENABLED`.
+  * `USE_HTTPS`: Replaced by `IS_HTTPS_ENABLED`.
+  * `VALIDATE_URLS`: There's no replacement. URLs are not validated, unless explicitly requested during creation or edition.
+* The next env vars behavior has changed:
+  * `DELETE_SHORT_URL_THRESHOLD`: Now, if this env var is not provided, the "visits threshold" won't be checked at all when deleting short URLs. Make sure you explicitly provide a value if you want to enable this feature.
+* Environment variables now have precedence over configuration set via the installer tool.
+
+### Other changes
+
+* A default GeoLite2 license key is no longer provided. If you don't provide your own as explained in [the docs](https://shlink.io/documentation/geolite-license-key/), Shlink will not try to update the file anymore.
+* The docker image no longer accepts providing configuration via json files mounted in the `config/params` folder. Only env vars are supported now.
+* If you were manually serving Shlink with swoole, the entry script has to be changed from `/path/to/shlink/vendor/bin/mezzio-swoole start` to `/path/to/shlink/vendor/bin/laminas mezzio:swoole:start`
+* The `GET /{shortCode}/qr-code/{size}` url has been removed. Use `GET /{shortCode}/qr-code?size={size}` instead.
+* Regular swoole extension is no longer supported. Use openswoole instead, as a direct replacement. In most of the cases you just need to uninstall one and install the other, the rest is transparent.
+
 ## From v1.x to v2.x
 
 ### PHP 7.4 required

bin/helper/mezzio-swoole

@@ -1,51 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * @deprecated To be removed with Shlink 3.0.0
- * This script is provided to keep backwards compatibility on how to run shlink with swoole while being still able to
- * update to mezzio/mezzio-swoole 3.x
- */
-
-declare(strict_types=1);
-
-namespace Mezzio\Swoole\Command;
-
-use Laminas\ServiceManager\ServiceManager;
-use PackageVersions\Versions;
-use Symfony\Component\Console\Application as CommandLine;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
-
-use function explode;
-use function Functional\filter;
-use function str_starts_with;
-use function strstr;
-
-/** @var ServiceManager $container */
-$container = require __DIR__ . '/../../config/container.php';
-$version = strstr(Versions::getVersion('mezzio/mezzio-swoole'), '@', true);
-$commandsPrefix = 'mezzio:swoole:';
-$commands = filter(
-    $container->get('config')['laminas-cli']['commands'] ?? [],
-    fn ($c, string $command) => str_starts_with($command, $commandsPrefix),
-);
-$registeredCommands = [];
-
-foreach ($commands as $newName => $commandServiceName) {
-    [, $oldName] = explode($commandsPrefix, $newName);
-    $registeredCommands[$oldName] = $commandServiceName;
-
-    $container->addDelegator($commandServiceName, static function ($c, $n, callable $factory) use ($oldName) {
-        /** @var Command $command */
-        $command = $factory();
-        $command->setAliases([$oldName]);
-
-        return $command;
-    });
-}
-
-$commandLine = new CommandLine('Mezzio web server', $version);
-$commandLine->setAutoExit(true);
-$commandLine->setCommandLoader(new ContainerCommandLoader($container, $registeredCommands));
-$commandLine->run();

bin/install

@@ -1,12 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink;
-
-use function chdir;
-use function dirname;
-
-chdir(dirname(__DIR__));
-[$install] = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
-$install();

bin/set-option

@@ -1,14 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink;
-
-use Shlinkio\Shlink\Installer\Command\SetOptionCommand;
-
-use function chdir;
-use function dirname;
-
-chdir(dirname(__DIR__));
-[,, $installer] = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
-$installer(SetOptionCommand::NAME);

bin/test/run-api-tests.sh

@@ -4,7 +4,10 @@ export DB_DRIVER=postgres
 export TEST_ENV=api
 export GENERATE_COVERAGE=${GENERATE_COVERAGE:-"no"}
 
+# Reset logs
 rm -rf data/log/api-tests
+mkdir data/log/api-tests
+touch data/log/api-tests/output.log
 
 # Try to stop server just in case it hanged in last execution
 vendor/bin/laminas mezzio:swoole:stop

bin/update

@@ -1,12 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink;
-
-use function chdir;
-use function dirname;
-
-chdir(dirname(__DIR__));
-[, $update] = require __DIR__ . '/../vendor/shlinkio/shlink-installer/bin/run.php';
-$update();

build.sh

@@ -10,7 +10,7 @@ fi
 version=$1
 noSwoole=$2
 phpVersion=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION;')
-[[ $noSwoole ]] && swooleSuffix="" || swooleSuffix="_swoole"
+[[ $noSwoole ]] && swooleSuffix="" || swooleSuffix="_openswoole"
 distId="shlink${version}_php${phpVersion}${swooleSuffix}_dist"
 builtContent="./build/${distId}"
 projectdir=$(pwd)
@@ -34,11 +34,8 @@ ${composerBin} self-update
 ${composerBin} install --no-dev --prefer-dist $composerFlags
 
 if [[ $noSwoole ]]; then
-  # If generating a dist not for swoole, uninstall mezzio-swoole
+  # If generating a dist not for openswoole, uninstall mezzio-swoole
   ${composerBin} remove mezzio/mezzio-swoole --with-all-dependencies --update-no-dev $composerFlags
-else
-  # Copy mezzio helper script to vendor (deprecated - Remove with Shlink 3.0.0)
-  cp "${projectdir}/bin/helper/mezzio-swoole" "./vendor/bin"
 fi
 
 # Delete development files

composer.json

@@ -17,9 +17,8 @@
         "ext-pdo": "*",
         "akrabat/ip-address-middleware": "^2.1",
         "cakephp/chronos": "^2.3",
-        "cocur/slugify": "^4.0",
         "doctrine/migrations": "^3.3",
-        "doctrine/orm": "^2.10",
+        "doctrine/orm": "^2.11",
         "endroid/qr-code": "^4.4",
         "geoip2/geoip2": "^2.12",
         "guzzlehttp/guzzle": "^7.4",
@@ -37,7 +36,7 @@
         "mezzio/mezzio": "^3.7",
         "mezzio/mezzio-fastroute": "^3.3",
         "mezzio/mezzio-problem-details": "^1.5",
-        "mezzio/mezzio-swoole": "^3.5",
+        "mezzio/mezzio-swoole": "^4.0",
         "mlocati/ip-lib": "^1.17",
         "monolog/monolog": "^2.3",
         "nikolaposa/monolog-factory": "^3.1",
@@ -49,24 +48,24 @@
         "pugx/shortid-php": "^1.0",
         "ramsey/uuid": "^4.2",
         "shlinkio/shlink-common": "^4.4",
-        "shlinkio/shlink-config": "^1.4",
+        "shlinkio/shlink-config": "^1.6",
         "shlinkio/shlink-event-dispatcher": "^2.3",
         "shlinkio/shlink-importer": "^2.5",
-        "shlinkio/shlink-installer": "^6.3",
+        "shlinkio/shlink-installer": "^7.0",
         "shlinkio/shlink-ip-geolocation": "^2.2",
-        "symfony/console": "^5.4",
-        "symfony/filesystem": "^6.0 || ^5.4",
-        "symfony/lock": "^6.0 || ^5.4",
+        "symfony/console": "^6.0",
+        "symfony/filesystem": "^6.0",
+        "symfony/lock": "^6.0",
         "symfony/mercure": "^0.6",
-        "symfony/process": "^6.0 || ^5.4",
-        "symfony/string": "^6.0 || ^5.4"
+        "symfony/process": "^6.0",
+        "symfony/string": "^6.0"
     },
     "require-dev": {
         "cebe/php-openapi": "^1.5",
         "devster/ubench": "^2.1",
         "dms/phpunit-arraysubset-asserts": "^0.3.0",
-        "eaglewu/swoole-ide-helper": "dev-master",
-        "infection/infection": "^0.25.4",
+        "infection/infection": "^0.26",
+        "openswoole/ide-helper": "~4.9.1",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/phpstan": "^1.2",
         "phpstan/phpstan-doctrine": "^1.0",
@@ -75,7 +74,7 @@
         "phpunit/phpunit": "^9.5",
         "roave/security-advisories": "dev-master",
         "shlinkio/php-coding-standard": "~2.2.0",
-        "shlinkio/shlink-test-utils": "^2.5",
+        "shlinkio/shlink-test-utils": "^3.0",
         "symfony/var-dumper": "^6.0",
         "veewee/composer-run-parallel": "^1.1"
     },
@@ -95,10 +94,8 @@
             "ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
             "ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
             "ShlinkioApiTest\\Shlink\\Rest\\": "module/Rest/test-api",
-            "ShlinkioTest\\Shlink\\Core\\": [
-                "module/Core/test",
-                "module/Core/test-db"
-            ]
+            "ShlinkioTest\\Shlink\\Core\\": "module/Core/test",
+            "ShlinkioDbTest\\Shlink\\Core\\": "module/Core/test-db"
         },
         "files": [
             "config/test/constants.php"

config/autoload/common.global.php

@@ -8,8 +8,8 @@ return [
 
     'debug' => false,
 
-    // Disabling config cache for cli, ensures it's never used for swoole and also that console commands don't generate
-    // a cache file that's then used by non-swoole web executions
+    // Disabling config cache for cli, ensures it's never used for openswoole and also that console commands don't
+    // generate a cache file that's then used by non-openswoole web executions
     ConfigAggregator::ENABLE_CACHE => PHP_SAPI !== 'cli',
 
 ];

config/autoload/delete_short_urls.global.php

@@ -4,15 +4,17 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
-use const Shlinkio\Shlink\DEFAULT_DELETE_SHORT_URL_THRESHOLD;
+return (static function (): array {
+    $threshold = EnvVars::DELETE_SHORT_URL_THRESHOLD()->loadFromEnv();
 
-return [
+    return [
 
-    'delete_short_urls' => [
-        'check_visits_threshold' => true,
-        'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', DEFAULT_DELETE_SHORT_URL_THRESHOLD),
-    ],
+        'delete_short_urls' => [
+            'check_visits_threshold' => $threshold !== null,
+            'visits_threshold' => (int) ($threshold ?? DEFAULT_DELETE_SHORT_URL_THRESHOLD),
+        ],
 
-];
+    ];
+})();

config/autoload/entity-manager.global.php

@@ -3,12 +3,12 @@
 declare(strict_types=1);
 
 use Happyr\DoctrineSpecification\Repository\EntitySpecificationRepository;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 use function Functional\contains;
-use function Shlinkio\Shlink\Common\env;
 
 return (static function (): array {
-    $driver = env('DB_DRIVER');
+    $driver = EnvVars::DB_DRIVER()->loadFromEnv();
     $isMysqlCompatible = contains(['maria', 'mysql'], $driver);
 
     $resolveDriver = static fn () => match ($driver) {
@@ -21,20 +21,27 @@ return (static function (): array {
         'mssql' => '1433',
         default => '3306',
     };
-    $resolveConnection = static fn () => match (true) {
-        $driver === null || $driver === 'sqlite' => [
+    $resolveCharset = static fn () => match ($driver) {
+        // This does not determine charsets or collations in tables or columns, but the charset used in the data
+        // flowing in the connection, so it has to match what has been set in the database.
+        'maria', 'mysql' => 'utf8mb4',
+        'postgres' => 'utf8',
+        default => null,
+    };
+    $resolveConnection = static fn () => match ($driver) {
+        null, 'sqlite' => [
             'driver' => 'pdo_sqlite',
             'path' => 'data/database.sqlite',
         ],
         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',
+            'dbname' => EnvVars::DB_NAME()->loadFromEnv('shlink'),
+            'user' => EnvVars::DB_USER()->loadFromEnv(),
+            'password' => EnvVars::DB_PASSWORD()->loadFromEnv(),
+            'host' => EnvVars::DB_HOST()->loadFromEnv(EnvVars::DB_UNIX_SOCKET()->loadFromEnv()),
+            'port' => EnvVars::DB_PORT()->loadFromEnv($resolveDefaultPort()),
+            'unix_socket' => $isMysqlCompatible ? EnvVars::DB_UNIX_SOCKET()->loadFromEnv() : null,
+            'charset' => $resolveCharset(),
         ],
     };
 

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

@@ -11,6 +11,7 @@ return [
             'driver' => 'pdo_mysql',
             'host' => 'shlink_db_mysql',
             'dbname' => 'shlink',
+            'charset' => 'utf8mb4',
         ],
     ],
 

config/autoload/geolite2.global.php

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

config/autoload/installer.global.php

@@ -18,22 +18,19 @@ return [
             Option\Database\DatabaseUserConfigOption::class,
             Option\Database\DatabasePasswordConfigOption::class,
             Option\Database\DatabaseUnixSocketConfigOption::class,
-            Option\Database\DatabaseSqlitePathConfigOption::class,
-            Option\Database\DatabaseMySqlOptionsConfigOption::class,
             Option\UrlShortener\ShortDomainHostConfigOption::class,
             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,
-            Option\Visit\CheckVisitsThresholdConfigOption::class,
             Option\Visit\VisitsThresholdConfigOption::class,
             Option\BasePathConfigOption::class,
             Option\Worker\TaskWorkerNumConfigOption::class,
             Option\Worker\WebWorkerNumConfigOption::class,
-            Option\RedisServersConfigOption::class,
+            Option\Redis\RedisServersConfigOption::class,
+            Option\Redis\RedisSentinelServiceConfigOption::class,
             Option\UrlShortener\ShortCodeLengthOption::class,
             Option\Mercure\EnableMercureConfigOption::class,
             Option\Mercure\MercurePublicUrlConfigOption::class,

config/autoload/locks.global.php

@@ -5,10 +5,9 @@ declare(strict_types=1);
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Predis\ClientInterface as PredisClient;
 use Shlinkio\Shlink\Common\Logger\LoggerAwareDelegatorFactory;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Symfony\Component\Lock;
 
-use function Shlinkio\Shlink\Common\env;
-
 use const Shlinkio\Shlink\LOCAL_LOCK_FACTORY;
 
 return [
@@ -25,7 +24,7 @@ return [
             LOCAL_LOCK_FACTORY => ConfigAbstractFactory::class,
         ],
         'aliases' => [
-            'lock_store' => env('REDIS_SERVERS') === null ? 'local_lock_store' : 'redis_lock_store',
+            'lock_store' => EnvVars::REDIS_SERVERS()->existsInEnv() ? 'redis_lock_store' : 'local_lock_store',
 
             'redis_lock_store' => Lock\Store\RedisStore::class,
             'local_lock_store' => Lock\Store\FlockStore::class,

config/autoload/mercure.global.php

@@ -4,20 +4,19 @@ declare(strict_types=1);
 
 use Laminas\ServiceManager\Proxy\LazyServiceFactory;
 use Shlinkio\Shlink\Common\Mercure\LcobucciJwtProvider;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Symfony\Component\Mercure\Hub;
 use Symfony\Component\Mercure\HubInterface;
 
-use function Shlinkio\Shlink\Common\env;
-
 return (static function (): array {
-    $publicUrl = env('MERCURE_PUBLIC_HUB_URL');
+    $publicUrl = EnvVars::MERCURE_PUBLIC_HUB_URL()->loadFromEnv();
 
     return [
 
         'mercure' => [
             'public_hub_url' => $publicUrl,
-            'internal_hub_url' => env('MERCURE_INTERNAL_HUB_URL', $publicUrl),
-            'jwt_secret' => env('MERCURE_JWT_SECRET'),
+            'internal_hub_url' => EnvVars::MERCURE_INTERNAL_HUB_URL()->loadFromEnv($publicUrl),
+            'jwt_secret' => EnvVars::MERCURE_JWT_SECRET()->loadFromEnv(),
             'jwt_issuer' => 'Shlink',
         ],
 

config/autoload/qr-codes.global.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 use const Shlinkio\Shlink\DEFAULT_QR_CODE_ERROR_CORRECTION;
 use const Shlinkio\Shlink\DEFAULT_QR_CODE_FORMAT;
@@ -13,11 +13,15 @@ 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),
+        'size' => (int) EnvVars::DEFAULT_QR_CODE_SIZE()->loadFromEnv(DEFAULT_QR_CODE_SIZE),
+        'margin' => (int) EnvVars::DEFAULT_QR_CODE_MARGIN()->loadFromEnv(DEFAULT_QR_CODE_MARGIN),
+        'format' => EnvVars::DEFAULT_QR_CODE_FORMAT()->loadFromEnv(DEFAULT_QR_CODE_FORMAT),
+        'error_correction' => EnvVars::DEFAULT_QR_CODE_ERROR_CORRECTION()->loadFromEnv(
+            DEFAULT_QR_CODE_ERROR_CORRECTION,
+        ),
+        'round_block_size' => (bool) EnvVars::DEFAULT_QR_CODE_ROUND_BLOCK_SIZE()->loadFromEnv(
+            DEFAULT_QR_CODE_ROUND_BLOCK_SIZE,
+        ),
     ],
 
 ];

config/autoload/rabbit.global.php

@@ -5,18 +5,17 @@ declare(strict_types=1);
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Laminas\ServiceManager\Proxy\LazyServiceFactory;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
-
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 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', '/'),
+        'enabled' => (bool) EnvVars::RABBITMQ_ENABLED()->loadFromEnv(false),
+        'host' => EnvVars::RABBITMQ_HOST()->loadFromEnv(),
+        'port' => (int) EnvVars::RABBITMQ_PORT()->loadFromEnv('5672'),
+        'user' => EnvVars::RABBITMQ_USER()->loadFromEnv(),
+        'password' => EnvVars::RABBITMQ_PASSWORD()->loadFromEnv(),
+        'vhost' => EnvVars::RABBITMQ_VHOST()->loadFromEnv('/'),
     ],
 
     'dependencies' => [

config/autoload/redirects.global.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 use const Shlinkio\Shlink\DEFAULT_REDIRECT_CACHE_LIFETIME;
 use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE;
@@ -10,16 +10,16 @@ use const Shlinkio\Shlink\DEFAULT_REDIRECT_STATUS_CODE;
 return [
 
     'not_found_redirects' => [
-        // 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')),
+        'invalid_short_url' => EnvVars::DEFAULT_INVALID_SHORT_URL_REDIRECT()->loadFromEnv(),
+        'regular_404' => EnvVars::DEFAULT_REGULAR_404_REDIRECT()->loadFromEnv(),
+        'base_url' => EnvVars::DEFAULT_BASE_URL_REDIRECT()->loadFromEnv(),
     ],
 
-    '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),
+    'redirects' => [
+        'redirect_status_code' => (int) EnvVars::REDIRECT_STATUS_CODE()->loadFromEnv(DEFAULT_REDIRECT_STATUS_CODE),
+        'redirect_cache_lifetime' => (int) EnvVars::REDIRECT_CACHE_LIFETIME()->loadFromEnv(
+            DEFAULT_REDIRECT_CACHE_LIFETIME,
+        ),
     ],
 
 ];

config/autoload/redis.global.php

@@ -2,18 +2,18 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 return (static function (): array {
-    $redisServers = env('REDIS_SERVERS');
+    $redisServers = EnvVars::REDIS_SERVERS()->loadFromEnv();
 
-    return match (true) {
-        $redisServers === null => [],
+    return match ($redisServers) {
+        null => [],
         default => [
             'cache' => [
                 'redis' => [
                     'servers' => $redisServers,
-                    'sentinel_service' => env('REDIS_SENTINEL_SERVICE'),
+                    'sentinel_service' => EnvVars::REDIS_SENTINEL_SERVICE()->loadFromEnv(),
                 ],
             ],
         ],

config/autoload/router.global.php

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

config/autoload/swoole.global.php

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

config/autoload/tracking.global.php

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

config/autoload/url-shortener.global.php

@@ -2,40 +2,27 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 use const Shlinkio\Shlink\DEFAULT_SHORT_CODES_LENGTH;
 use const Shlinkio\Shlink\MIN_SHORT_CODES_LENGTH;
 
 return (static function (): array {
     $shortCodesLength = max(
-        (int) env('DEFAULT_SHORT_CODES_LENGTH', DEFAULT_SHORT_CODES_LENGTH),
+        (int) EnvVars::DEFAULT_SHORT_CODES_LENGTH()->loadFromEnv(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', '')),
+                'schema' => ((bool) EnvVars::IS_HTTPS_ENABLED()->loadFromEnv(true)) ? 'https' : 'http',
+                'hostname' => EnvVars::DEFAULT_DOMAIN()->loadFromEnv(''),
             ],
-            '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),
+            'auto_resolve_titles' => (bool) EnvVars::AUTO_RESOLVE_TITLES()->loadFromEnv(false),
+            'append_extra_path' => (bool) EnvVars::REDIRECT_APPEND_EXTRA_PATH()->loadFromEnv(false),
         ],
 
     ];

config/autoload/webhooks.global.php

@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-use function Shlinkio\Shlink\Common\env;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 
 return (static function (): array {
-    $webhooks = env('VISITS_WEBHOOKS');
+    $webhooks = EnvVars::VISITS_WEBHOOKS()->loadFromEnv();
 
     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),
+        'visits_webhooks' => [
+            'webhooks' => $webhooks === null ? [] : explode(',', $webhooks),
+            'notify_orphan_visits_to_webhooks' =>
+                (bool) EnvVars::NOTIFY_ORPHAN_VISITS_TO_WEBHOOKS()->loadFromEnv(false),
         ],
 
     ];

config/config.php

@@ -9,15 +9,20 @@ use Laminas\Diactoros;
 use Mezzio;
 use Mezzio\ProblemDetails;
 use Mezzio\Swoole;
+use Shlinkio\Shlink\Config\ConfigAggregator\EnvVarLoaderProvider;
 
 use function class_exists;
-use function Shlinkio\Shlink\Common\env;
+use function Shlinkio\Shlink\Config\env;
 
 use const PHP_SAPI;
 
 $isCli = PHP_SAPI === 'cli';
+$isTestEnv = env('APP_ENV') === 'test';
 
 return (new ConfigAggregator\ConfigAggregator([
+    ! $isTestEnv
+        ? new EnvVarLoaderProvider('config/params/generated_config.php', Core\Config\EnvVars::cases())
+        : new ConfigAggregator\ArrayProvider([]),
     Mezzio\ConfigProvider::class,
     Mezzio\Router\ConfigProvider::class,
     Mezzio\Router\FastRouteRouter\ConfigProvider::class,
@@ -35,12 +40,9 @@ return (new ConfigAggregator\ConfigAggregator([
     CLI\ConfigProvider::class,
     Rest\ConfigProvider::class,
     new ConfigAggregator\PhpFileProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
-    env('APP_ENV') === 'test'
+    $isTestEnv
         ? 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}}'),
+        : new ConfigAggregator\ArrayProvider([]),
 ], 'data/cache/app_config.php', [
-    Core\Config\SimplifiedConfigParser::class,
     Core\Config\BasePathPrefixer::class,
-    Core\Config\DeprecatedConfigParser::class,
 ]))->getMergedConfig();

config/constants.php

@@ -12,7 +12,6 @@ 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;

config/test/test_config.global.php

@@ -22,7 +22,7 @@ use SebastianBergmann\CodeCoverage\Report\PHP;
 use SebastianBergmann\CodeCoverage\Report\Xml\Facade as Xml;
 
 use function Laminas\Stratigility\middleware;
-use function Shlinkio\Shlink\Common\env;
+use function Shlinkio\Shlink\Config\env;
 use function sprintf;
 use function sys_get_temp_dir;
 
@@ -55,6 +55,7 @@ $buildDbConnection = static function (): array {
             'user' => 'postgres',
             'password' => 'root',
             'dbname' => 'shlink_test',
+            'charset' => 'utf8',
         ],
         'mssql' => [
             'driver' => 'pdo_sqlsrv',
@@ -70,6 +71,7 @@ $buildDbConnection = static function (): array {
             'user' => 'root',
             'password' => 'root',
             'dbname' => 'shlink_test',
+            'charset' => 'utf8mb4',
         ],
     };
 };
@@ -107,6 +109,7 @@ return [
             'process-name' => 'shlink_test',
             'options' => [
                 'pid_file' => sys_get_temp_dir() . '/shlink-test-swoole.pid',
+                'log_file' => __DIR__ . '/../../data/log/api-tests/output.log',
                 'enable_coroutine' => false,
             ],
         ],

data/infra/examples/shlink-daemon-logrotate.conf

@@ -1,4 +1,4 @@
-/var/log/shlink/shlink_swoole.log {
+/var/log/shlink/shlink_openswoole.log {
     su root root
     daily
     missingok
@@ -8,6 +8,6 @@
     notifempty
     create 0640 root root
     postrotate
-        /etc/init.d/shlink_swoole restart
+        /etc/init.d/shlink_openswoole restart
     endscript
 }

data/infra/examples/shlink-daemon.sh

@@ -1,26 +1,26 @@
 #!/bin/bash
 ### BEGIN INIT INFO
-# Provides:          shlink_swoole
+# Provides:          shlink_openswoole
 # Required-Start:    $local_fs $network $named $time $syslog
 # Required-Stop:     $local_fs $network $named $time $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Description:       Shlink non-blocking server with swoole
+# Description:       Shlink non-blocking server with openswoole
 ### END INIT INFO
 
 SCRIPT=/path/to/shlink/vendor/bin/laminas\ mezzio:swoole:start
 RUNAS=root
 
-PIDFILE=/var/run/shlink_swoole.pid
+PIDFILE=/var/run/shlink_openswoole.pid
 LOGDIR=/var/log/shlink
-LOGFILE=${LOGDIR}/shlink_swoole.log
+LOGFILE=${LOGDIR}/shlink_openswoole.log
 
 start() {
   if [[ -f "$PIDFILE" ]] && kill -0 $(cat "$PIDFILE"); then
-    echo 'Shlink with swoole already running' >&2
+    echo 'Shlink with openswoole already running' >&2
     return 1
   fi
-  echo 'Starting shlink with swoole' >&2
+  echo 'Starting shlink with openswoole' >&2
   mkdir -p "$LOGDIR"
   touch "$LOGFILE"
   local CMD="$SCRIPT &> \"$LOGFILE\" & echo \$!"
@@ -30,10 +30,10 @@ start() {
 
 stop() {
   if [[ ! -f "$PIDFILE" ]] || ! kill -0 $(cat "$PIDFILE"); then
-    echo 'Shlink with swoole not running' >&2
+    echo 'Shlink with openswoole not running' >&2
     return 1
   fi
-  echo 'Stopping shlink with swoole' >&2
+  echo 'Stopping shlink with openswoole' >&2
   kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
   echo 'Shlink stopped' >&2
 }

data/infra/php.Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1.0-fpm-alpine3.15
+FROM php:8.1.1-fpm-alpine3.15
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.21
@@ -31,9 +31,6 @@ RUN docker-php-ext-install gd
 RUN apk add --no-cache postgresql-dev
 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
 

data/infra/swoole.Dockerfile

@@ -1,9 +1,9 @@
-FROM php:8.1.0-alpine3.15
+FROM php:8.1.1-alpine3.15
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 ENV APCU_VERSION 5.1.21
 ENV INOTIFY_VERSION 3.0.0
-ENV OPENSWOOLE_VERSION 4.8.1
+ENV OPENSWOOLE_VERSION 4.9.1
 ENV PDO_SQLSRV_VERSION 5.10.0beta2
 ENV MS_ODBC_SQL_VERSION 17.5.2.2
 
@@ -33,9 +33,6 @@ RUN docker-php-ext-install gd
 RUN apk add --no-cache postgresql-dev
 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
 

data/migrations/Version20160819142757.php

@@ -5,45 +5,45 @@ declare(strict_types=1);
 namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\Migrations\AbstractMigration;
 
+use function is_subclass_of;
+
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
 class Version20160819142757 extends AbstractMigration
 {
-    private const MYSQL = 'mysql';
-    private const SQLITE = 'sqlite';
-
     /**
      * @throws Exception
      * @throws SchemaException
      */
     public function up(Schema $schema): void
     {
-        $db = $this->connection->getDatabasePlatform()->getName();
+        $platformClass = $this->connection->getDatabasePlatform();
         $table = $schema->getTable('short_urls');
         $column = $table->getColumn('short_code');
 
-        if ($db === self::MYSQL) {
-            $column->setPlatformOption('collation', 'utf8_bin');
-        } elseif ($db === self::SQLITE) {
-            $column->setPlatformOption('collate', 'BINARY');
-        }
+        match (true) {
+            is_subclass_of($platformClass, MySQLPlatform::class) => $column
+                ->setPlatformOption('charset', 'utf8mb4')
+                ->setPlatformOption('collation', 'utf8mb4_bin'),
+            is_subclass_of($platformClass, SqlitePlatform::class) => $column->setPlatformOption('collate', 'BINARY'),
+            default => null,
+        };
     }
 
-    /**
-     * @throws Exception
-     */
     public function down(Schema $schema): void
     {
-        $this->connection->getDatabasePlatform()->getName();
+        // Nothing to roll back
     }
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20160820191203.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -76,6 +77,6 @@ class Version20160820191203 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20171021093246.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Types\Types;
@@ -48,6 +49,6 @@ class Version20171021093246 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20171022064541.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Types\Types;
@@ -45,6 +46,6 @@ class Version20171022064541 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20180801183328.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\Migrations\AbstractMigration;
@@ -42,6 +43,6 @@ final class Version20180801183328 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20180913205455.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 use PDO;
@@ -69,6 +70,6 @@ final class Version20180913205455 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20180915110857.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\Migrations\AbstractMigration;
@@ -50,6 +51,6 @@ final class Version20180915110857 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20181020060559.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Schema\Table;
@@ -58,7 +59,7 @@ final class Version20181020060559 extends AbstractMigration
         foreach (self::COLUMNS as $camelCaseName => $snakeCaseName) {
             $qb->set($snakeCaseName, $camelCaseName);
         }
-        $qb->execute();
+        $qb->executeStatement();
     }
 
     public function down(Schema $schema): void
@@ -68,6 +69,6 @@ final class Version20181020060559 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20181020065148.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\Migrations\AbstractMigration;
@@ -41,6 +42,6 @@ final class Version20181020065148 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20181110175521.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
@@ -37,6 +38,6 @@ final class Version20181110175521 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20190824075137.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
@@ -37,6 +38,6 @@ final class Version20190824075137 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20190930165521.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
 use Doctrine\DBAL\Types\Types;
@@ -55,6 +56,6 @@ final class Version20190930165521 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20191001201532.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
@@ -49,6 +50,6 @@ final class Version20191001201532 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20191020074522.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaException;
@@ -37,6 +38,6 @@ final class Version20191020074522 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20200105165647.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -38,7 +40,7 @@ final class Version20200105165647 extends AbstractMigration
                    'zeroValue' => '0',
                    'emptyString' => '',
                ])
-               ->execute();
+               ->executeStatement();
         }
     }
 
@@ -61,14 +63,14 @@ final class Version20200105165647 extends AbstractMigration
      */
     public function postUp(Schema $schema): void
     {
-        $platformName = $this->connection->getDatabasePlatform()->getName();
-        $castType = $platformName === 'postgres' ? 'DOUBLE PRECISION' : 'DECIMAL(9,2)';
+        $isPostgres = $this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform;
+        $castType = $isPostgres ? 'DOUBLE PRECISION' : 'DECIMAL(9,2)';
 
         foreach (self::COLUMNS as $newName => $oldName) {
             $qb = $this->connection->createQueryBuilder();
             $qb->update('visit_locations')
                ->set($newName, 'CAST(' . $oldName . ' AS ' . $castType . ')')
-               ->execute();
+               ->executeStatement();
         }
     }
 
@@ -78,7 +80,7 @@ final class Version20200105165647 extends AbstractMigration
             $qb = $this->connection->createQueryBuilder();
             $qb->update('visit_locations')
                ->set($oldName, $newName)
-               ->execute();
+               ->executeStatement();
         }
     }
 
@@ -96,6 +98,6 @@ final class Version20200105165647 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20200106215144.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace ShlinkMigrations;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -47,6 +48,6 @@ final class Version20200106215144 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20200110182849.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -36,6 +38,9 @@ final class Version20200110182849 extends AbstractMigration
         );
     }
 
+    /**
+     * @throws Exception
+     */
     public function setDefaultValueForColumnInTable(string $tableName, string $columnName): void
     {
         $qb = $this->connection->createQueryBuilder();
@@ -43,7 +48,7 @@ final class Version20200110182849 extends AbstractMigration
            ->set($columnName, ':emptyValue')
            ->setParameter('emptyValue', self::DEFAULT_EMPTY_VALUE)
            ->where($qb->expr()->isNull($columnName))
-           ->execute();
+           ->executeStatement();
     }
 
     public function down(Schema $schema): void
@@ -53,6 +58,6 @@ final class Version20200110182849 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20200323190014.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -32,7 +33,7 @@ final class Version20200323190014 extends AbstractMigration
            ->andWhere($qb->expr()->eq('lon', 0))
            ->setParameter('isEmpty', true)
            ->setParameter('emptyString', '')
-           ->execute();
+           ->executeStatement();
     }
 
     public function down(Schema $schema): void
@@ -45,6 +46,6 @@ final class Version20200323190014 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20200503170404.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -27,6 +28,6 @@ final class Version20200503170404 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20201023090929.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -44,6 +45,6 @@ final class Version20201023090929 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20201102113208.php

@@ -6,6 +6,7 @@ namespace ShlinkMigrations;
 
 use Cake\Chronos\Chronos;
 use Doctrine\DBAL\Driver\Result;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -86,6 +87,6 @@ final class Version20201102113208 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20210102174433.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -52,6 +53,6 @@ final class Version20210102174433 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20210118153932.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -26,6 +27,6 @@ final class Version20210118153932 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20210202181026.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -36,6 +37,6 @@ final class Version20210202181026 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20210207100807.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -43,6 +44,6 @@ final class Version20210207100807 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20210306165711.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -37,6 +38,6 @@ final class Version20210306165711 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20210522051601.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -26,6 +27,6 @@ final class Version20210522051601 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20210522124633.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -28,6 +29,6 @@ final class Version20210522124633 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20210720143824.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Types;
@@ -41,6 +42,6 @@ final class Version20210720143824 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20211002072605.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkMigrations;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\Migrations\AbstractMigration;
@@ -26,6 +27,6 @@ final class Version20211002072605 extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

data/migrations/Version20220110113313.php

@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Platforms\MySQLPlatform;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220110113313 extends AbstractMigration
+{
+    private const CHARSET = 'utf8mb4';
+    private const COLLATIONS = [
+        'short_urls' => [
+            'original_url' => 'unicode_ci',
+            'short_code' => 'bin',
+            'import_original_short_code' => 'unicode_ci',
+            'title' => 'unicode_ci',
+        ],
+        'domains' => [
+            'authority' => 'unicode_ci',
+            'base_url_redirect' => 'unicode_ci',
+            'regular_not_found_redirect' => 'unicode_ci',
+            'invalid_short_url_redirect' => 'unicode_ci',
+        ],
+        'tags' => [
+            'name' => 'unicode_ci',
+        ],
+        'visits' => [
+            'referer' => 'unicode_ci',
+            'user_agent' => 'unicode_ci',
+            'visited_url' => 'unicode_ci',
+        ],
+        'visit_locations' => [
+            'country_code' => 'unicode_ci',
+            'country_name' => 'unicode_ci',
+            'region_name' => 'unicode_ci',
+            'city_name' => 'unicode_ci',
+            'timezone' => 'unicode_ci',
+        ],
+    ];
+
+    public function up(Schema $schema): void
+    {
+        $this->skipIf(! $this->isMySql(), 'This only sets MySQL-specific database options');
+
+        foreach (self::COLLATIONS as $tableName => $columns) {
+            $table = $schema->getTable($tableName);
+
+            foreach ($columns as $columnName => $collation) {
+                $table->getColumn($columnName)
+                      ->setPlatformOption('charset', self::CHARSET)
+                      ->setPlatformOption('collation', self::CHARSET . '_' . $collation);
+            }
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        // No down
+    }
+
+    public function isTransactional(): bool
+    {
+        return ! $this->isMySql();
+    }
+
+    private function isMySql(): bool
+    {
+        return $this->connection->getDatabasePlatform() instanceof MySQLPlatform;
+    }
+}

data/migrations_template.txt

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace <namespace>;
 
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
@@ -21,6 +22,6 @@ final class <className> extends AbstractMigration
 
     public function isTransactional(): bool
     {
-        return $this->connection->getDatabasePlatform()->getName() !== 'mysql';
+        return ! ($this->connection->getDatabasePlatform() instanceof MySQLPlatform);
     }
 }

docker-compose.yml

@@ -18,6 +18,8 @@ services:
         build:
             context: .
             dockerfile: ./data/infra/php.Dockerfile
+        ports:
+            - '8888:8888'
         volumes:
             - ./:/home/shlink/www
             - ./data/infra/php.ini:/usr/local/etc/php/php.ini
@@ -98,7 +100,7 @@ services:
 
     shlink_db_maria:
         container_name: shlink_db_maria
-        image: mariadb:10.5
+        image: mariadb:10.7
         ports:
             - "3308:3306"
         volumes:

docker/README.md

@@ -5,7 +5,7 @@
 
 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 [openswoole](https://www.swoole.co.uk/), which can be linked to external databases to persist data.
+It exposes a shlink instance served with [openswoole](https://openswoole.com/), which can be linked to external databases to persist data.
 
 ## Usage
 

docker/docker-entrypoint.sh

@@ -24,11 +24,9 @@ if [ ! -z "${GEOLITE_LICENSE_KEY}" ]; then
   php bin/cli visit:download-db -n ${flags}
 fi
 
-# 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
+# Periodically run visit:locate every hour, if ENABLE_PERIODIC_VISIT_LOCATE=true was provided
 if [ $ENABLE_PERIODIC_VISIT_LOCATE ]; then
-  echo "Configuring periodic visit locate..."
+  echo "Configuring periodic visit location..."
   echo "0 * * * * php /etc/shlink/bin/cli visit:locate -q" > /etc/crontabs/root
   /usr/sbin/crond &
 fi

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

@@ -0,0 +1,51 @@
+# Update env vars behavior to have precedence over installer options
+
+* Status: Accepted
+* Date: 2022-01-15
+
+## Context and problem statement
+
+Shlink supports providing configuration via the installer tool that generates a config file that gets merged with the rest of the config, or via environment variables.
+
+It is potentially possible to combine both, but if you do so, you will find out the installer tool config has precedence over env vars, which is not very intuitive.
+
+A [Twitter survey](https://twitter.com/shlinkio/status/1480614855006732289) has also showed up all participants also found the behavior should be the opposite.
+
+## Considered option
+
+* Move the logic to read env vars to another config file which always overrides installer options.
+* Move the logic to read env vars to a config post-processor which overrides config dynamically, only if the appropriate env var had been defined.
+* Make the installer generate a config file which also includes the logic to load env vars on it.
+* Make the installer no longer generate the config structure, and instead generate a map with env vars and their values. Then Shlink would define those env vars if not defined already.
+
+## Decision outcome
+
+The most viable option was finally to re-think the installer tool, and make it generate a map of env vars and their values.
+
+Then Shlink reads this as the first config file, which sets the values as env vars if not yet defined, and later on, the values are read as usual wherever needed.
+
+## Pros and Cons of the Options
+
+### Read all env vars in a single config file
+
+* Bad: This option had to be discarded, as it would always override the installer config no matter what.
+
+### Read all env vars in a config post-processor
+
+* Good because it would not require any change in the installer.
+* Bad because it requires moving all env var reading logic somewhere else, while having it together with their contextual config is quite convenient.
+* Bad because it requires defining a map between the config path from the installer and the env var to set.
+
+### Make the installer generate a config file which also reads env vars
+
+* Good because it would not require changing Shlink.
+* Bad because it requires looking for a new way to generate the installer config.
+* Bad because it would mean reading the env vars in multiple places.
+
+### Re-think the installer to no longer generate internal config, and instead, just define values for regular env vars
+
+* Bad because it requires changes both in Shlink and the installer.
+* Bad because it's more error-prone, and the option with higher chances to introduce a regression.
+* Good because it finally decouples Shlink internal config (which is an implementation detail) from any external tool, including the installer, allowing to change it at will.
+* Good because it opens the door to eventually simplify the installer. For the moment, it requires a bit of extra logic to support importing the old config.
+* Good because it allows keeping the logic to read env vars next to the config where it applies.

docs/adr/README.md

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

docs/swagger/paths/v1_short-urls.json

@@ -49,10 +49,20 @@
                     }
                 }
             },
+            {
+                "name": "tagsMode",
+                "in": "query",
+                "description": "Tells how the filtering by tags should work, returning short URLs containing \"any\" of the tags, or \"all\" the tags. It's ignored if no tags are provided, and defaults to \"any\" if not provided.",
+                "required": false,
+                "schema": {
+                    "type": "string",
+                    "enum": ["any", "all"]
+                }
+            },
             {
                 "name": "orderBy",
                 "in": "query",
-                "description": "The field from which you want to order the result. (Since v1.3.0)",
+                "description": "The field from which you want to order the result.",
                 "required": false,
                 "schema": {
                     "type": "string",

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

@@ -320,7 +320,7 @@
                         },
                         "example": {
                             "title": "Cannot delete short URL",
-                            "type": "INVALID_SHORTCODE_DELETION",
+                            "type": "INVALID_SHORT_URL_DELETION",
                             "detail": "Impossible to delete short URL with short code \"abc123\", since it has more than \"15\" visits.",
                             "status": 422,
                             "shortCode": "abc123",

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

@@ -1,106 +0,0 @@
-{
-    "put": {
-        "deprecated": true,
-        "operationId": "editShortUrlTags",
-        "tags": [
-            "Short URLs"
-        ],
-        "summary": "Edit tags on short URL",
-        "description": "Edit the tags on URL identified by provided short code.<br />This endpoint is deprecated. Use the [Edit short URL](#/Short%20URLs/editShortUrl) endpoint to edit tags.",
-        "parameters": [
-            {
-                "$ref": "../parameters/version.json"
-            },
-            {
-                "name": "shortCode",
-                "in": "path",
-                "description": "The short code for the short URL in which we want to edit tags.",
-                "required": true,
-                "schema": {
-                    "type": "string"
-                }
-            },
-            {
-                "$ref": "../parameters/domain.json"
-            }
-        ],
-        "requestBody": {
-            "description": "Request body.",
-            "required": true,
-            "content": {
-                "application/json": {
-                    "schema": {
-                        "type": "object",
-                        "required": [
-                            "tags"
-                        ],
-                        "properties": {
-                            "tags": {
-                                "type": "array",
-                                "items": {
-                                    "type": "string"
-                                },
-                                "description": "The list of tags to set to the short URL."
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "security": [
-            {
-                "ApiKey": []
-            }
-        ],
-        "responses": {
-            "200": {
-                "description": "List of tags.",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "type": "object",
-                            "properties": {
-                                "tags": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "string"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "400": {
-                "description": "The request body does not contain a \"tags\" param with array type.",
-                "content": {
-                    "application/problem+json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
-            },
-            "404": {
-                "description": "No short URL was found for provided short code.",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
-            },
-            "default": {
-                "description": "Unexpected error.",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

docs/swagger/paths/v1_tags.json

@@ -5,7 +5,7 @@
             "Tags"
         ],
         "summary": "List existing tags",
-        "description": "Returns the list of all tags used in any short URL, ordered by name",
+        "description": "Returns the list of all tags used in any short URL",
         "security": [
             {
                 "ApiKey": []
@@ -17,7 +17,8 @@
             },
             {
                 "name": "withStats",
-                "description": "Whether you want to include also a list with general stats by tag or not.",
+                "deprecated": true,
+                "description": "**[Deprecated]** Use [GET /tags/stats](#/Tags/tagsWithStats) endpoint to get tags with their stats.",
                 "in": "query",
                 "required": false,
                 "schema": {
@@ -27,6 +28,46 @@
                         "false"
                     ]
                 }
+            },
+            {
+                "name": "page",
+                "in": "query",
+                "description": "The page to display. Defaults to 1",
+                "required": false,
+                "schema": {
+                    "type": "number"
+                }
+            },
+            {
+                "name": "itemsPerPage",
+                "in": "query",
+                "description": "The amount of items to return on every page. Defaults to all the items",
+                "required": false,
+                "schema": {
+                    "type": "number"
+                }
+            },
+            {
+                "name": "searchTerm",
+                "in": "query",
+                "description": "A query used to filter results by searching for it on the tag name.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "orderBy",
+                "in": "query",
+                "description": "To determine how to order the results.",
+                "required": false,
+                "schema": {
+                    "type": "string",
+                    "enum": [
+                        "tag-ASC",
+                        "tag-DESC"
+                    ]
+                }
             }
         ],
         "responses": {
@@ -53,122 +94,28 @@
                                             "items": {
                                                 "$ref": "../definitions/TagInfo.json"
                                             }
+                                        },
+                                        "pagination": {
+                                            "$ref": "../definitions/Pagination.json"
                                         }
                                     }
                                 }
                             }
                         },
-                        "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
-                                            }
-                                        ]
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "default": {
-                "description": "Unexpected error.",
-                "content": {
-                    "application/problem+json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
-            }
-        }
-    },
-
-    "post": {
-        "deprecated": true,
-        "operationId": "createTags",
-        "tags": [
-            "Tags"
-        ],
-        "summary": "Create tags",
-        "description": "Provided a list of tags, creates all that do not yet exist<br />This endpoint is deprecated, as tags are automatically created while creating a short URL",
-        "security": [
-            {
-                "ApiKey": []
-            }
-        ],
-        "parameters": [
-            {
-                "$ref": "../parameters/version.json"
-            }
-        ],
-        "requestBody": {
-            "description": "Request body.",
-            "required": true,
-            "content": {
-                "application/json": {
-                    "schema": {
-                        "type": "object",
-                        "required": [
-                            "tags"
-                        ],
-                        "properties": {
+                        "example": {
                             "tags": {
-                                "description": "The list of tag names to create",
-                                "type": "array",
-                                "items": {
-                                    "type": "string"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "responses": {
-            "200": {
-                "description": "The list of tags",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "type": "object",
-                            "properties": {
-                                "tags": {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "type": "string"
-                                            }
-                                        }
-                                    }
+                                "data": [
+                                    "games",
+                                    "php",
+                                    "shlink",
+                                    "tech"
+                                ],
+                                "pagination": {
+                                    "currentPage": 5,
+                                    "pagesCount": 10,
+                                    "itemsPerPage": 4,
+                                    "itemsInCurrentPage": 4,
+                                    "totalItems": 38
                                 }
                             }
                         }

docs/swagger/paths/v2_tags_stats.json

@@ -0,0 +1,127 @@
+{
+    "get": {
+        "operationId": "tagsWithStats",
+        "tags": [
+            "Tags"
+        ],
+        "summary": "Get tags with stats",
+        "description": "Returns the list of all tags used in any short URL, together with the amount of short URLs and visits for it",
+        "security": [
+            {
+                "ApiKey": []
+            }
+        ],
+        "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
+            {
+                "name": "page",
+                "in": "query",
+                "description": "The page to display. Defaults to 1",
+                "required": false,
+                "schema": {
+                    "type": "number"
+                }
+            },
+            {
+                "name": "itemsPerPage",
+                "in": "query",
+                "description": "The amount of items to return on every page. Defaults to all the items",
+                "required": false,
+                "schema": {
+                    "type": "number"
+                }
+            },
+            {
+                "name": "searchTerm",
+                "in": "query",
+                "description": "A query used to filter results by searching for it on the tag name.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "orderBy",
+                "in": "query",
+                "description": "To determine how to order the results.<br /><br />**Important!** Ordering by `shortUrlsCount` or `visitsCount` has a [known performance issue](https://github.com/shlinkio/shlink/issues/1346) which makes loading a subset of the list take as much as loading the whole list.<br />If you plan to order by any of these fields, it's worth loading the whole list with no pagination.",
+                "required": false,
+                "schema": {
+                    "type": "string",
+                    "enum": [
+                        "tag-ASC",
+                        "tag-DESC",
+                        "shortUrlsCount-ASC",
+                        "shortUrlsCount-DESC",
+                        "visitsCount-ASC",
+                        "visitsCount-DESC"
+                    ]
+                }
+            }
+        ],
+        "responses": {
+            "200": {
+                "description": "The list of tags",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "tags": {
+                                    "type": "object",
+                                    "required": ["data"],
+                                    "properties": {
+                                        "data": {
+                                            "description": "The tag stats will be returned only if the withStats param was provided with value 'true'",
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "../definitions/TagInfo.json"
+                                            }
+                                        },
+                                        "pagination": {
+                                            "$ref": "../definitions/Pagination.json"
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "example": {
+                            "tags": {
+                                "data": [
+                                    {
+                                        "tag": "games",
+                                        "shortUrlsCount": 10,
+                                        "visitsCount": 521
+                                    },
+                                    {
+                                        "tag": "shlink",
+                                        "shortUrlsCount": 7,
+                                        "visitsCount": 1087
+                                    }
+                                ],
+                                "pagination": {
+                                    "currentPage": 5,
+                                    "pagesCount": 5,
+                                    "itemsPerPage": 10,
+                                    "itemsInCurrentPage": 2,
+                                    "totalItems": 42
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "default": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/problem+json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

docs/swagger/paths/v2_visits_non-orphan.json

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

docs/swagger/paths/{shortCode}_qr-code_{size}.json

@@ -1,66 +0,0 @@
-{
-    "get": {
-        "operationId": "shortUrlQrCodeSize",
-        "deprecated": true,
-        "tags": [
-            "URL Shortener"
-        ],
-        "summary": "Short URL QR code",
-        "description": "Generates a QR code image pointing to a short URL",
-        "parameters": [
-            {
-                "name": "shortCode",
-                "in": "path",
-                "description": "The short code to resolve.",
-                "required": true,
-                "schema": {
-                    "type": "string"
-                }
-            },
-            {
-                "name": "size",
-                "in": "path",
-                "description": "The size of the image to be returned.",
-                "required": true,
-                "schema": {
-                    "type": "integer",
-                    "minimum": 50,
-                    "maximum": 1000,
-                    "default": 300
-                }
-            },
-            {
-                "name": "format",
-                "in": "query",
-                "description": "The format for the QR code image, being valid values png and svg. Not providing the param or providing any other value will fall back to png.",
-                "required": false,
-                "schema": {
-                    "type": "string",
-                    "enum": [
-                        "png",
-                        "svg"
-                    ]
-                }
-            }
-        ],
-        "responses": {
-            "200": {
-                "description": "QR code in PNG format",
-                "content": {
-                    "image/png": {
-                        "schema": {
-                            "type": "string",
-                            "format": "binary"
-                        }
-                    },
-                    "image/svg+xml": {
-                        "schema": {
-                            "type": "string",
-                            "format": "binary"
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

docs/swagger/swagger.json

@@ -78,13 +78,13 @@
         "/rest/v{version}/short-urls/{shortCode}": {
             "$ref": "paths/v1_short-urls_{shortCode}.json"
         },
-        "/rest/v{version}/short-urls/{shortCode}/tags": {
-            "$ref": "paths/v1_short-urls_{shortCode}_tags.json"
-        },
 
         "/rest/v{version}/tags": {
             "$ref": "paths/v1_tags.json"
         },
+        "/rest/v{version}/tags/stats": {
+            "$ref": "paths/v2_tags_stats.json"
+        },
 
         "/rest/v{version}/visits": {
             "$ref": "paths/v2_visits.json"
@@ -98,6 +98,9 @@
         "/rest/v{version}/visits/orphan": {
             "$ref": "paths/v2_visits_orphan.json"
         },
+        "/rest/v{version}/visits/non-orphan": {
+            "$ref": "paths/v2_visits_non-orphan.json"
+        },
 
         "/rest/v{version}/domains": {
             "$ref": "paths/v2_domains.json"
@@ -122,9 +125,6 @@
         },
         "/{shortCode}/qr-code": {
             "$ref": "paths/{shortCode}_qr-code.json"
-        },
-        "/{shortCode}/qr-code/{size}": {
-            "$ref": "paths/{shortCode}_qr-code_{size}.json"
         }
     }
 }

infection-api.json

@@ -7,6 +7,7 @@
     "timeout": 5,
     "logs": {
         "text": "build/infection-api/infection-log.txt",
+        "html": "build/infection-api/infection-log.html",
         "summary": "build/infection-api/summary-log.txt",
         "debug": "build/infection-api/debug-log.txt"
     },

infection-db.json

@@ -7,6 +7,7 @@
     "timeout": 5,
     "logs": {
         "text": "build/infection-db/infection-log.txt",
+        "html": "build/infection-db/infection-log.html",
         "summary": "build/infection-db/summary-log.txt",
         "debug": "build/infection-db/debug-log.txt"
     },

infection.json

@@ -7,10 +7,11 @@
     "timeout": 5,
     "logs": {
         "text": "build/infection-unit/infection-log.txt",
+        "html": "build/infection-unit/infection-log.html",
         "summary": "build/infection-unit/summary-log.txt",
         "debug": "build/infection-unit/debug-log.txt",
-        "badge": {
-            "branch": "develop"
+        "stryker": {
+            "report": "develop"
         }
     },
     "tmpDir": "build/infection-unit/temp",

module/CLI/config/cli.config.php

@@ -22,7 +22,6 @@ return [
             Command\Api\ListKeysCommand::NAME => Command\Api\ListKeysCommand::class,
 
             Command\Tag\ListTagsCommand::NAME => Command\Tag\ListTagsCommand::class,
-            Command\Tag\CreateTagCommand::NAME => Command\Tag\CreateTagCommand::class,
             Command\Tag\RenameTagCommand::NAME => Command\Tag\RenameTagCommand::class,
             Command\Tag\DeleteTagsCommand::NAME => Command\Tag\DeleteTagsCommand::class,
 

module/CLI/config/dependencies.config.php

@@ -53,7 +53,6 @@ return [
             Command\Api\ListKeysCommand::class => ConfigAbstractFactory::class,
 
             Command\Tag\ListTagsCommand::class => ConfigAbstractFactory::class,
-            Command\Tag\CreateTagCommand::class => ConfigAbstractFactory::class,
             Command\Tag\RenameTagCommand::class => ConfigAbstractFactory::class,
             Command\Tag\DeleteTagsCommand::class => ConfigAbstractFactory::class,
 
@@ -101,7 +100,6 @@ return [
         Command\Api\ListKeysCommand::class => [ApiKeyService::class],
 
         Command\Tag\ListTagsCommand::class => [TagService::class],
-        Command\Tag\CreateTagCommand::class => [TagService::class],
         Command\Tag\RenameTagCommand::class => [TagService::class],
         Command\Tag\DeleteTagsCommand::class => [TagService::class],
 

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

@@ -6,11 +6,11 @@ namespace Shlinkio\Shlink\CLI\Command\Api;
 
 use Cake\Chronos\Chronos;
 use Shlinkio\Shlink\CLI\ApiKey\RoleResolverInterface;
-use Shlinkio\Shlink\CLI\Command\BaseCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Rest\ApiKey\Role;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,7 +19,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 use function Shlinkio\Shlink\Core\arrayToString;
 use function sprintf;
 
-class GenerateKeyCommand extends BaseCommand
+class GenerateKeyCommand extends Command
 {
     public const NAME = 'api-key:generate';
 
@@ -63,7 +63,7 @@ class GenerateKeyCommand extends BaseCommand
                 InputOption::VALUE_REQUIRED,
                 'The name by which this API key will be known.',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'expiration-date',
                 'e',
                 InputOption::VALUE_REQUIRED,
@@ -86,7 +86,7 @@ class GenerateKeyCommand extends BaseCommand
 
     protected function execute(InputInterface $input, OutputInterface $output): ?int
     {
-        $expirationDate = $this->getOptionWithDeprecatedFallback($input, 'expiration-date');
+        $expirationDate = $input->getOption('expiration-date');
         $apiKey = $this->apiKeyService->create(
             isset($expirationDate) ? Chronos::parse($expirationDate) : null,
             $input->getOption('name'),

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

@@ -4,12 +4,12 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
-use Shlinkio\Shlink\CLI\Command\BaseCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Rest\ApiKey\Role;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,7 +19,7 @@ use function Functional\map;
 use function implode;
 use function sprintf;
 
-class ListKeysCommand extends BaseCommand
+class ListKeysCommand extends Command
 {
     private const ERROR_STRING_PATTERN = '<fg=red>%s</>';
     private const SUCCESS_STRING_PATTERN = '<info>%s</info>';
@@ -37,7 +37,7 @@ class ListKeysCommand extends BaseCommand
         $this
             ->setName(self::NAME)
             ->setDescription('Lists all the available API keys.')
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'enabled-only',
                 'e',
                 InputOption::VALUE_NONE,
@@ -47,7 +47,7 @@ class ListKeysCommand extends BaseCommand
 
     protected function execute(InputInterface $input, OutputInterface $output): ?int
     {
-        $enabledOnly = $this->getOptionWithDeprecatedFallback($input, 'enabled-only');
+        $enabledOnly = $input->getOption('enabled-only');
 
         $rows = map($this->apiKeyService->listKeys($enabledOnly), function (ApiKey $apiKey) use ($enabledOnly) {
             $expiration = $apiKey->getExpirationDate();

module/CLI/src/Command/BaseCommand.php

@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Command;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-
-use function method_exists;
-use function Shlinkio\Shlink\Core\kebabCaseToCamelCase;
-use function sprintf;
-use function str_contains;
-
-/** @deprecated */
-abstract class BaseCommand extends Command
-{
-    /**
-     * @param string|string[]|bool|null $default
-     */
-    protected function addOptionWithDeprecatedFallback(
-        string $name,
-        ?string $shortcut = null,
-        ?int $mode = null,
-        string $description = '',
-        bool|string|array|null $default = null,
-    ): self {
-        $this->addOption($name, $shortcut, $mode, $description, $default);
-
-        if (str_contains($name, '-')) {
-            $camelCaseName = kebabCaseToCamelCase($name);
-            $this->addOption($camelCaseName, null, $mode, sprintf('[DEPRECATED] Alias for "%s".', $name), $default);
-        }
-
-        return $this;
-    }
-
-    // @phpstan-ignore-next-line
-    protected function getOptionWithDeprecatedFallback(InputInterface $input, string $name) // phpcs:ignore
-    {
-        $rawInput = method_exists($input, '__toString') ? $input->__toString() : '';
-        $camelCaseName = kebabCaseToCamelCase($name);
-        $resolvedOptionName = str_contains($rawInput, $camelCaseName) ? $camelCaseName : $name;
-
-        return $input->getOption($resolvedOptionName);
-    }
-}

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

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
-use Shlinkio\Shlink\CLI\Command\BaseCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
@@ -12,6 +11,7 @@ use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
 use Shlinkio\Shlink\Core\ShortUrl\Helper\ShortUrlStringifierInterface;
 use Shlinkio\Shlink\Core\Validation\ShortUrlInputFilter;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -22,11 +22,9 @@ use function array_map;
 use function Functional\curry;
 use function Functional\flatten;
 use function Functional\unique;
-use function method_exists;
 use function sprintf;
-use function str_contains;
 
-class CreateShortUrlCommand extends BaseCommand
+class CreateShortUrlCommand extends Command
 {
     public const NAME = 'short-url:create';
 
@@ -45,7 +43,6 @@ class CreateShortUrlCommand extends BaseCommand
     {
         $this
             ->setName(self::NAME)
-            ->setAliases(['short-url:generate']) // Deprecated
             ->setDescription('Generates a short URL for provided long URL and returns it')
             ->addArgument('longUrl', InputArgument::REQUIRED, 'The long URL to parse')
             ->addOption(
@@ -54,33 +51,33 @@ class CreateShortUrlCommand extends BaseCommand
                 InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
                 'Tags to apply to the new short URL',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'valid-since',
                 's',
                 InputOption::VALUE_REQUIRED,
                 'The date from which this short URL will be valid. '
                 . 'If someone tries to access it before this date, it will not be found.',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'valid-until',
                 'u',
                 InputOption::VALUE_REQUIRED,
                 'The date until which this short URL will be valid. '
                 . 'If someone tries to access it after this date, it will not be found.',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'custom-slug',
                 'c',
                 InputOption::VALUE_REQUIRED,
                 'If provided, this slug will be used instead of generating a short code',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'max-visits',
                 'm',
                 InputOption::VALUE_REQUIRED,
                 'This will limit the number of visits for this short URL.',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'find-if-exists',
                 'f',
                 InputOption::VALUE_NONE,
@@ -92,7 +89,7 @@ class CreateShortUrlCommand extends BaseCommand
                 InputOption::VALUE_REQUIRED,
                 'The domain to which this short URL will be attached.',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'short-code-length',
                 'l',
                 InputOption::VALUE_REQUIRED,
@@ -104,12 +101,6 @@ class CreateShortUrlCommand extends BaseCommand
                 InputOption::VALUE_NONE,
                 'Forces the long URL to be validated, regardless what is globally configured.',
             )
-            ->addOption(
-                'no-validate-url',
-                null,
-                InputOption::VALUE_NONE,
-                '[DEPRECATED] Forces the long URL to not be validated, regardless what is globally configured.',
-            )
             ->addOption(
                 'crawlable',
                 'r',
@@ -161,25 +152,19 @@ class CreateShortUrlCommand extends BaseCommand
 
         $explodeWithComma = curry('explode')(',');
         $tags = unique(flatten(array_map($explodeWithComma, $input->getOption('tags'))));
-        $customSlug = $this->getOptionWithDeprecatedFallback($input, 'custom-slug');
-        $maxVisits = $this->getOptionWithDeprecatedFallback($input, 'max-visits');
-        $shortCodeLength = $this->getOptionWithDeprecatedFallback(
-            $input,
-            'short-code-length',
-        ) ?? $this->defaultShortCodeLength;
-        $doValidateUrl = $this->doValidateUrl($input);
+        $customSlug = $input->getOption('custom-slug');
+        $maxVisits = $input->getOption('max-visits');
+        $shortCodeLength = $input->getOption('short-code-length') ?? $this->defaultShortCodeLength;
+        $doValidateUrl = $input->getOption('validate-url');
 
         try {
             $shortUrl = $this->urlShortener->shorten(ShortUrlMeta::fromRawData([
                 ShortUrlInputFilter::LONG_URL => $longUrl,
-                ShortUrlInputFilter::VALID_SINCE => $this->getOptionWithDeprecatedFallback($input, 'valid-since'),
-                ShortUrlInputFilter::VALID_UNTIL => $this->getOptionWithDeprecatedFallback($input, 'valid-until'),
+                ShortUrlInputFilter::VALID_SINCE => $input->getOption('valid-since'),
+                ShortUrlInputFilter::VALID_UNTIL => $input->getOption('valid-until'),
                 ShortUrlInputFilter::CUSTOM_SLUG => $customSlug,
                 ShortUrlInputFilter::MAX_VISITS => $maxVisits !== null ? (int) $maxVisits : null,
-                ShortUrlInputFilter::FIND_IF_EXISTS => $this->getOptionWithDeprecatedFallback(
-                    $input,
-                    'find-if-exists',
-                ),
+                ShortUrlInputFilter::FIND_IF_EXISTS => $input->getOption('find-if-exists'),
                 ShortUrlInputFilter::DOMAIN => $input->getOption('domain'),
                 ShortUrlInputFilter::SHORT_CODE_LENGTH => $shortCodeLength,
                 ShortUrlInputFilter::VALIDATE_URL => $doValidateUrl,
@@ -199,20 +184,6 @@ class CreateShortUrlCommand extends BaseCommand
         }
     }
 
-    private function doValidateUrl(InputInterface $input): ?bool
-    {
-        $rawInput = method_exists($input, '__toString') ? $input->__toString() : '';
-
-        if (str_contains($rawInput, '--no-validate-url')) {
-            return false;
-        }
-        if (str_contains($rawInput, '--validate-url')) {
-            return true;
-        }
-
-        return null;
-    }
-
     private function getIO(InputInterface $input, OutputInterface $output): SymfonyStyle
     {
         return $this->io ?? ($this->io = new SymfonyStyle($input, $output));

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

@@ -11,7 +11,6 @@ use Shlinkio\Shlink\Common\Paginator\Paginator;
 use Shlinkio\Shlink\Common\Paginator\Util\PagerfantaUtilsTrait;
 use Shlinkio\Shlink\Common\Rest\DataTransformerInterface;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
-use Shlinkio\Shlink\Core\Model\ShortUrlsOrdering;
 use Shlinkio\Shlink\Core\Model\ShortUrlsParams;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Shlinkio\Shlink\Core\Validation\ShortUrlsParamsInputFilter;
@@ -52,7 +51,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
                 'The first page to list (10 items per page unless "--all" is provided).',
                 '1',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'search-term',
                 'st',
                 InputOption::VALUE_REQUIRED,
@@ -64,14 +63,20 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
                 InputOption::VALUE_REQUIRED,
                 'A comma-separated list of tags to filter results.',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
+                'including-all-tags',
+                'i',
+                InputOption::VALUE_NONE,
+                'If tags is provided, returns only short URLs having ALL tags.',
+            )
+            ->addOption(
                 'order-by',
                 'o',
                 InputOption::VALUE_REQUIRED,
                 'The field from which you want to order by. '
-                    . 'Define ordering dir by passing ASC or DESC after "," or "-".',
+                    . 'Define ordering dir by passing ASC or DESC after "-" or ",".',
             )
-            ->addOptionWithDeprecatedFallback(
+            ->addOption(
                 'show-tags',
                 null,
                 InputOption::VALUE_NONE,
@@ -113,8 +118,11 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
         $io = new SymfonyStyle($input, $output);
 
         $page = (int) $input->getOption('page');
-        $searchTerm = $this->getOptionWithDeprecatedFallback($input, 'search-term');
+        $searchTerm = $input->getOption('search-term');
         $tags = $input->getOption('tags');
+        $tagsMode = $input->getOption('including-all-tags') === true
+            ? ShortUrlsParams::TAGS_MODE_ALL
+            : ShortUrlsParams::TAGS_MODE_ANY;
         $tags = ! empty($tags) ? explode(',', $tags) : [];
         $all = $input->getOption('all');
         $startDate = $this->getStartDateOption($input, $output);
@@ -125,7 +133,8 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
         $data = [
             ShortUrlsParamsInputFilter::SEARCH_TERM => $searchTerm,
             ShortUrlsParamsInputFilter::TAGS => $tags,
-            ShortUrlsOrdering::ORDER_BY => $orderBy,
+            ShortUrlsParamsInputFilter::TAGS_MODE => $tagsMode,
+            ShortUrlsParamsInputFilter::ORDER_BY => $orderBy,
             ShortUrlsParamsInputFilter::START_DATE => $startDate?->toAtomString(),
             ShortUrlsParamsInputFilter::END_DATE => $endDate?->toAtomString(),
         ];
@@ -175,7 +184,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
 
     private function processOrderBy(InputInterface $input): ?string
     {
-        $orderBy = $this->getOptionWithDeprecatedFallback($input, 'order-by');
+        $orderBy = $input->getOption('order-by');
         if (empty($orderBy)) {
             return null;
         }
@@ -195,7 +204,7 @@ class ListShortUrlsCommand extends AbstractWithDateRangeCommand
             'Date created' => $pickProp('dateCreated'),
             'Visits count' => $pickProp('visitsCount'),
         ];
-        if ($this->getOptionWithDeprecatedFallback($input, 'show-tags')) {
+        if ($input->getOption('show-tags')) {
             $columnsMap['Tags'] = static fn (array $shortUrl): string => implode(', ', $shortUrl['tags']);
         }
         if ($input->getOption('show-api-key')) {

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

@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Command\Tag;
-
-use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Core\Tag\TagServiceInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
-/** @deprecated */
-class CreateTagCommand extends Command
-{
-    public const NAME = 'tag:create';
-
-    public function __construct(private TagServiceInterface $tagService)
-    {
-        parent::__construct();
-    }
-
-    protected function configure(): void
-    {
-        $this
-            ->setName(self::NAME)
-            ->setDescription('[Deprecated] Creates one or more tags.')
-            ->addOption(
-                'name',
-                't',
-                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
-                'The name of the tags to create',
-            );
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): ?int
-    {
-        $io = new SymfonyStyle($input, $output);
-        $tagNames = $input->getOption('name');
-
-        if (empty($tagNames)) {
-            $io->warning('You have to provide at least one tag name');
-            return ExitCodes::EXIT_WARNING;
-        }
-
-        $this->tagService->createTags($tagNames);
-        $io->success('Tags properly created');
-        return ExitCodes::EXIT_SUCCESS;
-    }
-}

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

@@ -7,6 +7,7 @@ namespace Shlinkio\Shlink\CLI\Command\Tag;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Core\Tag\Model\TagInfo;
+use Shlinkio\Shlink\Core\Tag\Model\TagsParams;
 use Shlinkio\Shlink\Core\Tag\TagServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -38,15 +39,14 @@ class ListTagsCommand extends Command
 
     private function getTagsRows(): array
     {
-        $tags = $this->tagService->tagsInfo();
+        $tags = $this->tagService->tagsInfo(TagsParams::fromRawData([]))->getCurrentPageResults();
         if (empty($tags)) {
             return [['No tags found', '-', '-']];
         }
 
         return map(
             $tags,
-            static fn (TagInfo $tagInfo) =>
-                [$tagInfo->tag()->__toString(), $tagInfo->shortUrlsCount(), $tagInfo->visitsCount()],
+            static fn (TagInfo $tagInfo) => [$tagInfo->tag(), $tagInfo->shortUrlsCount(), $tagInfo->visitsCount()],
         );
     }
 }

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

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\CLI\Command\Util;
 
 use Cake\Chronos\Chronos;
-use Shlinkio\Shlink\CLI\Command\BaseCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -14,7 +14,7 @@ use Throwable;
 use function is_string;
 use function sprintf;
 
-abstract class AbstractWithDateRangeCommand extends BaseCommand
+abstract class AbstractWithDateRangeCommand extends Command
 {
     private const START_DATE = 'start-date';
     private const END_DATE = 'end-date';
@@ -23,18 +23,8 @@ abstract class AbstractWithDateRangeCommand extends BaseCommand
     {
         $this->doConfigure();
         $this
-            ->addOptionWithDeprecatedFallback(
-                self::START_DATE,
-                's',
-                InputOption::VALUE_REQUIRED,
-                $this->getStartDateDesc(self::START_DATE),
-            )
-            ->addOptionWithDeprecatedFallback(
-                self::END_DATE,
-                'e',
-                InputOption::VALUE_REQUIRED,
-                $this->getEndDateDesc(self::END_DATE),
-            );
+            ->addOption(self::START_DATE, 's', InputOption::VALUE_REQUIRED, $this->getStartDateDesc(self::START_DATE))
+            ->addOption(self::END_DATE, 'e', InputOption::VALUE_REQUIRED, $this->getEndDateDesc(self::END_DATE));
     }
 
     protected function getStartDateOption(InputInterface $input, OutputInterface $output): ?Chronos
@@ -49,7 +39,7 @@ abstract class AbstractWithDateRangeCommand extends BaseCommand
 
     private function getDateOption(InputInterface $input, OutputInterface $output, string $key): ?Chronos
     {
-        $value = $this->getOptionWithDeprecatedFallback($input, $key);
+        $value = $input->getOption($key);
         if (empty($value) || ! is_string($value)) {
             return null;
         }