Merge pull request #619 from acelaya-forks/feature/1.21.2

Feature/1.21.2

.env.dist

@@ -1,15 +0,0 @@
-# Application
-APP_ENV=
-SECRET_KEY=
-SHORTENED_URL_SCHEMA=
-SHORTENED_URL_HOSTNAME=
-SHORTCODE_CHARS=
-
-# Language
-DEFAULT_LOCALE=
-CLI_LOCALE=
-
-# Database
-DB_USER=
-DB_PASSWORD=
-DB_NAME=

.gitattributes

@@ -9,7 +9,6 @@
 /module/PreviewGenerator/test-db export-ignore
 /module/Rest/test export-ignore
 /module/Rest/test-api export-ignore
-.env.dist export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 .phpstorm.meta.php export-ignore

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: ['acelaya']
+custom: ['https://acel.me/donate']

.github/ISSUE_TEMPLATE.md

@@ -2,5 +2,5 @@
 Before opening an issue, just take into account that this is a completely free of charge open source project.
 I'm always happy to help and provide support, but some understanding will be required.
 I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
-Try to be polite, and understand it is impossible for a project to cover all use cases.
+Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
 -->

.github/ISSUE_TEMPLATE/Bug.md

@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Something on shlink is broken or not working as documented?
+labels: bug
+---
+
+<!--
+Before opening an issue, just take into account that this is a completely free of charge open source project.
+I'm always happy to help and provide support, but some understanding will be required.
+I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
+Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
+
+With that said, please fill in the information requested next. More information might be requested next (like logs or system configs).
+-->
+
+#### How Shlink is set-up
+
+* 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
+* Database engine used: MySQL|MariaDB|PostgreSQL|SQLite (x.y.z)
+
+#### Summary
+
+<!-- Provide a summary describing the problem you are experiencing. -->
+
+#### Current behavior
+
+<!-- How is it actually behaving (and it shouldn't)? -->
+
+#### Expected behavior
+
+<!-- How did you expected to behave? -->
+
+#### How to reproduce
+
+<!-- Provide steps to reproduce the bug. -->

.github/ISSUE_TEMPLATE/Feature_Request.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Do you find shlink is missing some important feature that would make it more useful?
+labels: feature
+---
+
+<!--
+Before opening an issue, just take into account that this is a completely free of charge open source project.
+I'm always happy to help and provide support, but some understanding will be required.
+I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
+Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
+
+With that said, please fill in the information requested next. More information might be requested next (like logs or system configs).
+-->
+
+#### Summary
+
+<!-- Describe the new feature you would like to request. -->

.github/ISSUE_TEMPLATE/Question_Support.md

@@ -0,0 +1,25 @@
+---
+name: Question - Support
+about: Do you have a problem setting up or using shlink?
+labels: question
+---
+
+<!--
+Before opening an issue, just take into account that this is a completely free of charge open source project.
+I'm always happy to help and provide support, but some understanding will be required.
+I do this in my own free time, so expect some delays when implementing new features and fixing bugs, and don't take it personal if an issue gets eventually closed.
+Try to be polite, and understand it is impossible for an OSS project to cover all use cases.
+
+With that said, please fill in the information requested next. More information might be requested next (like logs or system configs).
+-->
+
+#### How Shlink is set-up
+
+* 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
+* Database engine used: MySQL|MariaDB|PostgreSQL|SQLite (x.y.z)
+
+#### Summary
+
+<!-- Describe the issue you are facing here. -->

.gitignore

@@ -4,7 +4,6 @@ build
 composer.lock
 composer.phar
 vendor/
-.env
 data/database.sqlite
 data/shlink-tests.db
 data/GeoLite2-City.mmdb

.travis.yml

@@ -7,17 +7,16 @@ branches:
 php:
   - '7.2'
   - '7.3'
-  - '7.4snapshot'
-
-matrix:
-  allow_failures:
-    - php: '7.4snapshot'
 
 services:
   - mysql
   - postgresql
   - docker
 
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
 before_install:
   - echo 'extension = apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - yes | pecl install swoole
@@ -25,7 +24,7 @@ before_install:
 
 install:
   - composer self-update
-  - composer install --no-interaction
+  - composer install --no-interaction --prefer-dist
 
 before_script:
   - mysql -e 'CREATE DATABASE shlink_test;'
@@ -39,7 +38,8 @@ script:
 
 after_success:
   - rm -f build/clover.xml
-  - phpdbg -qrr vendor/bin/phpcov merge build --clover build/clover.xml
+  - wget https://phar.phpunit.de/phpcov-6.0.1.phar
+  - phpdbg -qrr phpcov-6.0.1.phar merge build --clover build/clover.xml
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover build/clover.xml
 

CHANGELOG.md

@@ -4,6 +4,266 @@ 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).
 
+## 1.21.2 - 2020-01-12
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#614](https://github.com/shlinkio/shlink/issues/614) Fixed `OPTIONS` requests including the `Origin` header not always returning an empty body with status 2xx.
+* [#615](https://github.com/shlinkio/shlink/issues/615) Fixed query args with no value being lost from the long URL when users are redirected.
+
+
+## 1.21.1 - 2020-01-02
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#596](https://github.com/shlinkio/shlink/issues/596) Fixed error when trying to download GeoLite2 database due to changes on how to get the database files.
+
+
+## 1.21.0 - 2019-12-29
+
+#### Added
+
+* [#118](https://github.com/shlinkio/shlink/issues/118) API errors now implement the [problem details](https://tools.ietf.org/html/rfc7807) standard.
+
+    In order to make it backwards compatible, two things have been done:
+
+    * Both the old `error` and `message` properties have been kept on error response, containing the same values as the `type` and `detail` properties respectively.
+    * The API `v2` has been enabled. If an error occurs when calling the API with this version, the `error` and `message` properties will not be returned.
+
+    > After Shlink v2 is released, both API versions will behave like API v2.
+
+* [#575](https://github.com/shlinkio/shlink/issues/575) Added support to filter short URL lists by date ranges.
+
+    * The `GET /short-urls` endpoint now accepts the `startDate` and `endDate` query params.
+    * The `short-urls:list` command now allows `--startDate` and `--endDate` flags to be optionally provided.
+
+* [#338](https://github.com/shlinkio/shlink/issues/338) Added support to asynchronously notify external services via webhook, only when shlink is served with swoole.
+
+    Configured webhooks will receive a POST request every time a URL receives a visit, including information about the short URL and the visit.
+
+    The payload will look like this:
+
+    ```json
+    {
+      "shortUrl": {},
+      "visit": {}
+    }
+    ```
+
+    > The `shortUrl` and `visit` props have the same shape as it is defined in the [API spec](https://api-spec.shlink.io).
+
+#### Changed
+
+* [#492](https://github.com/shlinkio/shlink/issues/492) Updated to monolog 2, together with other dependencies, like Symfony 5 and infection-php.
+* [#527](https://github.com/shlinkio/shlink/issues/527) Increased minimum required mutation score for unit tests to 80%.
+* [#557](https://github.com/shlinkio/shlink/issues/557) Added a few php.ini configs for development and production docker images.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#570](https://github.com/shlinkio/shlink/issues/570) Fixed shlink version generated for docker images when building from `develop` branch.
+
+
+## 1.20.3 - 2019-12-23
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#585](https://github.com/shlinkio/shlink/issues/585) Fixed `PHP Fatal error: Uncaught Error: Class 'Shlinkio\Shlink\LocalLockFactory' not found` happening when running some CLI commands.
+
+
+## 1.20.2 - 2019-12-06
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#561](https://github.com/shlinkio/shlink/issues/561) Fixed `db:migrate` command failing because yaml extension is not installed, which makes config file not to be readable.
+* [#562](https://github.com/shlinkio/shlink/issues/562) Fixed internal server error being returned when renaming a tag to another tag's name. Now a meaningful API error with status 409 is returned.
+* [#555](https://github.com/shlinkio/shlink/issues/555) Fixed internal server error being returned when invalid dates are provided for new short URLs. Now a 400 is returned, as intended.
+
+
+## 1.20.1 - 2019-11-17
+
+#### Added
+
+* [#519](https://github.com/shlinkio/shlink/issues/519) Documented how to customize web workers and task workers for the docker image.
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#512](https://github.com/shlinkio/shlink/issues/512) Fixed query params not being properly forwarded from short URL to long one.
+* [#540](https://github.com/shlinkio/shlink/issues/540) Fixed errors thrown when creating short URLs if the original URL has an internationalized domain name and URL validation is enabled.
+* [#528](https://github.com/shlinkio/shlink/issues/528) Ensured `db:create` and `db:migrate` commands do not silently fail when run as part of `install` or `update`.
+* [#518](https://github.com/shlinkio/shlink/issues/518) Fixed service which updates Geolite db file to use a local lock instead of a shared one, since every shlink instance holds its own db instance.
+
+
+## 1.20.0 - 2019-11-02
+
+#### Added
+
+* [#491](https://github.com/shlinkio/shlink/issues/491) Added improved short code generation logic.
+
+    Now, short codes are truly random, which removes the guessability factor existing in previous versions.
+
+    Generated short codes have 5 characters, and shlink makes sure they keep unique, while making it backwards-compatible.
+
+* [#418](https://github.com/shlinkio/shlink/issues/418) and [#419](https://github.com/shlinkio/shlink/issues/419) Added support to redirect any 404 error to a custom URL.
+
+    It was already possible to configure this but only for invalid short URLs. Shlink now also support configuring redirects for the base URL and any other kind of "not found" error.
+
+    The three URLs can be different, and it is already possible to pass them to the docker image via configuration or env vars.
+
+    The installer also asks for these two new configuration options.
+
+* [#497](https://github.com/shlinkio/shlink/issues/497) Officially added support for MariaDB.
+
+#### Changed
+
+* [#458](https://github.com/shlinkio/shlink/issues/458) Updated coding styles to use [shlinkio/php-coding-standard](https://github.com/shlinkio/php-coding-standard) v2.0.0.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#507](https://github.com/shlinkio/shlink/issues/507) Fixed error with too long original URLs by increasing size to the maximum value (2048) based on [the standard](https://stackoverflow.com/a/417184).
+* [#502](https://github.com/shlinkio/shlink/issues/502) Fixed error when providing the port as part of the domain on short URLs.
+* [#509](https://github.com/shlinkio/shlink/issues/509) Fixed error when trying to generate a QR code for a short URL which uses a custom domain.
+* [#522](https://github.com/shlinkio/shlink/issues/522) Highly mitigated errors thrown when lots of short URLs are created concurrently including new and existing tags.
+
+
+## 1.19.0 - 2019-10-05
+
+#### Added
+
+* [#482](https://github.com/shlinkio/shlink/issues/482) Added support to serve shlink under a sub path.
+
+    The `router.base_path` config option can be defined now to set the base path from which shlink is served.
+
+    ```php
+    return [
+        'router' => [
+            'base_path' => '/foo/bar',
+        ],
+    ];
+    ```
+
+    This option will also be available on shlink-installer 1.3.0, so the installer will ask for it. It can also be provided for the docker image as the `BASE_PATH` env var.
+
+* [#479](https://github.com/shlinkio/shlink/issues/479) Added preliminary support for multiple domains.
+
+    Endpoints and commands which create short URLs support providing the `domain` now (via query param or CLI flag). If not provided, the short URLs will still be "attached" to the default domain.
+
+    Custom slugs can be created on multiple domains, allowing to share links like `https://doma.in/my-compaign` and `https://example.com/my-campaign`, under the same shlink instance.
+
+    When resolving a short URL to redirect end users, the following rules are applied:
+
+    * If the domain used for the request plus the short code/slug are found, the user is redirected to that long URL and the visit is tracked.
+    * If the domain is not known but the short code/slug is defined for default domain, the user is redirected there and the visit is tracked.
+    * In any other case, no redirection happens and no visit is tracked (if a fall back redirection is configured for not-found URLs, it will still happen).
+
+#### Changed
+
+* [#486](https://github.com/shlinkio/shlink/issues/486) Updated to [shlink-installer](https://github.com/shlinkio/shlink-installer) v2, which supports asking for base path in which shlink is served.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* [#435](https://github.com/shlinkio/shlink/issues/435) Removed translations for error pages. All error pages are in english now.
+
+#### Fixed
+
+* *Nothing*
+
+
 ## 1.18.1 - 2019-08-24
 
 #### Added

Dockerfile

@@ -1,10 +1,10 @@
-FROM php:7.3.8-cli-alpine3.10
+FROM php:7.3.11-alpine3.10
 LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
 
-ARG SHLINK_VERSION=1.18.1
+ARG SHLINK_VERSION=1.20.2
 ENV SHLINK_VERSION ${SHLINK_VERSION}
-ENV SWOOLE_VERSION 4.3.3
-ENV COMPOSER_VERSION 1.9.0
+ENV SWOOLE_VERSION 4.4.12
+ENV COMPOSER_VERSION 1.9.1
 
 WORKDIR /etc/shlink
 
@@ -17,7 +17,7 @@ RUN \
     # Install postgres
     apk add --no-cache postgresql-dev && \
     docker-php-ext-install -j"$(nproc)" pdo_pgsql && \
-    # [Deprecated] Install intl
+    # Install intl
     apk add --no-cache icu-dev && \
     docker-php-ext-install -j"$(nproc)" intl && \
     # Install zip and gd
@@ -52,5 +52,6 @@ VOLUME /etc/shlink/config/params
 # Copy config specific for the image
 COPY docker/docker-entrypoint.sh docker-entrypoint.sh
 COPY docker/config/shlink_in_docker.local.php config/autoload/shlink_in_docker.local.php
+COPY docker/config/php.ini ${PHP_INI_DIR}/conf.d/
 
 ENTRYPOINT ["/bin/sh", "./docker-entrypoint.sh"]

README.md

@@ -1,4 +1,4 @@
-# Shlink
+![Shlink](https://raw.githubusercontent.com/shlinkio/shlink.io/master/public/images/shlink-hero.png)
 
 [![Build Status](https://img.shields.io/travis/shlinkio/shlink.svg?style=flat-square)](https://travis-ci.org/shlinkio/shlink)
 [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master)
@@ -12,26 +12,36 @@ A PHP-based self-hosted URL shortener that can be used to serve shortened URLs u
 ## Table of Contents
 
 - [Installation](#installation)
+    - [Download](#download)
+    - [Configure](#configure)
+    - [Serve](#serve)
+    - [Bonus](#bonus)
 - [Update to new version](#update-to-new-version)
 - [Using a docker image](#using-a-docker-image)
 - [Using shlink](#using-shlink)
-  - [Shlink CLI Help](#shlink-cli-help)
+    - [Shlink CLI Help](#shlink-cli-help)
 
 ## Installation
 
-First make sure the host where you are going to run shlink fulfills these requirements:
+> These are the steps needed to install Shlink if you plan to manually host it. 
+>
+> Alternatively, you can use the official docker image. If that's your intention, jump directly to [Using a docker image](#using-a-docker-image)
+
+First, make sure the host where you are going to run shlink fulfills these requirements:
 
 * PHP 7.2 or greater with JSON, APCu, intl, curl, PDO and gd extensions enabled.
-* MySQL, PostgreSQL or SQLite.
+* MySQL, MariaDB, PostgreSQL or SQLite.
 * The web server of your choice with PHP integration (Apache or Nginx recommended).
 
-Then, you will need a built version of the project. There are a few ways to get it.
+### Download
+
+In order to run Shlink, you will need a built version of the project. There are two ways to get it.
 
 * **Using a dist file**
 
     The easiest way to install shlink is by using one of the pre-bundled distributable packages.
 
-    Just go to the [latest version](https://github.com/shlinkio/shlink/releases/latest) and download the `shlink_X.X.X_dist.zip` file you will find there.
+    Go to the [latest version](https://github.com/shlinkio/shlink/releases/latest) and download the `shlink_x.x.x_dist.zip` file you will find there.
 
     Finally, decompress the file in the location of your choice.
 
@@ -43,160 +53,159 @@ Then, you will need a built version of the project. There are a few ways to get
     * 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 only used for the generated dist file).
 
-    After that, you will have a `shlink_x.x.x_dist.zip` dist file inside the `build` directory.
+    After that, you will have a `shlink_x.x.x_dist.zip` dist file inside the `build` directory, that you need to decompress in the location fo your choice.
 
-    This is the process used when releasing new shlink versions. After tagging the new version with git, the Github release is automatically created by [travis](https://travis-ci.org/shlinkio/shlink), attaching generated dist file to it.
+    > This is the process used when releasing new shlink versions. After tagging the new version with git, the Github release is automatically created by [travis](https://travis-ci.org/shlinkio/shlink), attaching the generated dist file to it.
 
-Despite how you built the project, you are going to need to install it now, by following these steps:
+### Configure
 
-* If you are going to use MySQL or PostgreSQL, create an empty database with the name of your choice.
+Despite how you built the project, you now need to configure it, by following these steps:
+
+* If you are going to use MySQL, MariaDB or PostgreSQL, 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.**
-* Expose shlink to the web, either by using a traditional web server + fast CGI approach, or by using a [swoole](https://www.swoole.co.uk/) non-blocking server.
-
-    * **Using a web server:**
-
-        For example, assuming your domain is doma.in and shlink is in the `/path/to/shlink` folder, these would be the basic configurations for Nginx and Apache.
-
-        *Nginx:*
-
-        ```nginx
-        server {
-            server_name doma.in;
-            listen 80;
-            root /path/to/shlink/public;
-            index index.php;
-            charset utf-8;
-
-            location / {
-                try_files $uri $uri/ /index.php$is_args$args;
-            }
-
-            location ~ \.php$ {
-                fastcgi_split_path_info ^(.+\.php)(/.+)$;
-                fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
-                fastcgi_index index.php;
-                include fastcgi.conf;
-            }
-
-            location ~ /\.ht {
-                deny all;
-            }
-        }
-        ```
-
-        *Apache:*
-
-        ```apache
-        <VirtualHost *:80>
-            ServerName doma.in
-            DocumentRoot "/path/to/shlink/public"
-
-            <Directory "/path/to/shlink/public">
-                Options FollowSymLinks Includes ExecCGI
-                AllowOverride all
-                Order allow,deny
-                Allow from all
-            </Directory>
-        </VirtualHost>
-        ```
-
-    * **Using swoole:**
-
-        **Important!** Swoole support is still experimental. Use it with care, and report any found issue.
-
-        First you need to install the swoole PHP extension with [pecl](https://pecl.php.net/package/swoole), `pecl install swoole`.
-
-        Once installed, it's actually pretty easy to get shlink up and running with swoole. Just run `./vendor/bin/zend-expressive-swoole start -d` and you will get shlink running on port 8080.
-
-        However, by doing it this way, you are loosing all the access logs, and the service won't be automatically run if the server has to be restarted.
-
-        For that reason, you should create a daemon script, in `/etc/init.d/shlink_swoole`, like this one, replacing `/path/to/shlink` by the path to your shlink installation:
-
-        ```bash
-        #!/bin/bash
-        ### BEGIN INIT INFO
-        # Provides:          shlink_swoole
-        # 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
-        ### END INIT INFO
-
-        SCRIPT=/path/to/shlink/vendor/bin/zend-expressive-swoole\ start
-        RUNAS=root
-
-        PIDFILE=/var/run/shlink_swoole.pid
-        LOGDIR=/var/log/shlink
-        LOGFILE=${LOGDIR}/shlink_swoole.log
-
-        start() {
-          if [[ -f "$PIDFILE" ]] && kill -0 $(cat "$PIDFILE"); then
-            echo 'Shlink with swoole already running' >&2
-            return 1
-          fi
-          echo 'Starting shlink with swoole' >&2
-          mkdir -p "$LOGDIR"
-          touch "$LOGFILE"
-          local CMD="$SCRIPT &> \"$LOGFILE\" & echo \$!"
-          su -c "$CMD" $RUNAS > "$PIDFILE"
-          echo 'Shlink started' >&2
-        }
-
-        stop() {
-          if [[ ! -f "$PIDFILE" ]] || ! kill -0 $(cat "$PIDFILE"); then
-            echo 'Shlink with swoole not running' >&2
-            return 1
-          fi
-          echo 'Stopping shlink with swoole' >&2
-          kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
-          echo 'Shlink stopped' >&2
-        }
-
-        case "$1" in
-          start)
-            start
-            ;;
-          stop)
-            stop
-            ;;
-          restart)
-            stop
-            start
-            ;;
-          *)
-            echo "Usage: $0 {start|stop|restart}"
-        esac
-        ```
-
-        Then run these commands to enable the service and start it:
-
-        * `sudo chmod +x /etc/init.d/shlink_swoole`
-        * `sudo update-rc.d shlink_swoole defaults`
-        * `sudo update-rc.d shlink_swoole enable`
-        * `/etc/init.d/shlink_swoole start`
-
-        Now again, you can access shlink on port 8080, but this time the service will be automatically run at system start-up, and all access logs will be written in `/var/log/shlink/shlink_swoole.log` (you will probably want to [rotate those logs](https://www.digitalocean.com/community/tutorials/how-to-manage-logfiles-with-logrotate-on-ubuntu-16-04). You can find an example logrotate config file [here](data/infra/examples/shlink-daemon-logrotate.conf)).
-
 * 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.
-* Finally access to [https://app.shlink.io](https://app.shlink.io) and configure your server to start creating short URLs.
 
-**Bonus**
+### Serve
 
-There are a couple of time-consuming tasks that shlink expects you to do manually, or at least it is recommended, since it will improve runtime performance.
+Once Shlink is configured, you need to expose it to the web, either by using a traditional web server + fast CGI approach, or by using a [swoole](https://www.swoole.co.uk/) non-blocking server.
 
-Those tasks can be performed using shlink's CLI, so it should be easy to schedule them to be run in the background (for example, using cron jobs):
+* **Using a web server:**
 
-* **For shlink older than 1.18.0 or not using swoole as the web server**: Resolve IP address locations: `/path/to/shlink/bin/cli visit:locate`
+    For example, assuming your domain is doma.in and shlink is in the `/path/to/shlink` folder, these would be the basic configurations for Nginx and Apache.
+
+    *Nginx:*
+
+    ```nginx
+    server {
+        server_name doma.in;
+        listen 80;
+        root /path/to/shlink/public;
+        index index.php;
+        charset utf-8;
+
+        location / {
+            try_files $uri $uri/ /index.php$is_args$args;
+        }
+
+        location ~ \.php$ {
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+            fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
+            fastcgi_index index.php;
+            include fastcgi.conf;
+        }
+
+        location ~ /\.ht {
+            deny all;
+        }
+    }
+    ```
+
+    *Apache:*
+
+    ```apache
+    <VirtualHost *:80>
+        ServerName doma.in
+        DocumentRoot "/path/to/shlink/public"
+
+        <Directory "/path/to/shlink/public">
+            Options FollowSymLinks Includes ExecCGI
+            AllowOverride all
+            Order allow,deny
+            Allow from all
+        </Directory>
+    </VirtualHost>
+    ```
+
+* **Using swoole:**
+
+    First you need to install the swoole PHP extension with [pecl](https://pecl.php.net/package/swoole), `pecl install swoole`.
+
+    Once installed, it's actually pretty easy to get shlink up and running with swoole. Run `./vendor/bin/zend-expressive-swoole start -d` and you will get shlink running on port 8080.
+
+    However, by doing it this way, you are loosing all the access logs, and the service won't be automatically run if the server has to be restarted.
+
+    For that reason, you should create a daemon script, in `/etc/init.d/shlink_swoole`, like this one, replacing `/path/to/shlink` by the path to your shlink installation:
+
+    ```bash
+    #!/bin/bash
+    ### BEGIN INIT INFO
+    # Provides:          shlink_swoole
+    # 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
+    ### END INIT INFO
+
+    SCRIPT=/path/to/shlink/vendor/bin/zend-expressive-swoole\ start
+    RUNAS=root
+
+    PIDFILE=/var/run/shlink_swoole.pid
+    LOGDIR=/var/log/shlink
+    LOGFILE=${LOGDIR}/shlink_swoole.log
+
+    start() {
+      if [[ -f "$PIDFILE" ]] && kill -0 $(cat "$PIDFILE"); then
+        echo 'Shlink with swoole already running' >&2
+        return 1
+      fi
+      echo 'Starting shlink with swoole' >&2
+      mkdir -p "$LOGDIR"
+      touch "$LOGFILE"
+      local CMD="$SCRIPT &> \"$LOGFILE\" & echo \$!"
+      su -c "$CMD" $RUNAS > "$PIDFILE"
+      echo 'Shlink started' >&2
+    }
+
+    stop() {
+      if [[ ! -f "$PIDFILE" ]] || ! kill -0 $(cat "$PIDFILE"); then
+        echo 'Shlink with swoole not running' >&2
+        return 1
+      fi
+      echo 'Stopping shlink with swoole' >&2
+      kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
+      echo 'Shlink stopped' >&2
+    }
+
+    case "$1" in
+      start)
+        start
+        ;;
+      stop)
+        stop
+        ;;
+      restart)
+        stop
+        start
+        ;;
+      *)
+        echo "Usage: $0 {start|stop|restart}"
+    esac
+    ```
+
+    Then run these commands to enable the service and start it:
+
+    * `sudo chmod +x /etc/init.d/shlink_swoole`
+    * `sudo update-rc.d shlink_swoole defaults`
+    * `sudo update-rc.d shlink_swoole enable`
+    * `/etc/init.d/shlink_swoole start`
+
+    Now again, you can access shlink on port 8080, but this time the service will be automatically run at system start-up, and all access logs will be written in `/var/log/shlink/shlink_swoole.log` (you will probably want to [rotate those logs](https://www.digitalocean.com/community/tutorials/how-to-manage-logfiles-with-logrotate-on-ubuntu-16-04). You can find an example logrotate config file [here](data/infra/examples/shlink-daemon-logrotate.conf)).
+
+Finally access to [https://app.shlink.io](https://app.shlink.io) and configure your server to start creating short URLs.
+
+### Bonus
+
+Depending on the shlink version you installed and how you serve it, there are a couple of time-consuming tasks that shlink expects you to do manually, or at least it is recommended, since it will improve runtime performance.
+
+Those tasks can be performed using shlink's CLI tool, so it should be easy to schedule them to be run in the background (for example, using cron jobs):
+
+* **For shlink older than 1.18.0 or not using swoole to serve it**: Resolve IP address locations: `/path/to/shlink/bin/cli visit:locate`
 
     If you don't run this command regularly, the stats will say all visits come from *unknown* locations.
 
-* Generate website previews: `/path/to/shlink/bin/cli short-url:process-previews`
-
-    Running this will improve the performance of the `doma.in/abc123/preview` URLs, which return a preview of the site.
-
-    > **Important!** Generating previews is considered deprecated and the feature will be removed in Shlink v2.
+    > If you serve Shlink with swoole and use v1.18.0 at least, visit location is automatically scheduled by Shlink just after the visit occurs, using swoole's task system.
 
 * **For shlink older than v1.17.0**: Update IP geolocation database: `/path/to/shlink/bin/cli visit:update-db`
 
@@ -204,24 +213,28 @@ Those tasks can be performed using shlink's CLI, so it should be easy to schedul
 
     The file is updated the first Tuesday of every month, so it should be enough running this command the first Wednesday.
 
-*Any of these commands accept the `-q` flag, which makes it not display any output. This is recommended when configuring the commands as cron jobs.*
+    > You don't need this if you use Shlink v1.17.0 or newer, since now it downloads/updates the geolocation database automatically just before trying to use it.
 
-> In future versions, it is planed that, when using **swoole** to serve shlink, some of these tasks are automatically run without blocking the request and also, without having to configure cron jobs. Probably resolving IP locations and generating previews.
+* Generate website previews: `/path/to/shlink/bin/cli short-url:process-previews`
+
+    Running this will improve the performance of the `doma.in/abc123/preview` URLs, which return a preview of the site.
+
+    > **Important!** Generating previews is considered deprecated and the feature will be removed in Shlink v2.
+
+*Any of these commands accept the `-q` flag, which makes it not display any output. This is recommended when configuring the commands as cron jobs.*
 
 ## Update to new version
 
-When a new Shlink version is available, you don't need to repeat the entire process yourself. Instead, follow these steps:
+When a new Shlink version is available, you don't need to repeat the entire process. Instead, follow these steps:
 
 1. Rename your existing Shlink directory to something else (ie. `shlink` ---> `shlink-old`).
-2. Download and extract the new version of Shlink, and set the directories name to that of the old version. (ie. `shlink`).
-3. Run the `bin/update` script in the new version's directory to migrate your configuration over.
+2. Download and extract the new version of Shlink, and set the directory name to that of the old version (ie. `shlink`).
+3. Run the `bin/update` script in the new version's directory to migrate your configuration over. You will be asked to provide the path to the old instance (ie. `shlink-old`).
 4. If you are using shlink with swoole, restart the service by running `/etc/init.d/shlink_swoole restart`.
 
-The `bin/update` script will ask you for the location from previous shlink version, and use it in order to import the configuration. It will then update the database and generate some assets shlink needs to work.
+The `bin/update` will use the location from previous shlink version to import the configuration. It will then update the database and generate some assets shlink needs to work.
 
-Right now, it does not import cached info (like website previews), but it will. For now you will need to regenerate them again.
-
-**Important!** It is recommended that you don't skip any version when using this process. The update gets better on every version, but older versions might make assumptions.
+**Important!** It is recommended that you don't skip any version when using this process. The update tool gets better on every version, but older versions might make assumptions.
 
 ## Using a docker image
 
@@ -239,7 +252,7 @@ Once shlink is installed, there are two main ways to interact with it:
 
     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/api-docs), and a sandbox which also documents every endpoint can be found [here](https://shlink.io/swagger-ui/index.html).
+* **The REST API**. The complete docs on how to use the API can be found [here](https://shlink.io/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 you can host it yourself too.
 

bin/cli

@@ -1,10 +1,7 @@
 #!/usr/bin/env php
 <?php
+
 declare(strict_types=1);
 
-use Psr\Container\ContainerInterface;
-use Symfony\Component\Console\Application as CliApp;
-
-/** @var ContainerInterface $container */
-$container = include __DIR__ . '/../config/container.php';
-$container->get(CliApp::class)->run();
+$run = require __DIR__ . '/../config/run.php';
+$run(true);

bin/test/run-api-tests.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env sh
-set -e
-
 export APP_ENV=test
+export DB_DRIVER=mysql
 
 # Try to stop server just in case it hanged in last execution
 vendor/bin/zend-expressive-swoole stop
@@ -10,5 +9,10 @@ echo 'Starting server...'
 vendor/bin/zend-expressive-swoole start -d
 sleep 2
 
-vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox --colors=always
+vendor/bin/phpunit --order-by=random -c phpunit-api.xml --testdox --colors=always $*
+testsExitCode=$?
+
 vendor/bin/zend-expressive-swoole stop
+
+# Exit this script with the same code as the tests. If tests failed, this script has to fail
+exit $testsExitCode

composer.json

@@ -15,33 +15,33 @@
         "php": "^7.2",
         "ext-json": "*",
         "ext-pdo": "*",
-        "acelaya/ze-content-based-error-handler": "^3.0",
         "akrabat/ip-address-middleware": "^1.0",
         "cakephp/chronos": "^1.2",
         "cocur/slugify": "^3.0",
-        "doctrine/cache": "^1.6",
-        "doctrine/dbal": "^2.9",
-        "doctrine/migrations": "^2.0",
-        "doctrine/orm": "^2.5",
-        "endroid/qr-code": "^1.7",
+        "doctrine/cache": "^1.9",
+        "doctrine/dbal": "^2.10",
+        "doctrine/migrations": "^2.2",
+        "doctrine/orm": "^2.7",
+        "endroid/qr-code": "^3.6",
         "firebase/php-jwt": "^4.0",
         "geoip2/geoip2": "^2.9",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^6.5.1",
         "lstrojny/functional-php": "^1.9",
         "mikehaertl/phpwkhtmltopdf": "^2.2",
-        "monolog/monolog": "^1.24",
+        "monolog/monolog": "^2.0",
+        "nikolaposa/monolog-factory": "^3.0",
         "ocramius/proxy-manager": "~2.2.2",
         "phly/phly-event-dispatcher": "^1.0",
         "predis/predis": "^1.1",
-        "shlinkio/shlink-common": "^1.0",
-        "shlinkio/shlink-event-dispatcher": "^1.0",
-        "shlinkio/shlink-installer": "^1.2.1",
-        "shlinkio/shlink-ip-geolocation": "^1.0",
-        "symfony/console": "^4.3",
-        "symfony/filesystem": "^4.3",
-        "symfony/lock": "^4.3",
-        "symfony/process": "^4.3",
-        "theorchard/monolog-cascade": "^0.5",
+        "pugx/shortid-php": "^0.5",
+        "shlinkio/shlink-common": "^2.4",
+        "shlinkio/shlink-event-dispatcher": "^1.1",
+        "shlinkio/shlink-installer": "^3.3",
+        "shlinkio/shlink-ip-geolocation": "^1.2",
+        "symfony/console": "^5.0",
+        "symfony/filesystem": "^5.0",
+        "symfony/lock": "^5.0",
+        "symfony/process": "^5.0",
         "zendframework/zend-config": "^3.3",
         "zendframework/zend-config-aggregator": "^1.1",
         "zendframework/zend-diactoros": "^2.1.3",
@@ -50,27 +50,22 @@
         "zendframework/zend-expressive-helpers": "^5.3",
         "zendframework/zend-expressive-platesrenderer": "^2.1",
         "zendframework/zend-expressive-swoole": "^2.4",
-        "zendframework/zend-i18n": "^2.9",
         "zendframework/zend-inputfilter": "^2.10",
         "zendframework/zend-paginator": "^2.8",
+        "zendframework/zend-problem-details": "^1.0",
         "zendframework/zend-servicemanager": "^3.4",
         "zendframework/zend-stdlib": "^3.2"
     },
     "require-dev": {
         "devster/ubench": "^2.0",
         "eaglewu/swoole-ide-helper": "dev-master",
-        "filp/whoops": "^2.4",
-        "infection/infection": "^0.13.4",
-        "phpstan/phpstan": "^0.11.2",
-        "phpunit/phpcov": "^6.0",
+        "infection/infection": "^0.15.0",
+        "phpstan/phpstan-shim": "^0.11.16",
         "phpunit/phpunit": "^8.3",
         "roave/security-advisories": "dev-master",
-        "shlinkio/php-coding-standard": "~1.2.2",
-        "shlinkio/shlink-test-utils": "^1.0",
-        "symfony/dotenv": "^4.3",
-        "symfony/var-dumper": "^4.3",
-        "zendframework/zend-component-installer": "^2.1",
-        "zendframework/zend-expressive-tooling": "^1.2"
+        "shlinkio/php-coding-standard": "~2.0.0",
+        "shlinkio/shlink-test-utils": "^1.2",
+        "symfony/var-dumper": "^5.0"
     },
     "autoload": {
         "psr-4": {
@@ -78,7 +73,10 @@
             "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
             "Shlinkio\\Shlink\\Core\\": "module/Core/src",
             "Shlinkio\\Shlink\\PreviewGenerator\\": "module/PreviewGenerator/src/"
-        }
+        },
+        "files": [
+            "module/Core/functions/functions.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
@@ -99,11 +97,9 @@
             "@test:ci",
             "@infect:ci"
         ],
-
         "cs": "phpcs",
         "cs:fix": "phpcbf",
         "stan": "phpstan analyse module/*/src/ module/*/config config docker/config --level=5 -c phpstan.neon",
-
         "test": [
             "@test:unit",
             "@test:db",
@@ -111,37 +107,38 @@
         ],
         "test:ci": [
             "@test:unit:ci",
-            "@test:db",
+            "@test:db:ci",
             "@test:api"
         ],
         "test:unit": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox",
-        "test:unit:ci": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/phpunit.junit.xml --testdox",
+        "test:unit:ci": "@test:unit --coverage-clover=build/clover.xml --coverage-xml=build/coverage-xml --log-junit=build/junit.xml",
         "test:db": [
+            "@test:db:sqlite",
+            "@test:db:mysql",
+            "@test:db:maria",
+            "@test:db:postgres"
+        ],
+        "test:db:ci": [
             "@test:db:sqlite",
             "@test:db:mysql",
             "@test:db:postgres"
         ],
-        "test:db:sqlite": "APP_ENV=test phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always -c phpunit-db.xml --coverage-php build/coverage-db.cov --testdox",
+        "test:db:sqlite": "APP_ENV=test phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-db.cov --testdox -c phpunit-db.xml",
         "test:db:mysql": "DB_DRIVER=mysql composer test:db:sqlite",
+        "test:db:maria": "DB_DRIVER=maria composer test:db:sqlite",
         "test:db:postgres": "DB_DRIVER=postgres composer test:db:sqlite",
         "test:api": "bin/test/run-api-tests.sh",
-
-        "test:pretty": [
-            "@test",
-            "phpdbg -qrr vendor/bin/phpcov merge build --html build/html"
-        ],
         "test:unit:pretty": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage",
-
-        "infect": "infection --threads=4 --min-msi=75 --log-verbosity=default --only-covered",
-        "infect:ci": "infection --threads=4 --min-msi=75 --log-verbosity=default --only-covered --coverage=build",
-        "infect:show": "infection --threads=4 --min-msi=75 --log-verbosity=default --only-covered --show-mutations",
+        "infect": "infection --threads=4 --min-msi=80 --log-verbosity=default --only-covered",
+        "infect:ci": "@infect --coverage=build",
+        "infect:show": "@infect --show-mutations",
         "infect:test": [
             "@test:unit:ci",
             "@infect:ci"
-        ]
+        ],
+        "clean:dev": "rm -f data/database.sqlite && rm -f config/params/generated_config.php"
     },
     "scripts-descriptions": {
-        "check": "<fg=blue;options=bold>Alias for \"cs\", \"stan\", \"test\" and \"infect\"</>",
         "ci": "<fg=blue;options=bold>Alias for \"cs\", \"stan\", \"test:ci\" and \"infect:ci\"</>",
         "cs": "<fg=blue;options=bold>Checks coding styles</>",
         "cs:fix": "<fg=blue;options=bold>Fixes coding styles, when possible</>",
@@ -150,17 +147,19 @@
         "test:ci": "<fg=blue;options=bold>Runs all test suites, generating all needed reports and logs for CI envs</>",
         "test:unit": "<fg=blue;options=bold>Runs unit test suites</>",
         "test:unit:ci": "<fg=blue;options=bold>Runs unit test suites, generating all needed reports and logs for CI envs</>",
-        "test:db": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL and PostgreSQL</>",
+        "test:db": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL, MariaDB and PostgreSQL</>",
+        "test:db:ci": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL and PostgreSQL</>",
         "test:db:sqlite": "<fg=blue;options=bold>Runs database test suites on a SQLite database</>",
         "test:db:mysql": "<fg=blue;options=bold>Runs database test suites on a MySQL database</>",
+        "test:db:maria": "<fg=blue;options=bold>Runs database test suites on a MariaDB database</>",
         "test:db:postgres": "<fg=blue;options=bold>Runs database test suites on a PostgreSQL database</>",
         "test:api": "<fg=blue;options=bold>Runs API test suites</>",
-        "test:pretty": "<fg=blue;options=bold>Runs all test suites and generates an HTML code coverage report</>",
         "test:unit:pretty": "<fg=blue;options=bold>Runs unit test suites and generates an HTML code coverage report</>",
         "infect": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing</>",
         "infect:ci": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing with existing reports and logs</>",
         "infect:show": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing and shows applied mutators</>",
-        "infect:test": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing</>"
+        "infect:test": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing</>",
+        "clean:dev": "<fg=blue;options=bold>Deletes artifacts which are gitignored and could affect dev env</>"
     },
     "config": {
         "sort-packages": true

config/autoload/app_options.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use function Shlinkio\Shlink\Common\env;

config/autoload/client-detection.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 return [

config/autoload/common.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Zend\ConfigAggregator\ConfigAggregator;

config/autoload/delete_short_urls.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink;

config/autoload/dependencies.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Zend\Expressive;

config/autoload/entity-manager.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Common;
@@ -10,9 +11,9 @@ return [
             'proxies_dir' => 'data/proxies',
         ],
         'connection' => [
-            'user' => env('DB_USER'),
-            'password' => env('DB_PASSWORD'),
-            'dbname' => env('DB_NAME', 'shlink'),
+            'user' => '',
+            'password' => '',
+            'dbname' => 'shlink',
             'charset' => 'utf8',
         ],
     ],

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

@@ -1,8 +1,13 @@
 <?php
+
+declare(strict_types=1);
+
 return [
 
     'entity_manager' => [
         'connection' => [
+            'user' => 'root',
+            'password' => 'root',
             'driver' => 'pdo_mysql',
             'host' => 'shlink_db',
             'driverOptions' => [

config/autoload/error-handler.global.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+use Shlinkio\Shlink\Common\Logger;
+use Zend\ProblemDetails\ProblemDetailsMiddleware;
+use Zend\Stratigility\Middleware\ErrorHandler;
+
+return [
+
+    'backwards_compatible_problem_details' => [
+        'default_type_fallbacks' => [
+            404 => 'NOT_FOUND',
+            500 => 'INTERNAL_SERVER_ERROR',
+        ],
+        'json_flags' => JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION,
+    ],
+
+    'error_handler' => [
+        'listeners' => [Logger\ErrorLogger::class],
+    ],
+
+    'dependencies' => [
+        'delegators' => [
+            ErrorHandler::class => [
+                Logger\ErrorHandlerListenerAttachingDelegator::class,
+            ],
+            ProblemDetailsMiddleware::class => [
+                Logger\ErrorHandlerListenerAttachingDelegator::class,
+            ],
+        ],
+    ],
+
+];

config/autoload/errorhandler.local.php.dist

@@ -1,29 +0,0 @@
-<?php
-declare(strict_types=1);
-
-use Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory;
-
-return [
-    'dependencies' => [
-        'invokables' => [
-            'Zend\Expressive\Whoops' => Whoops\Run::class,
-            'Zend\Expressive\WhoopsPageHandler' => Whoops\Handler\PrettyPageHandler::class,
-        ],
-    ],
-
-    'whoops' => [
-        'json_exceptions' => [
-            'display'    => true,
-            'show_trace' => true,
-            'ajax_only'  => true,
-        ],
-    ],
-
-    'error_handler' => [
-        'plugins' => [
-            'factories' => [
-                'text/html' => WhoopsErrorResponseGeneratorFactory::class,
-            ],
-        ],
-    ],
-];

config/autoload/geolite2.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 return [
@@ -6,7 +7,9 @@ return [
     'geolite2' => [
         'db_location' => __DIR__ . '/../../data/GeoLite2-City.mmdb',
         'temp_dir' => sys_get_temp_dir(),
-        'download_from' => 'http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz',
+        'download_from' =>
+            'https://download.maxmind.com/app/geoip_download'
+            . '?edition_id=GeoLite2-City&license_key=G4Lm0C60yJsnkdPi&suffix=tar.gz',
     ],
 
 ];

config/autoload/installer.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Shlinkio\Shlink\Installer\Config\Plugin;
@@ -6,17 +7,12 @@ use Shlinkio\Shlink\Installer\Config\Plugin;
 return [
 
     'installer_plugins_expected_config' => [
-        Plugin\LanguageConfigCustomizer::class => [
-            Plugin\LanguageConfigCustomizer::DEFAULT_LANG,
-        ],
-
         Plugin\UrlShortenerConfigCustomizer::class => [
             Plugin\UrlShortenerConfigCustomizer::SCHEMA,
             Plugin\UrlShortenerConfigCustomizer::HOSTNAME,
-            Plugin\UrlShortenerConfigCustomizer::CHARS,
             Plugin\UrlShortenerConfigCustomizer::VALIDATE_URL,
-            Plugin\UrlShortenerConfigCustomizer::ENABLE_NOT_FOUND_REDIRECTION,
-            Plugin\UrlShortenerConfigCustomizer::NOT_FOUND_REDIRECT_TO,
+            Plugin\UrlShortenerConfigCustomizer::NOTIFY_VISITS_WEBHOOKS,
+            Plugin\UrlShortenerConfigCustomizer::VISITS_WEBHOOKS,
         ],
 
         Plugin\ApplicationConfigCustomizer::class => [
@@ -24,6 +20,9 @@ return [
             Plugin\ApplicationConfigCustomizer::DISABLE_TRACK_PARAM,
             Plugin\ApplicationConfigCustomizer::CHECK_VISITS_THRESHOLD,
             Plugin\ApplicationConfigCustomizer::VISITS_THRESHOLD,
+            Plugin\ApplicationConfigCustomizer::BASE_PATH,
+            Plugin\ApplicationConfigCustomizer::WEB_WORKER_NUM,
+            Plugin\ApplicationConfigCustomizer::TASK_WORKER_NUM,
         ],
 
         Plugin\DatabaseConfigCustomizer::class => [
@@ -34,6 +33,12 @@ return [
             Plugin\DatabaseConfigCustomizer::HOST,
             Plugin\DatabaseConfigCustomizer::PORT,
         ],
+
+        Plugin\RedirectsConfigCustomizer::class => [
+            Plugin\RedirectsConfigCustomizer::INVALID_SHORT_URL_REDIRECT_TO,
+            Plugin\RedirectsConfigCustomizer::REGULAR_404_REDIRECT_TO,
+            Plugin\RedirectsConfigCustomizer::BASE_URL_REDIRECT_TO,
+        ],
     ],
 
     'installation_commands' => [

config/autoload/locks.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Shlinkio\Shlink\Common\Cache\RedisFactory;
@@ -7,6 +8,8 @@ use Shlinkio\Shlink\Common\Logger\LoggerAwareDelegatorFactory;
 use Symfony\Component\Lock;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 
+$localLockFactory = 'Shlinkio\Shlink\LocalLockFactory';
+
 return [
 
     'locks' => [
@@ -17,18 +20,21 @@ return [
         'factories' => [
             Lock\Store\FlockStore::class => ConfigAbstractFactory::class,
             Lock\Store\RedisStore::class => ConfigAbstractFactory::class,
-            Lock\Factory::class => ConfigAbstractFactory::class,
+            Lock\LockFactory::class => ConfigAbstractFactory::class,
+            $localLockFactory => ConfigAbstractFactory::class,
         ],
         'aliases' => [
             // With this config, a user could alias 'lock_store' => 'redis_lock_store' to override the default
-            'lock_store' => Lock\Store\FlockStore::class,
+            'lock_store' => 'local_lock_store',
+
             'redis_lock_store' => Lock\Store\RedisStore::class,
+            'local_lock_store' => Lock\Store\FlockStore::class,
         ],
         'delegators' => [
             Lock\Store\RedisStore::class => [
                 RetryLockStoreDelegatorFactory::class,
             ],
-            Lock\Factory::class => [
+            Lock\LockFactory::class => [
                 LoggerAwareDelegatorFactory::class,
             ],
         ],
@@ -37,7 +43,8 @@ return [
     ConfigAbstractFactory::class => [
         Lock\Store\FlockStore::class => ['config.locks.locks_dir'],
         Lock\Store\RedisStore::class => [RedisFactory::SERVICE_NAME],
-        Lock\Factory::class => ['lock_store'],
+        Lock\LockFactory::class => ['lock_store'],
+        $localLockFactory => ['local_lock_store'],
     ],
 
 ];

config/autoload/logger.global.php

@@ -1,65 +1,77 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use Monolog\Handler\RotatingFileHandler;
-use Monolog\Handler\StreamHandler;
+use Monolog\Formatter;
+use Monolog\Handler;
 use Monolog\Logger;
 use Monolog\Processor;
+use MonologFactory\DiContainerLoggerFactory;
+use Psr\Log\LoggerInterface;
 
 use const PHP_EOL;
 
+$processors = [
+    'exception_with_new_line' => [
+        'name' => Common\Logger\Processor\ExceptionWithNewLineProcessor::class,
+    ],
+    'psr3' => [
+        'name' => Processor\PsrLogMessageProcessor::class,
+    ],
+];
+$formatter = [
+    'name' => Formatter\LineFormatter::class,
+    'params' => [
+        'format' => '[%datetime%] %channel%.%level_name% - %message%' . PHP_EOL,
+        'allow_inline_line_breaks' => true,
+    ],
+];
+
 return [
 
     'logger' => [
-        'formatters' => [
-            'dashed' => [
-                'format' => '[%datetime%] %channel%.%level_name% - %message%' . PHP_EOL,
-                'include_stacktraces' => true,
+        'Shlink' => [
+            'name' => 'Shlink',
+            'handlers' => [
+                'shlink_handler' => [
+                    'name' => Handler\RotatingFileHandler::class,
+                    'params' => [
+                        'level' => Logger::INFO,
+                        'filename' => 'data/log/shlink_log.log',
+                        'max_files' => 30,
+                    ],
+                    'formatter' => $formatter,
+                ],
             ],
+            'processors' => $processors,
         ],
-
-        'handlers' => [
-            'shlink_rotating_handler' => [
-                'class' => RotatingFileHandler::class,
-                'level' => Logger::INFO,
-                'filename' => 'data/log/shlink_log.log',
-                'max_files' => 30,
-                'formatter' => 'dashed',
-            ],
-            'access_handler' => [
-                'class' => StreamHandler::class,
-                'level' => Logger::INFO,
-                'stream' => 'php://stdout',
-            ],
-        ],
-
-        'processors' => [
-            'exception_with_new_line' => [
-                'class' => Common\Logger\Processor\ExceptionWithNewLineProcessor::class,
-            ],
-            'psr3' => [
-                'class' => Processor\PsrLogMessageProcessor::class,
-            ],
-        ],
-
-        'loggers' => [
-            'Shlink' => [
-                'handlers' => ['shlink_rotating_handler'],
-                'processors' => ['exception_with_new_line', 'psr3'],
-            ],
-            'Access' => [
-                'handlers' => ['access_handler'],
-                'processors' => ['exception_with_new_line', 'psr3'],
+        'Access' => [
+            'name' => 'Access',
+            'handlers' => [
+                'access_handler' => [
+                    'name' => Handler\StreamHandler::class,
+                    'params' => [
+                        'level' => Logger::INFO,
+                        'stream' => 'php://stdout',
+                    ],
+                    'formatter' => $formatter,
+                ],
             ],
+            'processors' => $processors,
         ],
     ],
 
     'dependencies' => [
         'factories' => [
-            'Logger_Shlink' => Common\Logger\LoggerFactory::class,
-            'Logger_Access' => Common\Logger\LoggerFactory::class,
+            'Logger_Shlink' => [DiContainerLoggerFactory::class, 'Shlink'],
+            'Logger_Access' => [DiContainerLoggerFactory::class, 'Access'],
+        ],
+        'aliases' => [
+            'logger' => 'Logger_Shlink',
+            Logger::class => 'Logger_Shlink',
+            LoggerInterface::class => 'Logger_Shlink',
         ],
     ],
 

config/autoload/logger.local.php.dist

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Monolog\Handler\StreamHandler;
@@ -7,34 +8,28 @@ use Monolog\Logger;
 $isSwoole = extension_loaded('swoole');
 
 // For swoole, send logs to standard output
-$logger = $isSwoole ? [
-    'handlers' => [
-        'shlink_rotating_handler' => [
-            'level' => Logger::EMERGENCY, // This basically disables regular file logs
-        ],
-        'shlink_stdout_handler' => [
-            'class' => StreamHandler::class,
+$handler = $isSwoole
+    ? [
+        'name' => StreamHandler::class,
+        'params' => [
             'level' => Logger::DEBUG,
             'stream' => 'php://stdout',
-            'formatter' => 'dashed',
         ],
-    ],
-
-    'loggers' => [
-        'Shlink' => [
-            'handlers' => ['shlink_stdout_handler'],
-        ],
-    ],
-] : [
-    'handlers' => [
-        'shlink_rotating_handler' => [
+    ]
+    : [
+        'params' => [
             'level' => Logger::DEBUG,
         ],
-    ],
-];
+    ];
 
 return [
 
-    'logger' => $logger,
+    'logger' => [
+        'Shlink' => [
+            'handlers' => [
+                'shlink_handler' => $handler,
+            ],
+        ],
+    ],
 
 ];

config/autoload/middleware-pipeline.global.php

@@ -1,21 +1,35 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
 use Zend\Expressive;
+use Zend\ProblemDetails;
 use Zend\Stratigility\Middleware\ErrorHandler;
 
 return [
 
     'middleware_pipeline' => [
+        'error-handler' => [
+            'middleware' => [
+                Expressive\Helper\ContentLengthMiddleware::class,
+                ErrorHandler::class,
+            ],
+        ],
+        'error-handler-rest' => [
+            'path' => '/rest',
+            'middleware' => [
+                Rest\Middleware\CrossDomainMiddleware::class,
+                Rest\Middleware\BackwardsCompatibleProblemDetailsMiddleware::class,
+                ProblemDetails\ProblemDetailsMiddleware::class,
+            ],
+        ],
+
         'pre-routing' => [
             'middleware' => [
-                ErrorHandler::class,
-                Expressive\Helper\ContentLengthMiddleware::class,
                 Common\Middleware\CloseDbConnectionMiddleware::class,
             ],
-            'priority' => 12,
         ],
         'pre-routing-rest' => [
             'path' => '/rest',
@@ -23,36 +37,40 @@ return [
                 Rest\Middleware\PathVersionMiddleware::class,
                 Rest\Middleware\ShortUrl\ShortCodePathMiddleware::class,
             ],
-            'priority' => 11,
         ],
 
         'routing' => [
             'middleware' => [
                 Expressive\Router\Middleware\RouteMiddleware::class,
             ],
-            'priority' => 10,
         ],
 
         'rest' => [
             'path' => '/rest',
             'middleware' => [
-                Rest\Middleware\CrossDomainMiddleware::class,
                 Expressive\Router\Middleware\ImplicitOptionsMiddleware::class,
                 Rest\Middleware\BodyParserMiddleware::class,
                 Rest\Middleware\AuthenticationMiddleware::class,
             ],
-            'priority' => 5,
         ],
 
-        'post-routing' => [
+        'dispatch' => [
             'middleware' => [
                 Expressive\Router\Middleware\DispatchMiddleware::class,
-
-                // Only if a not found error is triggered, set-up the locale to be used
-                Common\Middleware\LocaleMiddleware::class,
-                Core\Response\NotFoundHandler::class,
             ],
-            'priority' => 1,
+        ],
+
+        'not-found-rest' => [
+            'path' => '/rest',
+            'middleware' => [
+                ProblemDetails\ProblemDetailsNotFoundHandler::class,
+            ],
+        ],
+        'not-found' => [
+            'middleware' => [
+                Core\ErrorHandler\NotFoundRedirectHandler::class,
+                Core\ErrorHandler\NotFoundTemplateHandler::class,
+            ],
         ],
     ],
 ];

config/autoload/preview-generation.global.php

@@ -1,7 +1,8 @@
 <?php
+
 declare(strict_types=1);
 
-/** @deprecated */
+/* @deprecated */
 return [
 
     'preview_generation' => [

config/autoload/redirects.global.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'not_found_redirects' => [
+        'invalid_short_url' => null, // Formerly url_shortener.not_found_short_url.redirect_to
+        'regular_404' => null,
+        'base_url' => null,
+    ],
+
+];

config/autoload/router.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Zend\Expressive\Router\FastRouteRouter;
@@ -6,6 +7,8 @@ use Zend\Expressive\Router\FastRouteRouter;
 return [
 
     'router' => [
+        'base_path' => '',
+
         'fastroute' => [
             FastRouteRouter::CONFIG_CACHE_ENABLED => true,
             FastRouteRouter::CONFIG_CACHE_FILE => 'data/cache/fastroute_cached_routes.php',

config/autoload/swoole.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 return [

config/autoload/templates.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 return [

config/autoload/translator.global.php

@@ -1,12 +0,0 @@
-<?php
-declare(strict_types=1);
-
-use Shlinkio\Shlink\Common;
-
-return [
-
-    'translator' => [
-        'locale' => Common\env('DEFAULT_LOCALE', 'en'),
-    ],
-
-];

config/autoload/url-shortener.global.php

@@ -1,23 +1,16 @@
 <?php
+
 declare(strict_types=1);
 
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
-
-use function Shlinkio\Shlink\Common\env;
-
 return [
 
     'url_shortener' => [
         'domain' => [
-            'schema' => env('SHORTENED_URL_SCHEMA', 'http'),
-            'hostname' => env('SHORTENED_URL_HOSTNAME'),
+            'schema' => 'https',
+            'hostname' => '',
         ],
-        'shortcode_chars' => env('SHORTCODE_CHARS', UrlShortenerOptions::DEFAULT_CHARS),
         'validate_url' => true,
-        'not_found_short_url' => [
-            'enable_redirection' => false,
-            'redirect_to' => null,
-        ],
+        'visits_webhooks' => [],
     ],
 
 ];

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

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'url_shortener' => [
+        'domain' => [
+            'schema' => 'http',
+            'hostname' => 'localhost:8080',
+        ],
+    ],
+
+];

config/autoload/wkhtmltopdf.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 return [

config/cli-config.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Doctrine\ORM\EntityManager;
@@ -6,8 +7,10 @@ use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Psr\Container\ContainerInterface;
 use Zend\ServiceManager\ServiceManager;
 
-/** @var ContainerInterface|ServiceManager $container */
-$container = include __DIR__ . '/container.php';
-$em = $container->get(EntityManager::class);
+return (function () {
+    /** @var ContainerInterface|ServiceManager $container */
+    $container = include __DIR__ . '/container.php';
+    $em = $container->get(EntityManager::class);
 
-return ConsoleRunner::createHelperSet($em);
+    return ConsoleRunner::createHelperSet($em);
+})();

config/config.php

@@ -1,11 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
 
-use Acelaya\ExpressiveErrorHandler;
 use Zend\ConfigAggregator;
 use Zend\Expressive;
+use Zend\ProblemDetails;
 
 use function Shlinkio\Shlink\Common\env;
 
@@ -15,7 +16,7 @@ return (new ConfigAggregator\ConfigAggregator([
     Expressive\Router\FastRouteRouter\ConfigProvider::class,
     Expressive\Plates\ConfigProvider::class,
     Expressive\Swoole\ConfigProvider::class,
-    ExpressiveErrorHandler\ConfigProvider::class,
+    ProblemDetails\ConfigProvider::class,
     Common\ConfigProvider::class,
     IpGeolocation\ConfigProvider::class,
     Core\ConfigProvider::class,
@@ -28,5 +29,7 @@ return (new ConfigAggregator\ConfigAggregator([
         ? new ConfigAggregator\PhpFileProvider('config/test/*.global.php')
         : new ConfigAggregator\ZendConfigProvider('config/params/{generated_config.php,*.config.{php,json}}'),
 ], 'data/cache/app_config.php', [
-    Core\SimplifiedConfigParser::class,
+    Core\Config\SimplifiedConfigParser::class,
+    Core\Config\BasePathPrefixer::class,
+    Core\Config\DeprecatedConfigParser::class,
 ]))->getMergedConfig();

config/container.php

@@ -1,23 +1,24 @@
 <?php
+
 declare(strict_types=1);
 
-use Symfony\Component\Dotenv\Dotenv;
+use Symfony\Component\Lock;
 use Zend\ServiceManager\ServiceManager;
 
 chdir(dirname(__DIR__));
 
 require 'vendor/autoload.php';
 
-// If the Dotenv class exists, load env vars and enable errors
-if (class_exists(Dotenv::class)) {
-    error_reporting(E_ALL);
-    ini_set('display_errors', '1');
-    $dotenv = new Dotenv();
-    $dotenv->load(__DIR__ . '/../.env');
+// This class alias tricks the ConfigAbstractFactory to return Lock\Factory instances even with a different service name
+if (! class_exists('Shlinkio\Shlink\LocalLockFactory')) {
+    class_alias(Lock\LockFactory::class, 'Shlinkio\Shlink\LocalLockFactory');
 }
 
 // Build container
-$config = require __DIR__ . '/config.php';
-$container = new ServiceManager($config['dependencies']);
-$container->setService('config', $config);
-return $container;
+return (function () {
+    $config = require __DIR__ . '/config.php';
+    $container = new ServiceManager($config['dependencies']);
+    $container->setService('config', $config);
+
+    return $container;
+})();

config/run.php

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

config/test/bootstrap_api_tests.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\TestUtils;
@@ -6,14 +7,6 @@ namespace Shlinkio\Shlink\TestUtils;
 use Doctrine\ORM\EntityManager;
 use Psr\Container\ContainerInterface;
 
-use function file_exists;
-use function touch;
-
-// Create an empty .env file
-if (! file_exists('.env')) {
-    touch('.env');
-}
-
 /** @var ContainerInterface $container */
 $container = require __DIR__ . '/../container.php';
 $testHelper = $container->get(Helper\TestHelper::class);

config/test/bootstrap_db_tests.php

@@ -1,18 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\TestUtils;
 
 use Psr\Container\ContainerInterface;
 
-use function file_exists;
-use function touch;
-
-// Create an empty .env file
-if (! file_exists('.env')) {
-    touch('.env');
-}
-
 /** @var ContainerInterface $container */
 $container = require __DIR__ . '/../container.php';
 $container->get(Helper\TestHelper::class)->createTestDb();

config/test/test_config.global.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
@@ -15,40 +16,41 @@ use function sys_get_temp_dir;
 $swooleTestingHost = '127.0.0.1';
 $swooleTestingPort = 9999;
 
-$buildDbConnection = function () {
+$buildDbConnection = function (): array {
     $driver = env('DB_DRIVER', 'sqlite');
     $isCi = env('TRAVIS', false);
+    $getMysqlHost = function (string $driver) {
+        return sprintf('shlink_db%s', $driver === 'mysql' ? '' : '_maria');
+    };
 
-    switch ($driver) {
-        case 'sqlite':
-            return [
-                'driver' => 'pdo_sqlite',
-                'path' => sys_get_temp_dir() . '/shlink-tests.db',
-            ];
-        case 'mysql':
-            return [
-                'driver' => 'pdo_mysql',
-                'host' => $isCi ? '127.0.0.1' : 'shlink_db',
-                'user' => 'root',
-                'password' => $isCi ? '' : 'root',
-                'dbname' => 'shlink_test',
-                'charset' => 'utf8',
-                'driverOptions' => [
-                    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
-                ],
-            ];
-        case 'postgres':
-            return [
-                'driver' => 'pdo_pgsql',
-                'host' => $isCi ? '127.0.0.1' : 'shlink_db_postgres',
-                'user' => 'postgres',
-                'password' => $isCi ? '' : 'root',
-                'dbname' => 'shlink_test',
-                'charset' => 'utf8',
-            ];
-        default:
-            return [];
-    }
+    $driverConfigMap = [
+        'sqlite' => [
+            'driver' => 'pdo_sqlite',
+            'path' => sys_get_temp_dir() . '/shlink-tests.db',
+        ],
+        'mysql' => [
+            'driver' => 'pdo_mysql',
+            'host' => $isCi ? '127.0.0.1' : $getMysqlHost($driver),
+            'user' => 'root',
+            'password' => $isCi ? '' : 'root',
+            'dbname' => 'shlink_test',
+            'charset' => 'utf8',
+            'driverOptions' => [
+                PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+            ],
+        ],
+        'postgres' => [
+            'driver' => 'pdo_pgsql',
+            'host' => $isCi ? '127.0.0.1' : 'shlink_db_postgres',
+            'user' => 'postgres',
+            'password' => $isCi ? '' : 'root',
+            'dbname' => 'shlink_test',
+            'charset' => 'utf8',
+        ],
+    ];
+    $driverConfigMap['maria'] = $driverConfigMap['mysql'];
+
+    return $driverConfigMap[$driver] ?? [];
 };
 
 return [
@@ -64,6 +66,7 @@ return [
     ],
 
     'zend-expressive-swoole' => [
+        'enable_coroutine' => false,
         'swoole-http-server' => [
             'host' => $swooleTestingHost,
             'port' => $swooleTestingPort,
@@ -72,6 +75,7 @@ return [
                 'pid_file' => sys_get_temp_dir() . '/shlink-test-swoole.pid',
                 'worker_num' => 1,
                 'task_worker_num' => 1,
+                'enable_coroutine' => false,
             ],
         ],
     ],

data/infra/database_maria/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

data/infra/php.Dockerfile

@@ -1,9 +1,9 @@
-FROM php:7.3.1-fpm-alpine3.8
+FROM php:7.3.11-fpm-alpine3.10
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV APCU_VERSION 5.1.16
-ENV APCU_BC_VERSION 1.0.4
-ENV XDEBUG_VERSION "2.7.0RC1"
+ENV APCU_VERSION 5.1.18
+ENV APCU_BC_VERSION 1.0.5
+ENV XDEBUG_VERSION 2.8.0
 
 RUN apk update
 
@@ -13,17 +13,17 @@ RUN docker-php-ext-install iconv
 RUN docker-php-ext-install mbstring
 RUN docker-php-ext-install calendar
 
-RUN apk add --no-cache --virtual sqlite-libs
-RUN apk add --no-cache --virtual sqlite-dev
+RUN apk add --no-cache sqlite-libs
+RUN apk add --no-cache sqlite-dev
 RUN docker-php-ext-install pdo_sqlite
 
-RUN apk add --no-cache --virtual icu-dev
+RUN apk add --no-cache icu-dev
 RUN docker-php-ext-install intl
 
-RUN apk add --no-cache --virtual libzip-dev zlib-dev
+RUN apk add --no-cache libzip-dev zlib-dev
 RUN docker-php-ext-install zip
 
-RUN apk add --no-cache --virtual libpng-dev
+RUN apk add --no-cache libpng-dev
 RUN docker-php-ext-install gd
 
 RUN apk add --no-cache postgresql-dev

data/infra/php.ini

@@ -1 +1,6 @@
-date.timezone = Europe/Madrid
+display_errors=On
+error_reporting=-1
+memory_limit=-1
+log_errors_max_len=0
+zend.assertions=1
+assert.exception=1

data/infra/swoole.Dockerfile

@@ -1,9 +1,10 @@
-FROM php:7.3.1-cli-alpine3.8
+FROM php:7.3.11-alpine3.10
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
-ENV APCU_VERSION 5.1.16
-ENV APCU_BC_VERSION 1.0.4
+ENV APCU_VERSION 5.1.18
+ENV APCU_BC_VERSION 1.0.5
 ENV INOTIFY_VERSION 2.0.0
+ENV SWOOLE_VERSION 4.4.12
 
 RUN apk update
 
@@ -13,17 +14,17 @@ RUN docker-php-ext-install iconv
 RUN docker-php-ext-install mbstring
 RUN docker-php-ext-install calendar
 
-RUN apk add --no-cache --virtual sqlite-libs
-RUN apk add --no-cache --virtual sqlite-dev
+RUN apk add --no-cache sqlite-libs
+RUN apk add --no-cache sqlite-dev
 RUN docker-php-ext-install pdo_sqlite
 
-RUN apk add --no-cache --virtual icu-dev
+RUN apk add --no-cache icu-dev
 RUN docker-php-ext-install intl
 
-RUN apk add --no-cache --virtual libzip-dev zlib-dev
+RUN apk add --no-cache libzip-dev zlib-dev
 RUN docker-php-ext-install zip
 
-RUN apk add --no-cache --virtual libpng-dev
+RUN apk add --no-cache libpng-dev
 RUN docker-php-ext-install gd
 
 RUN apk add --no-cache postgresql-dev
@@ -66,7 +67,7 @@ RUN rm /tmp/inotify.tar.gz
 # Install swoole
 # First line fixes an error when installing pecl extensions. Found in https://github.com/docker-library/php/issues/233
 RUN apk add --no-cache --virtual .phpize-deps $PHPIZE_DEPS && \
-    pecl install swoole && \
+    pecl install swoole-${SWOOLE_VERSION} && \
     docker-php-ext-enable swoole && \
     apk del .phpize-deps
 

data/migrations/Version20160819142757.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20160820191203.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20171021093246.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20171022064541.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20180801183328.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20180913205455.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20180915110857.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20181020060559.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20181020065148.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20181110175521.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20190824075137.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace ShlinkMigrations;

data/migrations/Version20190930165521.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20190930165521 extends AbstractMigration
+{
+    /**
+     * @throws SchemaException
+     */
+    public function up(Schema $schema): void
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if ($shortUrls->hasColumn('domain_id')) {
+            return;
+        }
+
+        $domains = $schema->createTable('domains');
+        $domains->addColumn('id', Type::BIGINT, [
+            'unsigned' => true,
+            'autoincrement' => true,
+            'notnull' => true,
+        ]);
+        $domains->addColumn('authority', Type::STRING, [
+            'length' => 512,
+            'notnull' => true,
+        ]);
+        $domains->addUniqueIndex(['authority']);
+        $domains->setPrimaryKey(['id']);
+
+        $shortUrls->addColumn('domain_id', Type::BIGINT, [
+            'unsigned' => true,
+            'notnull' => false,
+        ]);
+        $shortUrls->addForeignKeyConstraint('domains', ['domain_id'], ['id'], [
+            'onDelete' => 'RESTRICT',
+            'onUpdate' => 'RESTRICT',
+        ]);
+    }
+
+    /**
+     * @throws SchemaException
+     */
+    public function down(Schema $schema): void
+    {
+        $schema->getTable('short_urls')->dropColumn('domain_id');
+        $schema->dropTable('domains');
+    }
+}

data/migrations/Version20191001201532.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Index;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\Migrations\AbstractMigration;
+
+use function array_reduce;
+
+final class Version20191001201532 extends AbstractMigration
+{
+    /**
+     * @throws SchemaException
+     */
+    public function up(Schema $schema): void
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if ($shortUrls->hasIndex('unique_short_code_plus_domain')) {
+            return;
+        }
+
+        /** @var Index|null $shortCodesIndex */
+        $shortCodesIndex = array_reduce($shortUrls->getIndexes(), function (?Index $found, Index $current) {
+            [$column] = $current->getColumns();
+            return $column === 'short_code' ? $current : $found;
+        });
+        if ($shortCodesIndex === null) {
+            return;
+        }
+
+        $shortUrls->dropIndex($shortCodesIndex->getName());
+        $shortUrls->addUniqueIndex(['short_code', 'domain_id'], 'unique_short_code_plus_domain');
+    }
+
+    /**
+     * @throws SchemaException
+     */
+    public function down(Schema $schema): void
+    {
+        $shortUrls = $schema->getTable('short_urls');
+
+        $shortUrls->dropIndex('unique_short_code_plus_domain');
+        $shortUrls->addUniqueIndex(['short_code']);
+    }
+}

data/migrations/Version20191020074522.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20191020074522 extends AbstractMigration
+{
+    /**
+     * @throws SchemaException
+     */
+    public function up(Schema $schema): void
+    {
+        $this->getOriginalUrlColumn($schema)->setLength(2048);
+    }
+
+    /**
+     * @throws SchemaException
+     */
+    public function down(Schema $schema): void
+    {
+        $this->getOriginalUrlColumn($schema)->setLength(1024);
+    }
+
+    /**
+     * @throws SchemaException
+     */
+    private function getOriginalUrlColumn(Schema $schema): Column
+    {
+        return $schema->getTable('short_urls')->getColumn('original_url');
+    }
+}

data/migrations_template.txt

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace <namespace>;

docker-compose.override.yml.dist

@@ -24,3 +24,9 @@ services:
         volumes:
             - /etc/passwd:/etc/passwd:ro
             - /etc/group:/etc/group:ro
+
+    shlink_db_maria:
+        user: 1000:1000
+        volumes:
+            - /etc/passwd:/etc/passwd:ro
+            - /etc/group:/etc/group:ro

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
     shlink_nginx:
         container_name: shlink_nginx
-        image: nginx:1.15.9-alpine
+        image: nginx:1.17.6-alpine
         ports:
             - "8000:80"
         volumes:
@@ -24,6 +24,7 @@ services:
         links:
             - shlink_db
             - shlink_db_postgres
+            - shlink_db_maria
             - shlink_redis
 
     shlink_swoole:
@@ -33,11 +34,14 @@ services:
             dockerfile: ./data/infra/swoole.Dockerfile
         ports:
             - "8080:8080"
+            - "9001:9001"
         volumes:
             - ./:/home/shlink
+            - ./data/infra/php.ini:/usr/local/etc/php/php.ini
         links:
             - shlink_db
             - shlink_db_postgres
+            - shlink_db_maria
             - shlink_redis
 
     shlink_db:
@@ -65,6 +69,19 @@ services:
             POSTGRES_DB: shlink
             PGDATA: /var/lib/postgresql/data/pgdata
 
+    shlink_db_maria:
+        container_name: shlink_db_maria
+        image: mariadb:10.2
+        ports:
+            - "3308:3306"
+        volumes:
+            - ./:/home/shlink/www
+            - ./data/infra/database_maria:/var/lib/mysql
+        environment:
+            MYSQL_ROOT_PASSWORD: root
+            MYSQL_DATABASE: shlink
+            MYSQL_INITDB_SKIP_TZINFO: 1
+
     shlink_redis:
         container_name: shlink_redis
         image: redis:5.0-alpine

docker/README.md

@@ -19,7 +19,7 @@ It also expects these two env vars to be provided, in order to properly generate
 So based on this, to run shlink on a local docker service, you should run a command like this:
 
 ```bash
-docker run --name shlink -p 8080:8080 -e SHORT_DOMAIN_HOST=doma.in -e SHORT_DOMAIN_SCHEMA=https shlinkio/shlink
+docker run --name shlink -p 8080:8080 -e SHORT_DOMAIN_HOST=doma.in -e SHORT_DOMAIN_SCHEMA=https shlinkio/shlink:stable
 ```
 
 ### Interact with shlink's CLI on a running container.
@@ -56,16 +56,16 @@ docker exec -it shlink_container shlink
 
 The image comes with a working sqlite database, but in production you will probably want to usa a distributed database.
 
-It is possible to use a set of env vars to make this shlink instance interact with an external MySQL or PostgreSQL database.
+It is possible to use a set of env vars to make this shlink instance interact with an external MySQL, MariaDB or PostgreSQL database.
 
-* `DB_DRIVER`: **[Mandatory]**. Use the value **mysql** or **postgres** to prevent the sqlite database to be used.
+* `DB_DRIVER`: **[Mandatory]**. Use the value **mysql**, **maria** or **postgres** to prevent the sqlite database to be used.
 * `DB_NAME`: [Optional]. The database name to be used. Defaults to **shlink**.
 * `DB_USER`: **[Mandatory]**. The username credential for the database server.
 * `DB_PASSWORD`: **[Mandatory]**. The password credential for the database server.
 * `DB_HOST`: **[Mandatory]**. The host name of the server running the database engine.
 * `DB_PORT`: [Optional]. The port in which the database service is running.
-    * Default value is based on the driver:
-        * **mysql** -> `3306`
+    * Default value is based on the value provided for `DB_DRIVER`:
+        * **mysql** or **maria** -> `3306`
         * **postgres** -> `5432`
 
 > PostgreSQL is supported since v1.16.1 of this image. Do not try to use it with previous versions.
@@ -73,13 +73,13 @@ It is possible to use a set of env vars to make this shlink instance interact wi
 Taking this into account, you could run shlink on a local docker service like this:
 
 ```bash
-docker run --name shlink -p 8080:8080 -e SHORT_DOMAIN_HOST=doma.in -e SHORT_DOMAIN_SCHEMA=https -e DB_DRIVER=mysql -e DB_USER=root -e DB_PASSWORD=123abc -e DB_HOST=something.rds.amazonaws.com shlinkio/shlink
+docker run --name shlink -p 8080:8080 -e SHORT_DOMAIN_HOST=doma.in -e SHORT_DOMAIN_SCHEMA=https -e DB_DRIVER=mysql -e DB_USER=root -e DB_PASSWORD=123abc -e DB_HOST=something.rds.amazonaws.com shlinkio/shlink:stable
 ```
 
 You could even link to a local database running on a different container:
 
 ```bash
-docker run --name shlink -p 8080:8080 [...] -e DB_HOST=some_mysql_container --link some_mysql_container shlinkio/shlink
+docker run --name shlink -p 8080:8080 [...] -e DB_HOST=some_mysql_container --link some_mysql_container shlinkio/shlink:stable
 ```
 
 > If you have considered using SQLite but sharing the database file with a volume, read [this issue](https://github.com/shlinkio/shlink-docker-image/issues/40) first.
@@ -92,18 +92,25 @@ This is the complete list of supported env vars:
 
 * `SHORT_DOMAIN_HOST`: The custom short domain used for this shlink instance. For example **doma.in**.
 * `SHORT_DOMAIN_SCHEMA`: Either **http** or **https**.
-* `SHORTCODE_CHARS`: A charset to use when building short codes. Only needed when using more than one shlink instance ([Multi instance considerations](#multi-instance-considerations)).
-* `DB_DRIVER`: **sqlite** (which is the default value), **mysql** or **postgres**.
+* `DB_DRIVER`: **sqlite** (which is the default value), **mysql**, **maria** or **postgres**.
 * `DB_NAME`: The database name to be used when using an external database driver. Defaults to **shlink**.
 * `DB_USER`: The username credential to be used when using an external database driver.
 * `DB_PASSWORD`: The password credential to be used when using an external database driver.
 * `DB_HOST`: The host name of the database server  when using an external database driver.
-* `DB_PORT`: The port in which the database service is running when using an external database driver. Defaults to **3306**.
+* `DB_PORT`: The port in which the database service is running when using an external database driver.
+    * Default value is based on the value provided for `DB_DRIVER`:
+        * **mysql** or **maria** -> `3306`
+        * **postgres** -> `5432`
 * `DISABLE_TRACK_PARAM`: The name of a query param that can be used to visit short URLs avoiding the visit to be tracked. This feature won't be available if not value is provided.
 * `DELETE_SHORT_URL_THRESHOLD`: The amount of visits on short URLs which will not allow them to be deleted. Defaults to `15`.
-* `LOCALE`: Defines the default language for error pages when a user accesses a short URL which does not exist. Supported values are **es** and **en**. Defaults to **en**.
 * `VALIDATE_URLS`: Boolean which tells if shlink should validate a status 20x (after following redirects) is returned when trying to shorten a URL. Defaults to `true`.
-* `NOT_FOUND_REDIRECT_TO`: If a URL is provided here, when a user tries to access an invalid short URL, he/she will be redirected to this value. If this env var is not provided, the user will see a generic `404 - not found` page.
+* `INVALID_SHORT_URL_REDIRECT_TO`: If a URL is provided here, when a user tries to access an invalid short URL, he/she will be redirected to this value. If this env var is not provided, the user will see a generic `404 - not found` page.
+* `REGULAR_404_REDIRECT_TO`: If a URL is provided here, when a user tries to access a URL not matching any one supported by the router, he/she will be redirected to this value. If this env var is not provided, the user will see a generic `404 - not found` page.
+* `BASE_URL_REDIRECT_TO`: If a URL is provided here, when a user tries to access Shlink's base URL, he/she will be redirected to this value. If this env var is not provided, the user will see a generic `404 - not found` page.
+* `BASE_PATH`: The base path from which you plan to serve shlink, in case you don't want to serve it from the root of the domain. Defaults to `''`.
+* `WEB_WORKER_NUM`: The amount of concurrent http requests this shlink instance will be able to server. Defaults to 16.
+* `TASK_WORKER_NUM`: The amount of concurrent background tasks this shlink instance will be able to execute. Defaults to 16.
+* `VISITS_WEBHOOKS`: A comma-separated list of URLs that will receive a `POST` request when a short URL receives a visit.
 * `REDIS_SERVERS`: A comma-separated list of redis servers where Shlink locks are stored (locks are used to prevent some operations to be run more than once in parallel).
 
     This is important when running more than one Shlink instance ([Multi instance considerations](#multi-instance-considerations)). If not provided, Shlink stores locks on every instance separately.
@@ -112,6 +119,9 @@ This is the complete list of supported env vars:
 
     In the future, these redis servers could be used for other caching operations performed by shlink.
 
+* `NOT_FOUND_REDIRECT_TO`: **Deprecated since v1.20 in favor of `INVALID_SHORT_URL_REDIRECT_TO`** If a URL is provided here, when a user tries to access an invalid short URL, he/she will be redirected to this value. If this env var is not provided, the user will see a generic `404 - not found` page.
+* `SHORTCODE_CHARS`: **Ignored when using Shlink 1.20 or newer**. A charset to use when building short codes. Only needed when using more than one shlink instance ([Multi instance considerations](#multi-instance-considerations)).
+
 An example using all env vars could look like this:
 
 ```bash
@@ -128,11 +138,16 @@ docker run \
     -e DB_PORT=3306 \
     -e DISABLE_TRACK_PARAM="no-track" \
     -e DELETE_SHORT_URL_THRESHOLD=30 \
-    -e LOCALE=es \
     -e VALIDATE_URLS=false \
-    -e "NOT_FOUND_REDIRECT_TO=https://www.google.com" \
+    -e "INVALID_SHORT_URL_REDIRECT_TO=https://my-landing-page.com" \
+    -e "REGULAR_404_REDIRECT_TO=https://my-landing-page.com" \
+    -e "BASE_URL_REDIRECT_TO=https://my-landing-page.com" \
     -e "REDIS_SERVERS=tcp://172.20.0.1:6379,tcp://172.20.0.2:6379" \
-    shlinkio/shlink
+    -e "BASE_PATH=/my-campaign" \
+    -e WEB_WORKER_NUM=64 \
+    -e TASK_WORKER_NUM=32 \
+    -e "VISITS_WEBHOOKS=http://my-api.com/api/v2.3/notify,https://third-party.io/foo" \
+    shlinkio/shlink:stable
 ```
 
 ## Provide config via volumes
@@ -147,15 +162,23 @@ The whole configuration should have this format, but it can be split into multip
 {
     "disable_track_param": "my_param",
     "delete_short_url_threshold": 30,
-    "locale": "es",
     "short_domain_schema": "https",
     "short_domain_host": "doma.in",
     "validate_url": false,
-    "not_found_redirect_to": "https://my-landing-page.com",
+    "invalid_short_url_redirect_to": "https://my-landing-page.com",
+    "regular_404_redirect_to": "https://my-landing-page.com",
+    "base_url_redirect_to": "https://my-landing-page.com",
+    "base_path": "/my-campaign",
+    "web_worker_num": 64,
+    "task_worker_num": 32,
     "redis_servers": [
         "tcp://172.20.0.1:6379",
         "tcp://172.20.0.2:6379"
     ],
+    "visits_webhooks": [
+        "http://my-api.com/api/v2.3/notify",
+        "https://third-party.io/foo"
+    ],
     "db_config": {
         "driver": "pdo_mysql",
         "dbname": "shlink",
@@ -163,42 +186,45 @@ The whole configuration should have this format, but it can be split into multip
         "password": "123abc",
         "host": "something.rds.amazonaws.com",
         "port": "3306"
-    }
+    },
+    "not_found_redirect_to": "https://my-landing-page.com"
 }
 ```
 
 > This is internally parsed to how shlink expects the config. If you are using a version previous to 1.17.0, this parser is not present and you need to provide a config structure like the one [documented previously](https://github.com/shlinkio/shlink-docker-image/tree/v1.16.3#provide-config-via-volumes).
 
+> The `not_found_redirect_to` option has been deprecated in v1.20. Use `invalid_short_url_redirect_to` instead (however, it will still work for backwards compatibility).
+
 Once created just run shlink with the volume:
 
 ```bash
-docker run --name shlink -p 8080:8080 -v ${PWD}/my/config/dir:/etc/shlink/config/params shlinkio/shlink
+docker run --name shlink -p 8080:8080 -v ${PWD}/my/config/dir:/etc/shlink/config/params shlinkio/shlink:stable
 ```
 
 ## Multi instance considerations
 
 These are some considerations to take into account when running multiple instances of shlink.
 
-* The first time shlink is run, it generates a charset used to generate short codes, which is a shuffled base62 charset.
-
-    If you are using several shlink instances, you will probably want all of them to use the same charset.
-
-    You can get a shuffled base62 charset by going to [https://shlink.io/short-code-chars](https://shlink.io/short-code-chars), and then you just need to pass it to all shlink instances using the `SHORTCODE_CHARS` env var.
-
-    If you don't do this, each shlink instance will use a different charset. However this shouldn't be a problem in practice, since the chances to get a collision will be very low.
-
 * Some operations performed by Shlink should never be run more than once at the same time (like creating the database for the first time, or downloading the GeoLite2 database). For this reason, Shlink uses a locking system.
 
     However, these locks are locally scoped to each Shlink instance by default.
 
     You can (and should) make the locks to be shared by all Shlink instances by using a redis server/cluster. Just define the `REDIS_SERVERS` env var with the list of servers.
 
+* **Ignore this if using Shlink 1.20 or newer**. The first time shlink is run, it generates a charset used to generate short codes, which is a shuffled base62 charset.
+
+    If you are using several shlink instances, you will probably want all of them to use the same charset.
+
+    You can get a shuffled base62 charset by going to [https://shlink.io/short-code-chars](https://shlink.io/short-code-chars), and then you just need to pass it to all shlink instances using the `SHORTCODE_CHARS` env var.
+
+    If you don't do this, each shlink instance will use a different charset. However this shouldn't be a problem in practice, since the chances to get a collision will be very low.
+
 ## Versions
 
-Versions of this image match the shlink version it contains.
+Versioning on this docker image works as follows:
 
-For example, installing `shlinkio/shlink:1.15.0`, you will get an image containing shlink v1.15.0.
+* `X.X.X`:  when providing a specific version number, the image version will match the shlink version it contains. For example, installing `shlinkio/shlink:1.15.0`, you will get an image containing shlink v1.15.0.
+* `stable`: always holds the latest stable tag. For example, if latest shlink version is 1.20.0, installing `shlinkio/shlink:stable`, you will get an image containing shlink v1.20.0
+* `latest`: always holds the latest contents in master, and it's considered unstable and not suitable for production.
 
-The `latest` docker tag always holds the latest contents in master, and it's considered unestable and not suitable for production.
-
-> There are no official shlink images previous to v1.15.0.
+> **Important**: The docker image was introduced with shlink v1.15.0, so there are no official images previous to that versions.

docker/config/php.ini

@@ -0,0 +1,3 @@
+log_errors_max_len=0
+zend.assertions=1
+assert.exception=1

docker/config/shlink_in_docker.local.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink;
@@ -10,6 +11,7 @@ use function explode;
 use function file_exists;
 use function file_get_contents;
 use function file_put_contents;
+use function Functional\contains;
 use function implode;
 use function Shlinkio\Shlink\Common\env;
 use function sprintf;
@@ -21,24 +23,24 @@ $helper = new class {
     private const BASE62 = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
     private const DB_DRIVERS_MAP = [
         'mysql' => 'pdo_mysql',
+        'maria' => 'pdo_mysql',
         'postgres' => 'pdo_pgsql',
     ];
     private const DB_PORTS_MAP = [
         'mysql' => '3306',
+        'maria' => '3306',
         'postgres' => '5432',
     ];
 
-    /** @var string */
-    private $charset;
     /** @var string */
     private $secretKey;
 
     public function __construct()
     {
-        [$this->charset, $this->secretKey] = $this->initShlinkKeys();
+        [, $this->secretKey] = $this->initShlinkSecretKey();
     }
 
-    private function initShlinkKeys(): array
+    private function initShlinkSecretKey(): array
     {
         $keysFile = sprintf('%s/shlink.keys', sys_get_temp_dir());
         if (file_exists($keysFile)) {
@@ -46,29 +48,19 @@ $helper = new class {
         }
 
         $keys = [
-            env('SHORTCODE_CHARS', $this->generateShortcodeChars()),
-            env('SECRET_KEY', $this->generateSecretKey()),
+            '', // This was the SHORTCODE_CHARS. Kept as empty string for BC
+            env('SECRET_KEY', $this->generateSecretKey()), // Deprecated
         ];
 
         file_put_contents($keysFile, implode(',', $keys));
         return $keys;
     }
 
-    private function generateShortcodeChars(): string
-    {
-        return str_shuffle(self::BASE62);
-    }
-
     private function generateSecretKey(): string
     {
         return substr(str_shuffle(self::BASE62), 0, 32);
     }
 
-    public function getShortcodeChars(): string
-    {
-        return $this->charset;
-    }
-
     public function getSecretKey(): string
     {
         return $this->secretKey;
@@ -84,8 +76,8 @@ $helper = new class {
             ];
         }
 
-        $driverOptions = $driver !== 'mysql' ? [] : [
-            // PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+        $driverOptions = ! contains(['maria', 'mysql'], $driver) ? [] : [
+            // 1002 -> PDO::MYSQL_ATTR_INIT_COMMAND
             1002 => 'SET NAMES utf8',
         ];
         return [
@@ -99,15 +91,20 @@ $helper = new class {
         ];
     }
 
-    public function getNotFoundConfig(): array
+    public function getNotFoundRedirectsConfig(): array
     {
-        $notFoundRedirectTo = env('NOT_FOUND_REDIRECT_TO');
-
         return [
-            'enable_redirection' => $notFoundRedirectTo !== null,
-            'redirect_to' => $notFoundRedirectTo,
+            'invalid_short_url' => env('INVALID_SHORT_URL_REDIRECT_TO', env('NOT_FOUND_REDIRECT_TO')),
+            'regular_404' => env('REGULAR_404_REDIRECT_TO'),
+            'base_url' => env('BASE_URL_REDIRECT_TO'),
         ];
     }
+
+    public function getVisitsWebhooks(): array
+    {
+        $webhooks = env('VISITS_WEBHOOKS');
+        return $webhooks === null ? [] : explode(',', $webhooks);
+    }
 };
 
 return [
@@ -124,10 +121,6 @@ return [
         'visits_threshold' => (int) env('DELETE_SHORT_URL_THRESHOLD', 15),
     ],
 
-    'translator' => [
-        'locale' => env('LOCALE', 'en'),
-    ],
-
     'entity_manager' => [
         'connection' => $helper->getDbConfig(),
     ],
@@ -137,27 +130,22 @@ return [
             'schema' => env('SHORT_DOMAIN_SCHEMA', 'http'),
             'hostname' => env('SHORT_DOMAIN_HOST', ''),
         ],
-        'shortcode_chars' => $helper->getShortcodeChars(),
         'validate_url' => (bool) env('VALIDATE_URLS', true),
-        'not_found_short_url' => $helper->getNotFoundConfig(),
+        'visits_webhooks' => $helper->getVisitsWebhooks(),
     ],
 
-    'logger' => [
-        'handlers' => [
-            'shlink_rotating_handler' => [
-                'level' => Logger::EMERGENCY, // This basically disables regular file logs
-            ],
-            'shlink_stdout_handler' => [
-                'class' => StreamHandler::class,
-                'level' => Logger::INFO,
-                'stream' => 'php://stdout',
-                'formatter' => 'dashed',
-            ],
-        ],
+    'not_found_redirects' => $helper->getNotFoundRedirectsConfig(),
 
-        'loggers' => [
-            'Shlink' => [
-                'handlers' => ['shlink_stdout_handler'],
+    'logger' => [
+        'Shlink' => [
+            'handlers' => [
+                'shlink_handler' => [
+                    'name' => StreamHandler::class,
+                    'params' => [
+                        'level' => Logger::INFO,
+                        'stream' => 'php://stdout',
+                    ],
+                ],
             ],
         ],
     ],
@@ -172,4 +160,17 @@ return [
         'servers' => env('REDIS_SERVERS'),
     ],
 
+    'router' => [
+        'base_path' => env('BASE_PATH', ''),
+    ],
+
+    'zend-expressive-swoole' => [
+        'swoole-http-server' => [
+            'options' => [
+                'worker_num' => (int) env('WEB_WORKER_NUM', 16),
+                'task_worker_num' => (int) env('TASK_WORKER_NUM', 16),
+            ],
+        ],
+    ],
+
 ];

docs/swagger/definitions/Error.json

@@ -1,13 +1,32 @@
 {
     "type": "object",
+    "required": ["type", "title", "detail", "status"],
     "properties": {
-        "code": {
+        "type": {
             "type": "string",
             "description": "A machine unique code"
         },
+        "title": {
+            "type": "string",
+            "description": "A unique title"
+        },
+        "detail": {
+            "type": "string",
+            "description": "A human-friendly error description"
+        },
+        "status": {
+            "type": "number",
+            "description": "HTTP response status code"
+        },
+        "code": {
+            "type": "string",
+            "description": "**[Deprecated] Use type instead. Not returned for v2 of the REST API** A machine unique code",
+            "deprecated": true
+        },
         "message": {
             "type": "string",
-            "description": "A human-friendly error message"
+            "description": "**[Deprecated] Use detail instead. Not returned for v2 of the REST API** A human-friendly error message",
+            "deprecated": true
         }
     }
 }

docs/swagger/parameters/version.json

@@ -0,0 +1,13 @@
+{
+    "name": "version",
+    "description": "The API version to be consumed",
+    "in": "path",
+    "required": true,
+    "schema": {
+        "type": "string",
+        "enum": [
+            "2",
+            "1"
+        ]
+    }
+}

docs/swagger/paths/v1_short-urls.json

@@ -7,6 +7,9 @@
         "summary": "List short URLs",
         "description": "Returns the list of short URLs.<br><br>**Important note**: Before shlink v1.13, this endpoint used to use the `/short-codes` path instead of `/short-urls`. Both of them will keep working, while the first one is considered deprecated.",
         "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
             {
                 "name": "page",
                 "in": "query",
@@ -51,6 +54,24 @@
                         "visits"
                     ]
                 }
+            },
+            {
+                "name": "startDate",
+                "in": "query",
+                "description": "The date (in ISO-8601 format) from which we want to get short URLs.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "endDate",
+                "in": "query",
+                "description": "The date (in ISO-8601 format) until which we want to get short URLs.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
             }
         ],
         "security": [
@@ -150,7 +171,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -175,6 +196,11 @@
                 "Bearer": []
             }
         ],
+        "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            }
+        ],
         "requestBody": {
             "description": "Request body.",
             "required": true,
@@ -216,6 +242,10 @@
                             "findIfExists": {
                                 "description": "Will force existing matching URL to be returned if found, instead of creating a new one",
                                 "type": "boolean"
+                            },
+                            "domain": {
+                                "description": "The domain to which the short URL will be attached",
+                                "type": "string"
                             }
                         }
                     }
@@ -252,11 +282,43 @@
                 }
             },
             "400": {
-                "description": "The long URL was not provided or is invalid.",
+                "description": "Some of provided data is invalid. Check extra fields to know exactly what.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
-                            "$ref": "../definitions/Error.json"
+                            "type": "object",
+                            "allOf": [
+                                {
+                                    "$ref": "../definitions/Error.json"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "invalidElements": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "string",
+                                                "enum": [
+                                                    "validSince",
+                                                    "validUntil",
+                                                    "customSlug",
+                                                    "maxVisits",
+                                                    "findIfExists",
+                                                    "domain"
+                                                ]
+                                            }
+                                        },
+                                        "url": {
+                                            "type": "string",
+                                            "description": "A URL that could not be verified, if the error type is INVALID_URL"
+                                        },
+                                        "customSlug": {
+                                            "type": "string",
+                                            "description": "Provided custom slug when the error type is INVALID_SLUG"
+                                        }
+                                    }
+                                }
+                            ]
                         }
                     }
                 }
@@ -264,7 +326,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }

docs/swagger/paths/v1_short-urls_shorten.json

@@ -7,6 +7,9 @@
         "summary": "Create a short URL",
         "description": "Creates a short URL in a single API call. Useful for third party integrations.<br><br>**Important note**: Before shlink v1.13, this endpoint used to use the `/short-codes` path instead of `/short-urls`. Both of them will keep working, while the first one is considered deprecated.",
         "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
             {
                 "name": "apiKey",
                 "in": "query",
@@ -77,7 +80,7 @@
             "400": {
                 "description": "The long URL was not provided or is invalid.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -89,9 +92,12 @@
                     }
                 },
                 "examples": {
-                    "application/json": {
-                        "error": "INVALID_URL",
-                        "message": "Provided URL foo is invalid. Try with a different one."
+                    "application/problem+json": {
+                        "title": "Invalid URL",
+                        "type": "INVALID_URL",
+                        "detail": "Provided URL foo is invalid. Try with a different one.",
+                        "status": 400,
+                        "url": "https://invalid-url.com"
                     },
                     "text/plain": "INVALID_URL"
                 }
@@ -99,7 +105,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -111,11 +117,11 @@
                     }
                 },
                 "examples": {
-                    "application/json": {
-                        "error": "UNKNOWN_ERROR",
+                    "application/problem+json": {
+                        "error": "INTERNAL_SERVER_ERROR",
                         "message": "Unexpected error occurred"
                     },
-                    "text/plain": "UNKNOWN_ERROR"
+                    "text/plain": "INTERNAL_SERVER_ERROR"
                 }
             }
         }

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

@@ -7,6 +7,9 @@
         "summary": "Parse short code",
         "description": "Get the long URL behind a short URL's short code.<br><br>**Important note**: Before shlink v1.13, this endpoint used to use the `/short-codes` path instead of `/short-urls`. Both of them will keep working, while the first one is considered deprecated.",
         "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
             {
                 "name": "shortCode",
                 "in": "path",
@@ -15,6 +18,15 @@
                 "schema": {
                     "type": "string"
                 }
+            },
+            {
+                "name": "domain",
+                "in": "query",
+                "description": "The domain in which the short code should be searched for. Will fall back to default domain if not found.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
             }
         ],
         "security": [
@@ -53,20 +65,10 @@
                     }
                 }
             },
-            "400": {
-                "description": "Provided shortCode does not match the character set currently used by the app to generate short codes.",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
-            },
             "404": {
                 "description": "No URL was found for provided short code.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -76,7 +78,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -94,6 +96,9 @@
         "summary": "Edit short URL",
         "description": "Update certain meta arguments from an existing short URL.<br><br>**Important note**: Before shlink v1.13, this endpoint used to use the `/short-codes` path instead of `/short-urls`. Both of them will keep working, while the first one is considered deprecated.",
         "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
             {
                 "name": "shortCode",
                 "in": "path",
@@ -144,9 +149,31 @@
             "400": {
                 "description": "Provided meta arguments are invalid.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
-                            "$ref": "../definitions/Error.json"
+                            "type": "object",
+                            "allOf": [
+                                {
+                                    "$ref": "../definitions/Error.json"
+                                },
+                                {
+                                    "type": "object",
+                                    "required": ["invalidElements"],
+                                    "properties": {
+                                        "invalidElements": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "string",
+                                                "enum": [
+                                                    "validSince",
+                                                    "validUntil",
+                                                    "maxVisits"
+                                                ]
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
                         }
                     }
                 }
@@ -154,7 +181,7 @@
             "404": {
                 "description": "No short URL was found for provided short code.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -164,7 +191,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -183,6 +210,9 @@
         "summary": "[DEPRECATED] Edit short URL",
         "description": "**[DEPRECATED]** Use [editShortUrl](#/Short_URLs/getShortUrl) instead",
         "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
             {
                 "name": "shortCode",
                 "in": "path",
@@ -233,7 +263,7 @@
             "400": {
                 "description": "Provided meta arguments are invalid.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -243,7 +273,7 @@
             "404": {
                 "description": "No short URL was found for provided short code.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -253,7 +283,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -271,6 +301,9 @@
         "summary": "Delete short URL",
         "description": "Deletes the short URL for provided short code.<br><br>**Important note**: Before shlink v1.13, this endpoint used to use the `/short-codes` path instead of `/short-urls`. Both of them will keep working, while the first one is considered deprecated.",
         "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
             {
                 "name": "shortCode",
                 "in": "path",
@@ -293,26 +326,28 @@
             "204": {
                 "description": "The short URL has been properly deleted."
             },
-            "400": {
+            "422": {
                 "description": "The visits threshold in shlink does not allow this short URL to be deleted.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
                     }
                 },
                 "examples": {
-                    "application/json": {
-                        "error": "INVALID_SHORTCODE_DELETION",
-                        "message": "It is not possible to delete URL with short code \"abc123\" because it has reached more than \"15\" visits."
+                    "application/problem+json": {
+                        "title": "Cannot delete short URL",
+                        "type": "INVALID_SHORTCODE_DELETION",
+                        "detail": "It is not possible to delete URL with short code \"abc123\" because it has reached more than \"15\" visits.",
+                        "status": 422
                     }
                 }
             },
             "404": {
                 "description": "No short URL was found for provided short code.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -322,7 +357,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }

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

@@ -7,6 +7,9 @@
         "summary": "Edit tags on short URL",
         "description": "Edit the tags on URL identified by provided short code.<br><br>**Important note**: Before shlink v1.13, this endpoint used to use the `/short-codes` path instead of `/short-urls`. Both of them will keep working, while the first one is considered deprecated.",
         "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
             {
                 "name": "shortCode",
                 "in": "path",
@@ -78,7 +81,7 @@
             "400": {
                 "description": "The request body does not contain a \"tags\" param with array type.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }

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

@@ -7,6 +7,9 @@
         "summary": "List visits for short URL",
         "description": "Get the list of visits on the short URL behind provided short code.<br><br>**Important note**: Before shlink v1.13, this endpoint used to use the `/short-codes` path instead of `/short-urls`. Both of them will keep working, while the first one is considered deprecated.",
         "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
             {
                 "name": "shortCode",
                 "in": "path",
@@ -132,7 +135,7 @@
             "404": {
                 "description": "The short code does not belong to any short URL.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -142,7 +145,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }

docs/swagger/paths/v1_tags.json

@@ -14,6 +14,11 @@
                 "Bearer": []
             }
         ],
+        "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            }
+        ],
         "responses": {
             "200": {
                 "description": "The list of tags",
@@ -53,7 +58,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -78,6 +83,11 @@
                 "Bearer": []
             }
         ],
+        "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            }
+        ],
         "requestBody": {
             "description": "Request body.",
             "required": true,
@@ -140,7 +150,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -165,6 +175,11 @@
                 "Bearer": []
             }
         ],
+        "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            }
+        ],
         "requestBody": {
             "description": "Request body.",
             "required": true,
@@ -197,7 +212,7 @@
             "400": {
                 "description": "You have not provided either the oldName or the newName params.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -207,7 +222,17 @@
             "404": {
                 "description": "There's no tag found with the name provided in oldName param.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "409": {
+                "description": "The name provided in newName param is already in use for another tag.",
+                "content": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -217,7 +242,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }
@@ -235,6 +260,9 @@
         "summary": "Delete tags",
         "description": "Deletes provided list of tags",
         "parameters": [
+            {
+                "$ref": "../parameters/version.json"
+            },
             {
                 "name": "tags[]",
                 "in": "query",
@@ -263,7 +291,7 @@
             "500": {
                 "description": "Unexpected error.",
                 "content": {
-                    "application/json": {
+                    "application/problem+json": {
                         "schema": {
                             "$ref": "../definitions/Error.json"
                         }

docs/swagger/paths/{shortCode}.json

@@ -20,16 +20,6 @@
         "responses": {
             "302": {
                 "description": "Visit properly tracked and redirected"
-            },
-            "500": {
-                "description": "Unexpected error.",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
             }
         }
     }

docs/swagger/paths/{shortCode}_preview.json

@@ -29,16 +29,6 @@
                         }
                     }
                 }
-            },
-            "500": {
-                "description": "Unexpected error.",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
             }
         }
     }

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

@@ -40,16 +40,6 @@
                         }
                     }
                 }
-            },
-            "500": {
-                "description": "Unexpected error.",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
             }
         }
     }

docs/swagger/paths/{shortCode}_track.json

@@ -28,16 +28,6 @@
                         }
                     }
                 }
-            },
-            "500": {
-                "description": "Unexpected error.",
-                "content": {
-                    "application/json": {
-                        "schema": {
-                            "$ref": "../definitions/Error.json"
-                        }
-                    }
-                }
             }
         }
     }

docs/swagger/swagger.json

@@ -71,24 +71,24 @@
     ],
 
     "paths": {
-        "/rest/v1/short-urls": {
+        "/rest/v{version}/short-urls": {
             "$ref": "paths/v1_short-urls.json"
         },
-        "/rest/v1/short-urls/shorten": {
+        "/rest/v{version}/short-urls/shorten": {
             "$ref": "paths/v1_short-urls_shorten.json"
         },
-        "/rest/v1/short-urls/{shortCode}": {
+        "/rest/v{version}/short-urls/{shortCode}": {
             "$ref": "paths/v1_short-urls_{shortCode}.json"
         },
-        "/rest/v1/short-urls/{shortCode}/tags": {
+        "/rest/v{version}/short-urls/{shortCode}/tags": {
             "$ref": "paths/v1_short-urls_{shortCode}_tags.json"
         },
 
-        "/rest/v1/tags": {
+        "/rest/v{version}/tags": {
             "$ref": "paths/v1_tags.json"
         },
 
-        "/rest/v1/short-urls/{shortCode}/visits": {
+        "/rest/v{version}/short-urls/{shortCode}/visits": {
             "$ref": "paths/v1_short-urls_{shortCode}_visits.json"
         },
 

hooks/build

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 
-if [[ ${SOURCE_BRANCH} == 'master' ]]; then
+if [[ ${SOURCE_BRANCH} == 'develop' ]]; then
     SHLINK_RELEASE='latest'
 else
     SHLINK_RELEASE=${SOURCE_BRANCH#?}

migrations.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    'name' => 'ShlinkMigrations',
+    'migrations_namespace' => 'ShlinkMigrations',
+    'table_name' => 'migrations',
+    'migrations_directory' => 'data/migrations',
+    'custom_template' => 'data/migrations_template.txt',
+];

migrations.yml

@@ -1,5 +0,0 @@
-name: ShlinkMigrations
-migrations_namespace: ShlinkMigrations
-table_name: migrations
-migrations_directory: data/migrations
-custom_template: data/migrations_template.txt

module/CLI/config/cli.config.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI;

module/CLI/config/dependencies.config.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI;
@@ -14,7 +15,7 @@ use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
 use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Symfony\Component\Console as SymfonyCli;
-use Symfony\Component\Lock\Factory as Locker;
+use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Zend\ServiceManager\Factory\InvokableFactory;
@@ -57,7 +58,7 @@ return [
     ],
 
     ConfigAbstractFactory::class => [
-        GeolocationDbUpdater::class => [DbUpdater::class, Reader::class, Locker::class],
+        GeolocationDbUpdater::class => [DbUpdater::class, Reader::class, 'Shlinkio\Shlink\LocalLockFactory'],
 
         Command\ShortUrl\GenerateShortUrlCommand::class => [Service\UrlShortener::class, 'config.url_shortener.domain'],
         Command\ShortUrl\ResolveUrlCommand::class => [Service\UrlShortener::class],
@@ -69,7 +70,7 @@ return [
         Command\Visit\LocateVisitsCommand::class => [
             Service\VisitService::class,
             IpLocationResolverInterface::class,
-            Locker::class,
+            LockFactory::class,
             GeolocationDbUpdater::class,
         ],
         Command\Visit\UpdateDbCommand::class => [DbUpdater::class],
@@ -84,14 +85,14 @@ return [
         Command\Tag\DeleteTagsCommand::class => [Service\Tag\TagService::class],
 
         Command\Db\CreateDatabaseCommand::class => [
-            Locker::class,
+            LockFactory::class,
             SymfonyCli\Helper\ProcessHelper::class,
             PhpExecutableFinder::class,
             Connection::class,
             NoDbNameConnectionFactory::SERVICE_NAME,
         ],
         Command\Db\MigrateDatabaseCommand::class => [
-            Locker::class,
+            LockFactory::class,
             SymfonyCli\Helper\ProcessHelper::class,
             PhpExecutableFinder::class,
         ],

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

@@ -1,10 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
-use InvalidArgumentException;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
+use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -44,7 +45,7 @@ class DisableKeyCommand extends Command
             $io->success(sprintf('API key "%s" properly disabled', $apiKey));
             return ExitCodes::EXIT_SUCCESS;
         } catch (InvalidArgumentException $e) {
-            $io->error(sprintf('API key "%s" does not exist.', $apiKey));
+            $io->error($e->getMessage());
             return ExitCodes::EXIT_FAILURE;
         }
     }

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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Api;
@@ -35,7 +36,7 @@ class GenerateKeyCommand extends Command
             ->addOption(
                 'expirationDate',
                 'e',
-                InputOption::VALUE_OPTIONAL,
+                InputOption::VALUE_REQUIRED,
                 'The date in which the API key should expire. Use any valid PHP format.'
             );
     }

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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Api;

module/CLI/src/Command/Config/GenerateCharsetCommand.php

@@ -1,10 +1,10 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Config;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
-use Shlinkio\Shlink\Core\Options\UrlShortenerOptions;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -17,6 +17,7 @@ use function str_shuffle;
 class GenerateCharsetCommand extends Command
 {
     public const NAME = 'config:generate-charset';
+    private const DEFAULT_CHARS = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
     protected function configure(): void
     {
@@ -25,14 +26,14 @@ class GenerateCharsetCommand extends Command
             ->setDescription(sprintf(
                 '[DEPRECATED] Generates a character set sample just by shuffling the default one, "%s". '
                 . 'Then it can be set in the SHORTCODE_CHARS environment variable',
-                UrlShortenerOptions::DEFAULT_CHARS
+                self::DEFAULT_CHARS
             ))
             ->setHelp('<fg=red;options=bold>This command is deprecated. Better leave shlink generate the charset.</>');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): ?int
     {
-        $charSet = str_shuffle(UrlShortenerOptions::DEFAULT_CHARS);
+        $charSet = str_shuffle(self::DEFAULT_CHARS);
         (new SymfonyStyle($input, $output))->success(sprintf('Character set: "%s"', $charSet));
         return ExitCodes::EXIT_SUCCESS;
     }

module/CLI/src/Command/Config/GenerateSecretCommand.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Config;

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

@@ -1,12 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Db;
 
 use Shlinkio\Shlink\CLI\Command\Util\AbstractLockedCommand;
+use Shlinkio\Shlink\CLI\Command\Util\LockedCommandConfig;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Lock\Factory as Locker;
+use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Process\PhpExecutableFinder;
 
 use function array_unshift;
@@ -18,7 +20,7 @@ abstract class AbstractDatabaseCommand extends AbstractLockedCommand
     /** @var string */
     private $phpBinary;
 
-    public function __construct(Locker $locker, ProcessHelper $processHelper, PhpExecutableFinder $phpFinder)
+    public function __construct(LockFactory $locker, ProcessHelper $processHelper, PhpExecutableFinder $phpFinder)
     {
         parent::__construct($locker);
         $this->processHelper = $processHelper;
@@ -28,6 +30,11 @@ abstract class AbstractDatabaseCommand extends AbstractLockedCommand
     protected function runPhpCommand(OutputInterface $output, array $command): void
     {
         array_unshift($command, $this->phpBinary);
-        $this->processHelper->run($output, $command, null, null, $output->getVerbosity());
+        $this->processHelper->mustRun($output, $command);
+    }
+
+    protected function getLockConfig(): LockedCommandConfig
+    {
+        return new LockedCommandConfig($this->getName(), true);
     }
 }

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

@@ -1,16 +1,16 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Db;
 
 use Doctrine\DBAL\Connection;
-use Shlinkio\Shlink\CLI\Command\Util\LockedCommandConfig;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\Lock\Factory as Locker;
+use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Process\PhpExecutableFinder;
 
 use function Functional\contains;
@@ -18,8 +18,8 @@ use function Functional\contains;
 class CreateDatabaseCommand extends AbstractDatabaseCommand
 {
     public const NAME = 'db:create';
-    public const DOCTRINE_HELPER_SCRIPT = 'vendor/doctrine/orm/bin/doctrine.php';
-    public const DOCTRINE_HELPER_COMMAND = 'orm:schema-tool:create';
+    public const DOCTRINE_SCRIPT = 'vendor/doctrine/orm/bin/doctrine.php';
+    public const DOCTRINE_CREATE_SCHEMA_COMMAND = 'orm:schema-tool:create';
 
     /** @var Connection */
     private $regularConn;
@@ -27,7 +27,7 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
     private $noDbNameConn;
 
     public function __construct(
-        Locker $locker,
+        LockFactory $locker,
         ProcessHelper $processHelper,
         PhpExecutableFinder $phpFinder,
         Connection $conn,
@@ -60,7 +60,7 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
 
         // Create database
         $io->writeln('<fg=blue>Creating database tables...</>');
-        $this->runPhpCommand($output, [self::DOCTRINE_HELPER_SCRIPT, self::DOCTRINE_HELPER_COMMAND]);
+        $this->runPhpCommand($output, [self::DOCTRINE_SCRIPT, self::DOCTRINE_CREATE_SCHEMA_COMMAND]);
         $io->success('Database properly created!');
 
         return ExitCodes::EXIT_SUCCESS;
@@ -86,13 +86,8 @@ class CreateDatabaseCommand extends AbstractDatabaseCommand
     private function schemaExists(): bool
     {
         // If at least one of the shlink tables exist, we will consider the database exists somehow.
-        // Any inconsistency will be taken care by the migrations
+        // Any inconsistency should be taken care by the migrations
         $schemaManager = $this->regularConn->getSchemaManager();
         return ! empty($schemaManager->listTableNames());
     }
-
-    protected function getLockConfig(): LockedCommandConfig
-    {
-        return new LockedCommandConfig($this->getName(), true);
-    }
 }

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

@@ -1,9 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Db;
 
-use Shlinkio\Shlink\CLI\Command\Util\LockedCommandConfig;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -12,8 +12,8 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 class MigrateDatabaseCommand extends AbstractDatabaseCommand
 {
     public const NAME = 'db:migrate';
-    public const DOCTRINE_HELPER_SCRIPT = 'vendor/doctrine/migrations/bin/doctrine-migrations.php';
-    public const DOCTRINE_HELPER_COMMAND = 'migrations:migrate';
+    public const DOCTRINE_MIGRATIONS_SCRIPT = 'vendor/doctrine/migrations/bin/doctrine-migrations.php';
+    public const DOCTRINE_MIGRATE_COMMAND = 'migrations:migrate';
 
     protected function configure(): void
     {
@@ -27,14 +27,9 @@ class MigrateDatabaseCommand extends AbstractDatabaseCommand
         $io = new SymfonyStyle($input, $output);
 
         $io->writeln('<fg=blue>Migrating database...</>');
-        $this->runPhpCommand($output, [self::DOCTRINE_HELPER_SCRIPT, self::DOCTRINE_HELPER_COMMAND]);
+        $this->runPhpCommand($output, [self::DOCTRINE_MIGRATIONS_SCRIPT, self::DOCTRINE_MIGRATE_COMMAND]);
         $io->success('Database properly migrated!');
 
         return ExitCodes::EXIT_SUCCESS;
     }
-
-    protected function getLockConfig(): LockedCommandConfig
-    {
-        return new LockedCommandConfig($this->getName(), true);
-    }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
@@ -54,22 +55,17 @@ class DeleteShortUrlCommand extends Command
         try {
             $this->runDelete($io, $shortCode, $ignoreThreshold);
             return ExitCodes::EXIT_SUCCESS;
-        } catch (Exception\InvalidShortCodeException $e) {
-            $io->error(sprintf('Provided short code "%s" could not be found.', $shortCode));
+        } catch (Exception\ShortUrlNotFoundException $e) {
+            $io->error($e->getMessage());
             return ExitCodes::EXIT_FAILURE;
         } catch (Exception\DeleteShortUrlException $e) {
-            return $this->retry($io, $shortCode, $e);
+            return $this->retry($io, $shortCode, $e->getMessage());
         }
     }
 
-    private function retry(SymfonyStyle $io, string $shortCode, Exception\DeleteShortUrlException $e): int
+    private function retry(SymfonyStyle $io, string $shortCode, string $warningMsg): int
     {
-        $warningMsg = sprintf(
-            'It was not possible to delete the short URL with short code "%s" because it has more than %s visits.',
-            $shortCode,
-            $e->getVisitsThreshold()
-        );
-        $io->writeln('<bg=yellow>' . $warningMsg . '</>');
+        $io->writeln(sprintf('<bg=yellow>%s</>', $warningMsg));
         $forceDelete = $io->confirm('Do you want to delete it anyway?', false);
 
         if ($forceDelete) {

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

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
@@ -68,7 +69,7 @@ class GeneratePreviewCommand extends Command
         } catch (PreviewGenerationException $e) {
             $output->writeln(' <error>Error</error>');
             if ($output->isVerbose()) {
-                $this->getApplication()->renderException($e, $output);
+                $this->getApplication()->renderThrowable($e, $output);
             }
         }
     }

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

@@ -1,15 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
-use Cake\Chronos\Chronos;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
-use Shlinkio\Shlink\Core\Util\ShortUrlBuilderTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -26,8 +25,6 @@ use function sprintf;
 
 class GenerateShortUrlCommand extends Command
 {
-    use ShortUrlBuilderTrait;
-
     public const NAME = 'short-url:generate';
     private const ALIASES = ['shortcode:generate', 'short-code:generate'];
 
@@ -87,6 +84,12 @@ class GenerateShortUrlCommand extends Command
                 'f',
                 InputOption::VALUE_NONE,
                 'This will force existing matching URL to be returned if found, instead of creating a new one.'
+            )
+            ->addOption(
+                'domain',
+                'd',
+                InputOption::VALUE_REQUIRED,
+                'The domain to which this short URL will be attached.'
             );
     }
 
@@ -98,7 +101,7 @@ class GenerateShortUrlCommand extends Command
             return;
         }
 
-        $longUrl = $io->ask('A long URL was not provided. Which URL do you want to be shortened?');
+        $longUrl = $io->ask('Which URL do you want to shorten?');
         if (! empty($longUrl)) {
             $input->setArgument('longUrl', $longUrl);
         }
@@ -119,38 +122,27 @@ class GenerateShortUrlCommand extends Command
         $maxVisits = $input->getOption('maxVisits');
 
         try {
-            $shortCode = $this->urlShortener->urlToShortCode(
+            $shortUrl = $this->urlShortener->urlToShortCode(
                 new Uri($longUrl),
                 $tags,
                 ShortUrlMeta::createFromParams(
-                    $this->getOptionalDate($input, 'validSince'),
-                    $this->getOptionalDate($input, 'validUntil'),
+                    $input->getOption('validSince'),
+                    $input->getOption('validUntil'),
                     $customSlug,
                     $maxVisits !== null ? (int) $maxVisits : null,
-                    $input->getOption('findIfExists')
+                    $input->getOption('findIfExists'),
+                    $input->getOption('domain')
                 )
-            )->getShortCode();
-            $shortUrl = $this->buildShortUrl($this->domainConfig, $shortCode);
+            );
 
             $io->writeln([
                 sprintf('Processed long URL: <info>%s</info>', $longUrl),
-                sprintf('Generated short URL: <info>%s</info>', $shortUrl),
+                sprintf('Generated short URL: <info>%s</info>', $shortUrl->toString($this->domainConfig)),
             ]);
             return ExitCodes::EXIT_SUCCESS;
-        } catch (InvalidUrlException $e) {
-            $io->error(sprintf('Provided URL "%s" is invalid. Try with a different one.', $longUrl));
-            return ExitCodes::EXIT_FAILURE;
-        } catch (NonUniqueSlugException $e) {
-            $io->error(
-                sprintf('Provided slug "%s" is already in use by another URL. Try with a different one.', $customSlug)
-            );
+        } catch (InvalidUrlException | NonUniqueSlugException $e) {
+            $io->error($e->getMessage());
             return ExitCodes::EXIT_FAILURE;
         }
     }
-
-    private function getOptionalDate(InputInterface $input, string $fieldName): ?Chronos
-    {
-        $since = $input->getOption($fieldName);
-        return $since !== null ? Chronos::parse($since) : null;
-    }
 }

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

@@ -1,27 +1,25 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
-use Cake\Chronos\Chronos;
+use Shlinkio\Shlink\CLI\Command\Util\AbstractWithDateRangeCommand;
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\CLI\Util\ShlinkTable;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Model\VisitsParams;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Zend\Stdlib\ArrayUtils;
 
-use function array_map;
+use function Functional\map;
 use function Functional\select_keys;
 
-class GetVisitsCommand extends Command
+class GetVisitsCommand extends AbstractWithDateRangeCommand
 {
     public const NAME = 'short-url:visits';
     private const ALIASES = ['shortcode:visits', 'short-code:visits'];
@@ -35,25 +33,23 @@ class GetVisitsCommand extends Command
         parent::__construct();
     }
 
-    protected function configure(): void
+    protected function doConfigure(): void
     {
         $this
             ->setName(self::NAME)
             ->setAliases(self::ALIASES)
             ->setDescription('Returns the detailed visits information for provided short code')
-            ->addArgument('shortCode', InputArgument::REQUIRED, 'The short code which visits we want to get')
-            ->addOption(
-                'startDate',
-                's',
-                InputOption::VALUE_OPTIONAL,
-                'Allows to filter visits, returning only those older than start date'
-            )
-            ->addOption(
-                'endDate',
-                'e',
-                InputOption::VALUE_OPTIONAL,
-                'Allows to filter visits, returning only those newer than end date'
-            );
+            ->addArgument('shortCode', InputArgument::REQUIRED, 'The short code which visits we want to get');
+    }
+
+    protected function getStartDateDesc(): string
+    {
+        return 'Allows to filter visits, returning only those older than start date';
+    }
+
+    protected function getEndDateDesc(): string
+    {
+        return 'Allows to filter visits, returning only those newer than end date';
     }
 
     protected function interact(InputInterface $input, OutputInterface $output): void
@@ -73,24 +69,18 @@ class GetVisitsCommand extends Command
     protected function execute(InputInterface $input, OutputInterface $output): ?int
     {
         $shortCode = $input->getArgument('shortCode');
-        $startDate = $this->getDateOption($input, 'startDate');
-        $endDate = $this->getDateOption($input, 'endDate');
+        $startDate = $this->getDateOption($input, $output, 'startDate');
+        $endDate = $this->getDateOption($input, $output, 'endDate');
 
         $paginator = $this->visitsTracker->info($shortCode, new VisitsParams(new DateRange($startDate, $endDate)));
-        $visits = ArrayUtils::iteratorToArray($paginator->getCurrentItems());
 
-        $rows = array_map(function (Visit $visit) {
+        $rows = map($paginator->getCurrentItems(), function (Visit $visit) {
             $rowData = $visit->jsonSerialize();
             $rowData['country'] = $visit->getVisitLocation()->getCountryName();
             return select_keys($rowData, ['referer', 'date', 'userAgent', 'country']);
-        }, $visits);
+        });
         ShlinkTable::fromOutput($output)->render(['Referer', 'Date', 'User agent', 'Country'], $rows);
+
         return ExitCodes::EXIT_SUCCESS;
     }
-
-    private function getDateOption(InputInterface $input, $key)
-    {
-        $value = $input->getOption($key);
-        return ! empty($value) ? Chronos::parse($value) : $value;
-    }
 }