Deleted ocular.phar before building assets for deployment

Feature/fix ip address

.gitattributes

@@ -22,3 +22,4 @@ indocker export-ignore
 phpcs.xml export-ignore
 phpunit.xml.dist export-ignore
 phpunit-func.xml export-ignore
+phpstan.neon

.gitignore

@@ -1,6 +1,7 @@
 .idea
 build
 composer.lock
+composer.phar
 vendor/
 .env
 data/database.sqlite

.travis.yml

@@ -1,20 +1,25 @@
 language: php
 
+sudo: false # Use containerized environment
+
 branches:
   only:
-    - master
-    - develop
+    - /.*/
 
 php:
-  - 7
   - 7.1
   - 7.2
+  - 7.3
+
+matrix:
+  allow_failures:
+    - php: 7.3
 
 before_install:
-  - phpenv config-add data/infra/travis-php/memcached.ini
-  - phpenv config-add data/infra/travis-php/apcu.ini
+  - echo 'extension = memcached.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo 'extension = apcu.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
-before_script:
+install:
   - composer self-update
   - composer install --no-interaction
 
@@ -22,9 +27,22 @@ script:
   - mkdir build
   - composer check
 
-after_script:
+after_success:
   - vendor/bin/phpcov 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
 
-sudo: false
+# Before deploying, build dist file for current travis tag
+before_deploy:
+  - rm -f ocular.phar
+  - ./build.sh ${TRAVIS_TAG#?}
+
+deploy:
+  provider: releases
+  api_key:
+    secure: a9dbZchocqeuOViwUeNH54bQR5Sz7rEYXx5b9WPFtnFn9LGKKUaLbA2U91UQ9QKPrcTpsALubUYbw2CnNmvCwzaY+R8lCD3gkU4ohsEnbpnw3deOeixI74sqBHJAuCH9FSaRDGILoBMtUKx2xlzIymFxkIsgIukkGbdkWHDlRWY3oTUUuw1SQ2Xk9KDsbJQtjIc1+G/O6gHaV4qv/R9W8NPmJExKTNDrAZbC1vIUnxqp4UpVo1hst8qPd1at94CndDYM5rG+7imGbdtxTxzamt819qdTO1OfvtctKawNAm7YXZrrWft6c7gI6j6SI4hxd+ZrrPBqbaRFHkZHjnNssO/yn4SaOHFFzccmu0MzvpPCf0qWZwd3sGHVYer1MnR2mHYqU84QPlW3nrHwJjkrpq3+q0JcBY6GsJs+RskHNtkMTKV05Iz6QUI5YZGwTpuXaRm036SmavjGc4IDlMaYCk/NmbB9BKpthJxLdUpczOHpnjXXHziotWD6cfEnbjU3byfD8HY5WrxSjsNT7SKmXN3hRof7bk985ewQVjGT42O3NbnfnqjQQWr/B7/zFTpLR4f526Bkq12CdCyf5lvrbq+POkLVdJ+uFfR7ds248Ue/jBQy6kM1tWmKF9QiwisFlA84eQ4CW3I93Rp97URv+AQa9zmbD0Ve3Udp+g6nF5I=
+  file: "./build/shlink_${TRAVIS_TAG#?}_dist.zip"
+  skip_cleanup: true
+  on:
+    tags: true
+    php: 7.1

CHANGELOG.md

@@ -1,185 +1,829 @@
-## CHANGELOG
+# CHANGELOG
 
-### 1.6.1
+All notable changes to this project will be documented in this file.
 
-* Added gitattributes file to avoid files not needed in production to be included in distribution
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).
 
-### 1.6.0
 
-**Features**
+## 1.13.2 - 2018-10-18
 
-* [44: Consider allowing to set custom slugs instead of generating a short code](https://github.com/shlinkio/shlink/issues/44)
-* [47: Allow to limit short codes availability by date range](https://github.com/shlinkio/shlink/issues/47)
-* [48: Allow to limit the number of visits to a short code](https://github.com/shlinkio/shlink/issues/48)
-* [105: Added option to enable/disable URL validation by response status code.](https://github.com/shlinkio/shlink/pull/105)
+#### Added
 
-**Enhancements:**
+* [#233](https://github.com/shlinkio/shlink/issues/233) Added PHP 7.3 to build matrix allowing its failure.
 
-* [27: Add repository functional tests with dbunit](https://github.com/shlinkio/shlink/issues/27)
-* [86: Drop support for PHP 5](https://github.com/shlinkio/shlink/issues/86)
-* [101: Make actions just capture very specific exceptions, and let the ErrorHandler catch any other exception](https://github.com/shlinkio/shlink/issues/101)
-* [104: Use different templates for requested-short-code-does-not-exist and route-could-not-be-match](https://github.com/shlinkio/shlink/issues/104)
+#### Changed
 
-**Tasks**
+* [#235](https://github.com/shlinkio/shlink/issues/235) Improved update instructions (thanks to [tivyhosting](https://github.com/tivyhosting)).
 
-* [99: Replace AnnotatedFactory by ConfigAbstractFactory](https://github.com/shlinkio/shlink/issues/99)
-* [100: Replace twig by plates](https://github.com/shlinkio/shlink/issues/100)
-* [102: Improve coding standards strictness](https://github.com/shlinkio/shlink/issues/102)
+#### Deprecated
 
-**Bugs**
+* *Nothing*
 
-* [103: Make NotFoundDelegate return proper content types based on accepted content](https://github.com/shlinkio/shlink/issues/103)
+#### Removed
 
-### 1.5.0
+* *Nothing*
 
-**Enhancements:**
+#### Fixed
 
-* [95: Add tags CRUD to CLI](https://github.com/shlinkio/shlink/issues/95)
-* [59: Add tags CRUD to REST](https://github.com/shlinkio/shlink/issues/59)
-* [66: Allow to import certain information from older app directory when updating](https://github.com/shlinkio/shlink/issues/66)
+* [#237](https://github.com/shlinkio/shlink/issues/233) Solved errors when trying to geo-locate `null` IP addresses.
 
-**Tasks**
+    Also improved how visitor IP addresses are discovered, thanks to [akrabat/ip-address-middleware](https://github.com/akrabat/ip-address-middleware) package.
 
-* [96: Add namespace to functions](https://github.com/shlinkio/shlink/issues/96)
-* [76: Add response examples to swagger docs](https://github.com/shlinkio/shlink/issues/76)
-* [93: Improve cross domain management by using the ImplicitOptionsMiddleware](https://github.com/shlinkio/shlink/issues/93)
 
-**Bugs**
+## 1.13.1 - 2018-10-16
 
-* [92: Fix formatted dates, using an ISO compliant format](https://github.com/shlinkio/shlink/issues/92)
+#### Added
 
-### 1.4.0
+* *Nothing*
 
-**Enhancements:**
+#### Changed
 
-* [89: Update to expressive 2](https://github.com/shlinkio/shlink/issues/89)
+* *Nothing*
 
-### 1.3.1
+#### Deprecated
 
-**Tasks**
+* *Nothing*
 
-* [82: Enable FastRoute routes cache](https://github.com/shlinkio/shlink/issues/82)
-* [85: Update year in license file](https://github.com/shlinkio/shlink/issues/85)
-* [81: Add docker containers config](https://github.com/shlinkio/shlink/issues/81)
+#### Removed
 
-**Bugs**
+* *Nothing*
 
-* [83: Short codes list: search in tags when filtering by query string](https://github.com/shlinkio/shlink/issues/83)
-* [79: Increase the number of followed redirects](https://github.com/shlinkio/shlink/issues/79)
-* [75: Apply PathVersionMiddleware only to rest routes defining it by configuration instead of code](https://github.com/shlinkio/shlink/issues/75)
-* [77: Allow defining database server hostname and port](https://github.com/shlinkio/shlink/issues/77)
+#### Fixed
 
-### 1.3.0
+* [#231](https://github.com/shlinkio/shlink/issues/197) Fixed error when processing visits.
 
-**Enhancements:**
 
-* [67: Allow to order the short codes list](https://github.com/shlinkio/shlink/issues/67)
-* [60: Accept JSON requests in REST and use a body parser middleware to set the parsedBody](https://github.com/shlinkio/shlink/issues/60)
-* [72: When listing API keys from CLI, display in yellow color enabled keys that have expired](https://github.com/shlinkio/shlink/issues/72)
-* [58: Allow to filter short URLs by tag](https://github.com/shlinkio/shlink/issues/58)
-* [69: Allow to filter short codes by text query](https://github.com/shlinkio/shlink/issues/69)
+## 1.13.0 - 2018-10-06
 
-**Tasks**
+#### Added
 
-* [73: Tag endpoints in swagger file](https://github.com/shlinkio/shlink/issues/73)
-* [71: Separate swagger docs into multiple files](https://github.com/shlinkio/shlink/issues/71)
-* [63: Add path versioning to REST API routes](https://github.com/shlinkio/shlink/issues/63)
+* [#197](https://github.com/shlinkio/shlink/issues/197) Added [cakephp/chronos](https://book.cakephp.org/3.0/en/chronos.html) library for date manipulations.
+* [#214](https://github.com/shlinkio/shlink/issues/214) Improved build script, which allows builds to be done without "jumping" outside the project directory, and generates smaller dist files.
 
-### 1.2.2
+    It also allows automating the dist file generation in travis-ci builds.
 
-**Bugs**
+* [#207](https://github.com/shlinkio/shlink/issues/207) Added two new config options which are asked during installation process. The config options already existed in previous shlink version, but you had to manually set their values.
+
+    These are the new options:
+
+    * Visits threshold to allow short URLs to be deleted.
+    * Check the visits threshold when trying to delete a short URL via REST API.
+
+#### Changed
+
+* [#211](https://github.com/shlinkio/shlink/issues/211) Extracted installer to its own module, which will simplify moving it to a separated package in the future.
+* [#200](https://github.com/shlinkio/shlink/issues/200) and [#201](https://github.com/shlinkio/shlink/issues/201) Renamed REST Action classes and CLI Command classes to use the concept of `ShortUrl` instead of the concept of `ShortCode` when referring to the entity, and left the `short code` concept to the identifier which is used as a unique code for a specific `Short URL`.
+* [#181](https://github.com/shlinkio/shlink/issues/181) When importing the configuration from a previous shlink installation, it no longer asks to import every block. Instead, it is capable of detecting only new config options introduced in the new version, and ask only for those.
+
+    If no new options are found and you have selected to import config, no further questions will be asked and shlink will just import the old config.
+
+#### Deprecated
+
+* [#205](https://github.com/shlinkio/shlink/issues/205) Deprecated `[POST /authenticate]` endpoint, and allowed any API request to be automatically authenticated using the `X-Api-Key` header with a valid API key.
+
+    This effectively deprecates the `Authorization: Bearer <JWT>` authentication form, but it will keep working.
+
+* As of [#200](https://github.com/shlinkio/shlink/issues/200) and [#201](https://github.com/shlinkio/shlink/issues/201) REST urls have changed from `/short-codes/...` to `/short-urls/...`, and the command namespaces have changed from `short-code:...` to `short-url:...`.
+
+    In both cases, backwards compatibility has been retained and the old ones are aliases for the new ones, but the old ones are considered deprecated.
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#203](https://github.com/shlinkio/shlink/issues/203) Fixed some warnings thrown while unzipping distributable files.
+* [#206](https://github.com/shlinkio/shlink/issues/206) An error is now thrown during installation if any required param is left empty, making the installer display a message and ask again until a value is set.
+
+
+## 1.12.0 - 2018-09-15
+
+#### Added
+
+* [#187](https://github.com/shlinkio/shlink/issues/187) Included an API endpoint and a CLI command to delete short URLs.
+
+    Due to the implicit danger of this operation, the deletion includes a safety check. URLs cannot be deleted if they have more than a specific amount of visits.
+
+    The visits threshold is set to **15** by default and currently it has to be manually changed. In future versions the installation/update process will ask you about the value of the visits threshold.
+
+    In order to change it, open the `config/autoload/delete_short_urls.global.php` file, which has this structure:
+
+    ```php
+    return [
+
+        'delete_short_urls' => [
+            'visits_threshold' => 15,
+            'check_visits_threshold' => true,
+        ],
+
+    ];
+    ```
+
+    Properties are self explanatory. Change `check_visits_threshold` to `false` to completely disable this safety check, and change the value of `visits_threshold` to allow short URLs with a different number of visits to be deleted.
+
+    Once changed, delete the `data/cache/app_config.php` file (if any) to let shlink know about the new values.
+
+    This check is implicit for the API endpoint, but can be "disabled" for the CLI command, which will ask you when trying to delete a URL which has reached to threshold in order to force the deletion.
+
+* [#183](https://github.com/shlinkio/shlink/issues/183) and [#190](https://github.com/shlinkio/shlink/issues/190) Included important documentation improvements in the repository itself. You no longer need to go to the website in order to see how to install or use shlink.
+* [#186](https://github.com/shlinkio/shlink/issues/186) Added a small robots.txt file that prevents 404 errors to be logged due to search engines trying to index the domain where shlink is located. Thanks to [@robwent](https://github.com/robwent) for the contribution.
+
+#### Changed
+
+* [#145](https://github.com/shlinkio/shlink/issues/145) Shlink now obfuscates IP addresses from visitors by replacing the latest octet by `0`, which does not affect geolocation and allows it to fulfil the GDPR.
+
+    Other known services follow this same approach, like [Google Analytics](https://support.google.com/analytics/answer/2763052?hl=en) or [Matomo](https://matomo.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)
+
+* [#182](https://github.com/shlinkio/shlink/issues/182) The short URL creation API endpoints now return the same model used for lists and details endpoints.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#188](https://github.com/shlinkio/shlink/issues/188) Shlink now allows multiple short URLs to be created that resolve to the same long URL.
+
+
+## 1.11.0 - 2018-08-13
+
+#### Added
+
+* [#170](https://github.com/shlinkio/shlink/issues/170) and [#171](https://github.com/shlinkio/shlink/issues/171) Updated `[GET /short-codes]` and `[GET /short-codes/{shortCode}]` endpoints to return more meaningful information and make their response consistent.
+
+    The short URLs are now represented by this object in both cases:
+
+    ```json
+    {
+        "shortCode": "12Kb3",
+        "shortUrl": "https://doma.in/12Kb3",
+        "longUrl": "https://shlink.io",
+        "dateCreated": "2016-05-01T20:34:16+02:00",
+        "visitsCount": 1029,
+        "tags": [
+            "shlink"
+        ],
+        "originalUrl": "https://shlink.io"
+    }
+    ```
+
+    The `originalUrl` property is considered deprecated and has been kept for backward compatibility purposes. It holds the same value as the `longUrl` property.
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* The `originalUrl` property in `[GET /short-codes]` and `[GET /short-codes/{shortCode}]` endpoints is now deprecated and replaced by the `longUrl` property.
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
+
+## 1.10.2 - 2018-08-04
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#177](https://github.com/shlinkio/shlink/issues/177) Fixed `[GET] /short-codes` endpoint returning a 500 status code when trying to filter by `tags` and `searchTerm` at the same time.
+* [#175](https://github.com/shlinkio/shlink/issues/175) Fixed error introduced in previous version, where you could end up banned from the service used to resolve IP address locations.
+
+    In order to fix that, just fill [this form](http://ip-api.com/docs/unban) including your server's IP address and your server should be unbanned.
+    
+    In order to prevent this, after resolving 150 IP addresses, shlink now waits 1 minute before trying to resolve any more addresses.
+
+
+## 1.10.1 - 2018-08-02
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#167](https://github.com/shlinkio/shlink/issues/167) Shlink version is now set at build time to avoid older version numbers to be kept in newer builds.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#165](https://github.com/shlinkio/shlink/issues/165) Fixed custom slugs failing when they are longer than 10 characters.
+* [#166](https://github.com/shlinkio/shlink/issues/166) Fixed unusual edge case in which visits were not properly counted when ordering by visit and filtering by search term in `[GET] /short-codes` API endpoint.
+* [#174](https://github.com/shlinkio/shlink/issues/174) Fixed geolocation not working due to a deprecation on used service.
+* [#172](https://github.com/shlinkio/shlink/issues/172) Documented missing filtering params for `[GET] /short-codes/{shortCode}/visits` API endpoint, which allow the list to be filtered by date range.
+
+    For example: `https://doma.in/rest/v1/short-urls/abc123/visits?startDate=2017-05-23&endDate=2017-10-05`
+
+* [#169](https://github.com/shlinkio/shlink/issues/169) Fixed unhandled error when parsing `ShortUrlMeta` and date fields are already `DateTime` instances.
+
+
+## 1.10.0 - 2018-07-09
+
+#### Added
+
+* [#161](https://github.com/shlinkio/shlink/issues/161) AddED support for shlink to be run with [swoole](https://www.swoole.co.uk/) via [zend-expressive-swoole](https://github.com/zendframework/zend-expressive-swoole) package
+
+#### Changed
+
+* [#159](https://github.com/shlinkio/shlink/issues/159) Updated CHANGELOG to follow the [keep-a-changelog](https://keepachangelog.com) format
+* [#160](https://github.com/shlinkio/shlink/issues/160) Update infection to v0.9 and phpstan to v 0.10
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
+
+## 1.9.1 - 2018-06-18
+
+#### Added
+
+* [#155](https://github.com/shlinkio/shlink/issues/155) Improved the pagination object returned in lists, including more meaningful properties.
+    
+    * Old structure:
+    
+    ```json
+    {
+      "pagination": {
+        "currentPage": 1,
+        "pagesCount": 2
+      }
+    }
+    ```
+    
+    * New structure:
+    
+    ```json
+    {
+      "pagination": {
+        "currentPage": 2,
+        "pagesCount": 13,
+        "itemsPerPage": 10,
+        "itemsInCurrentPage": 10,
+        "totalItems": 126
+      }
+    }
+    ```
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#154](https://github.com/shlinkio/shlink/issues/154) Fixed sizes of every result page when filtering by searchTerm
+* [#157](https://github.com/shlinkio/shlink/issues/157) Background commands executed by installation process now respect the originally used php binary
+
+
+## 1.9.0 - 2018-05-07
+
+#### Added
+
+* [#147](https://github.com/shlinkio/shlink/issues/147) Allowed short URLs to be created on the fly using a single API request, including the API key in a  query param.
+
+    This eases integration with third party services.
+    
+    With this feature, a simple request to a URL like `https://doma.in/rest/v1/short-codes/shorten?apiKey=[YOUR_API_KEY]&longUrl=[URL_TO_BE_SHORTENED]` would return the shortened one in JSON or plain text format.
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#139](https://github.com/shlinkio/shlink/issues/139) Ensured all core actions log exceptions
+
+
+## 1.8.1 - 2018-04-07
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#141](https://github.com/shlinkio/shlink/issues/141) Removed workaround used in `PathVersionMiddleware`, since the bug in zend-stratigility has been fixed.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#140](https://github.com/shlinkio/shlink/issues/140) Fixed warning thrown during installation while trying to include doctrine script
+
+
+## 1.8.0 - 2018-03-29
+
+#### Added
+
+* [#125](https://github.com/shlinkio/shlink/issues/125) Implemented a path which returns a 1px image instead of a redirection.
+
+    Useful to track emails. Just add an image pointing to a URL like `https://doma.in/abc123/track` to any email and an invisible image will be generated tracking every time the email is opened.
+
+* [#132](https://github.com/shlinkio/shlink/issues/132) Added infection to improve tests
+
+#### Changed
+
+* [#130](https://github.com/shlinkio/shlink/issues/130) Updated to Expressive 3
+* [#137](https://github.com/shlinkio/shlink/issues/137) Updated symfony components to v4
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* [#131](https://github.com/shlinkio/shlink/issues/131) Dropped support for PHP 7
+
+#### Fixed
+
+* *Nothing*
+
+
+## 1.7.2 - 2018-03-26
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#135](https://github.com/shlinkio/shlink/issues/135) Fixed `PathVersionMiddleware` being ignored when using expressive 2.2
+
+
+## 1.7.1 - 2018-03-21
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#128](https://github.com/shlinkio/shlink/issues/128) Upgraded to expressive 2.2
+
+    This will ease the upcoming update to expressive 3
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#126](https://github.com/shlinkio/shlink/issues/126) Fixed `E_USER_DEPRECATED` errors triggered when using Expressive 2.2
+
+
+## 1.7.0 - 2018-01-21
+
+#### Added
+
+* [#88](https://github.com/shlinkio/shlink/issues/88) Allowed tracking of short URLs to be disabled by including a configurable query param
+* [#108](https://github.com/shlinkio/shlink/issues/108) Allowed metadata to be defined when creating short codes
+
+#### Changed
+
+* [#113](https://github.com/shlinkio/shlink/issues/113) Updated CLI commands to use `SymfonyStyle`
+* [#112](https://github.com/shlinkio/shlink/issues/112) Enabled Lazy loading in CLI commands
+* [#117](https://github.com/shlinkio/shlink/issues/117) Every module which throws exceptions has now its own `ExceptionInterface` extending `Throwable`
+* [#115](https://github.com/shlinkio/shlink/issues/115) Added phpstan to build matrix on PHP >=7.1 envs
+* [#114](https://github.com/shlinkio/shlink/issues/114) Replaced [vlucas/phpdotenv](https://github.com/vlucas/phpdotenv) dev requirement by [symfony/dotenv](https://github.com/symfony/dotenv)
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
+
+## 1.6.2 - 2017-10-25
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#109](https://github.com/shlinkio/shlink/issues/109) Fixed installation error due to typo in latest migration
+
+
+## 1.6.1 - 2017-10-24
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#110](https://github.com/shlinkio/shlink/issues/110) Created `.gitattributes` file to define files to be excluded from distributable package
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
+
+## 1.6.0 - 2017-10-23
+
+#### Added
+
+* [#44](https://github.com/shlinkio/shlink/issues/44) Now it is possible to set custom slugs for short URLs instead of using a generated short code
+* [#47](https://github.com/shlinkio/shlink/issues/47) Allowed to limit short URLs availability by date range
+* [#48](https://github.com/shlinkio/shlink/issues/48) Allowed to limit the number of visits to a short URL
+* [#105](https://github.com/shlinkio/shlink/pull/105) Added option to enable/disable URL validation by response status code
+
+#### Changed
+
+* [#27](https://github.com/shlinkio/shlink/issues/27) Added repository functional tests with dbunit
+* [#101](https://github.com/shlinkio/shlink/issues/101) Now specific actions just capture very specific exceptions, and let the `ErrorHandler` catch any other unhandled exception
+* [#104](https://github.com/shlinkio/shlink/issues/104) Used different templates for *requested-short-code-does-not-exist* and *route-could-not-be-match*
+* [#99](https://github.com/shlinkio/shlink/issues/99) Replaced usages of `AnnotatedFactory` by `ConfigAbstractFactory`
+* [#100](https://github.com/shlinkio/shlink/issues/100) Updated templates engine. Replaced twig by plates
+* [#102](https://github.com/shlinkio/shlink/issues/102) Improved coding standards strictness
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* [#86](https://github.com/shlinkio/shlink/issues/86) Dropped support for PHP 5
+
+#### Fixed
+
+* [#103](https://github.com/shlinkio/shlink/issues/103) `NotFoundDelegate` now returns proper content types based on accepted content
+
+
+## 1.5.0 - 2017-07-16
+
+#### Added
+
+* [#95](https://github.com/shlinkio/shlink/issues/95) Added tags CRUD to CLI
+* [#59](https://github.com/shlinkio/shlink/issues/59) Added tags CRUD to REST
+* [#66](https://github.com/shlinkio/shlink/issues/66) Allowed certain information to be imported from and older shlink instance directory when updating
+
+#### Changed
+
+* [#96](https://github.com/shlinkio/shlink/issues/96) Added namespace to functions
+* [#76](https://github.com/shlinkio/shlink/issues/76) Added response examples to swagger docs
+* [#93](https://github.com/shlinkio/shlink/issues/93) Improved cross domain management by using the `ImplicitOptionsMiddleware`
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#92](https://github.com/shlinkio/shlink/issues/92) Fixed formatted dates, using an ISO compliant format
+
+
+## 1.4.0 - 2017-03-25
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#89](https://github.com/shlinkio/shlink/issues/89) Updated to expressive 2
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
+
+## 1.3.1 - 2017-01-22
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#82](https://github.com/shlinkio/shlink/issues/82) Enabled `FastRoute` routes cache
+* [#85](https://github.com/shlinkio/shlink/issues/85) Updated year in license file
+* [#81](https://github.com/shlinkio/shlink/issues/81) Added docker containers config
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#83](https://github.com/shlinkio/shlink/issues/83) Fixed short codes list: search in tags when filtering by query string
+* [#79](https://github.com/shlinkio/shlink/issues/79) Increased the number of followed redirects
+* [#75](https://github.com/shlinkio/shlink/issues/75) Applied `PathVersionMiddleware` only to rest routes defining it by configuration instead of code
+* [#77](https://github.com/shlinkio/shlink/issues/77) Allowed defining database server hostname and port
+
+
+## 1.3.0 - 2016-10-23
+
+#### Added
+
+* [#67](https://github.com/shlinkio/shlink/issues/67) Allowed to order the short codes list
+* [#60](https://github.com/shlinkio/shlink/issues/60) Accepted JSON requests in REST and used a body parser middleware to set the request's `parsedBody`
+* [#72](https://github.com/shlinkio/shlink/issues/72) When listing API keys from CLI, use yellow color for enabled keys that have expired
+* [#58](https://github.com/shlinkio/shlink/issues/58) Allowed to filter short URLs by tag
+* [#69](https://github.com/shlinkio/shlink/issues/69) Allowed to filter short URLs by text query
+* [#73](https://github.com/shlinkio/shlink/issues/73) Added tag-related endpoints to swagger file
+* [#63](https://github.com/shlinkio/shlink/issues/63) Added path versioning to REST API routes
+
+#### Changed
+
+* [#71](https://github.com/shlinkio/shlink/issues/71) Separated swagger docs into multiple files
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
+
+## 1.2.2 - 2016-08-29
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
 
 * Fixed minor bugs on CORS requests
 
-### 1.2.1
 
-**Bugs**
+## 1.2.1 - 2016-08-21
 
-* [62: Fix cross-domain requests in REST API](https://github.com/shlinkio/shlink/issues/62)
+#### Added
 
-### 1.2.0
+* *Nothing*
 
-**Features**
+#### Changed
 
-* [45: Allow to define tags on short codes, to improve filtering and classification](https://github.com/shlinkio/shlink/issues/45)
-* [7: Add website previews while listing available URLs](https://github.com/shlinkio/shlink/issues/7)
+* *Nothing*
 
-**Enhancements:**
+#### Deprecated
 
-* [57: Add database migrations system to improve updating between versions](https://github.com/shlinkio/shlink/issues/57)
-* [31: Add support for other database management systems by improving the EntityManager factory](https://github.com/shlinkio/shlink/issues/31)
-* [51: Generate build process to paquetize the app and ease distribution](https://github.com/shlinkio/shlink/issues/51)
-* [38: Define installation script. It will request dynamic data on the fly so that there is no need to define env vars](https://github.com/shlinkio/shlink/issues/38)
+* *Nothing*
 
-**Tasks**
+#### Removed
 
-* [55: Create update script which does not try to create a new database](https://github.com/shlinkio/shlink/issues/55)
-* [54: Add cache namespace to prevent name collisions with other apps in the same environment](https://github.com/shlinkio/shlink/issues/54)
-* [29: Use the acelaya/ze-content-based-error-handler package instead of custom error handler implementation](https://github.com/shlinkio/shlink/issues/29)
+* *Nothing*
 
-**Bugs**
+#### Fixed
 
-* [53: Fix entities database interoperability](https://github.com/shlinkio/shlink/issues/53)
-* [52: Add missing htaccess file for apache environments](https://github.com/shlinkio/shlink/issues/52)
+* [#62](https://github.com/shlinkio/shlink/issues/62) Fixed cross-domain requests in REST API
 
-### 1.1.0
 
-**Features**
+## 1.2.0 - 2016-08-21
 
-* [46: Define a route that returns a QR code representing the shortened URL](https://github.com/shlinkio/shlink/issues/46)
+#### Added
 
-**Enhancements:**
+* [#45](https://github.com/shlinkio/shlink/issues/45) Allowed to define tags on short codes, to improve filtering and classification
+* [#7](https://github.com/shlinkio/shlink/issues/7) Added website previews while listing available URLs
+* [#57](https://github.com/shlinkio/shlink/issues/57) Added database migrations system to improve updating between versions
+* [#31](https://github.com/shlinkio/shlink/issues/31) Added support for other database management systems by improving the `EntityManager` factory
+* [#51](https://github.com/shlinkio/shlink/issues/51) Generated build process to create app package and ease distribution
+* [#38](https://github.com/shlinkio/shlink/issues/38) Defined installation script. It will request dynamic data on the fly so that there is no need to define env vars
+* [#55](https://github.com/shlinkio/shlink/issues/55) Created update script which does not try to create a new database
 
-* [32: Add support for other cache adapters by improving the Cache factory](https://github.com/shlinkio/shlink/issues/32)
-* [14: https://github.com/shlinkio/shlink/issues/14](https://github.com/shlinkio/shlink/issues/14)
-* [41: Cache the "short code" => "URL" map to prevent extra DB hits](https://github.com/shlinkio/shlink/issues/41)
-* [13: Improve REST authentication](https://github.com/shlinkio/shlink/issues/13)
+#### Changed
 
-**Tasks**
+* [#54](https://github.com/shlinkio/shlink/issues/54) Added cache namespace to prevent name collisions with other apps in the same environment
+* [#29](https://github.com/shlinkio/shlink/issues/29) Used the [acelaya/ze-content-based-error-handler](https://github.com/acelaya/ze-content-based-error-handler) package instead of custom error handler implementation
 
-* [39: Change copyright from "Alejandro Celaya" to "Shlink" in error pages](https://github.com/shlinkio/shlink/issues/39)
-* [42: Make REST endpoints that need to find something return a 404 when "something" is not found](https://github.com/shlinkio/shlink/issues/42)
-* [35: Make CLI commands to use the same PHP namespace as the one used for the command name](https://github.com/shlinkio/shlink/issues/35)
+#### Deprecated
 
-**Bugs**
+* *Nothing*
 
-* [40: Take into account the X-Forwarded-For header in order to get the visitor information, in case the server is behind a load balancer or proxy](https://github.com/shlinkio/shlink/issues/40)
+#### Removed
 
-### 1.0.0
+* *Nothing*
 
-**Enhancements:**
+#### Fixed
 
-* [33: Create a command to generate a short code charset by randomizing the default one](https://github.com/shlinkio/shlink/issues/33)
-* [15: Return JSON/HTML responses for errors (4xx and 5xx) based on accept header (content negotiation)](https://github.com/shlinkio/shlink/issues/15)
-* [23: Translate application literals](https://github.com/shlinkio/shlink/issues/23)
-* [21: Allow to filter visits by date range](https://github.com/shlinkio/shlink/issues/21)
-* [22: Save visits locations data on a visit_locations table](https://github.com/shlinkio/shlink/issues/22)
-* [20: Inject cross domain headers in response only if the Origin header is present in the request](https://github.com/shlinkio/shlink/issues/20)
-* [11: Separate code into multiple modules](https://github.com/shlinkio/shlink/issues/11)
-* [18: Group routable middleware in an Action namespace](https://github.com/shlinkio/shlink/issues/18)
+* [#53](https://github.com/shlinkio/shlink/issues/53) Fixed entities database interoperability
+* [#52](https://github.com/shlinkio/shlink/issues/52) Added missing htaccess file for apache environments
 
-**Tasks**
 
-* [36: Remove hhvm from the CI matrix since it doesn't support array constants and will fail](https://github.com/shlinkio/shlink/issues/36)
-* [4: Installation steps](https://github.com/shlinkio/shlink/issues/4)
-* [6: Remove dependency on expressive helpers package](https://github.com/shlinkio/shlink/issues/6)
-* [30: Replace the "services" first level config entry by "dependencies", in order to fulfill default Expressive name](https://github.com/shlinkio/shlink/issues/30)
-* [12: Improve code coverage](https://github.com/shlinkio/shlink/issues/12)
-* [25: Replace "Middleware" suffix on routable middlewares by "Action"](https://github.com/shlinkio/shlink/issues/25)
-* [19: Update the vendor and app namespace from Acelaya\UrlShortener to Shlinkio\Shlink](https://github.com/shlinkio/shlink/issues/19)
+## 1.1.0 - 2016-08-09
 
-**Bugs**
+#### Added
 
-* [24: Prevent duplicated shortcodes errors because of the case insensitive behavior on MySQL](https://github.com/shlinkio/shlink/issues/24)
+* [#46](https://github.com/shlinkio/shlink/issues/46) Defined a route that returns a QR code representing the shortened URL.
 
-### 0.2.0
+    In order to get the QR code URL, use a pattern like `https://doma.in/abc123/qr-code`
 
-**Enhancements:**
+* [#32](https://github.com/shlinkio/shlink/issues/32) Added support for other cache adapters by improving the Cache factory
+* [#14](https://github.com/shlinkio/shlink/issues/14) Added logger and enabled errors logging
+* [#13](https://github.com/shlinkio/shlink/issues/13) Improved REST authentication
 
-* [9: Use symfony/console to dispatch console requests, instead of trying to integrate the process with expressive](https://github.com/shlinkio/shlink/issues/9)
-* [8: Create a REST API](https://github.com/shlinkio/shlink/issues/8)
-* [10: Add more CLI functionality](https://github.com/shlinkio/shlink/issues/10)
+#### Changed
 
-**Tasks**
+* [#41](https://github.com/shlinkio/shlink/issues/41) Cached the "short code" => "URL" map to prevent extra DB hits
+* [#39](https://github.com/shlinkio/shlink/issues/39) Changed copyright from "Alejandro Celaya" to "Shlink" in error pages
+* [#42](https://github.com/shlinkio/shlink/issues/42) REST endpoints that need to find *something* now return a 404 when it is not found
+* [#35](https://github.com/shlinkio/shlink/issues/35) Updated CLI commands to use the same PHP namespace as the one used for the command name
 
-* [5: Create CHANGELOG file](https://github.com/shlinkio/shlink/issues/5)
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#40](https://github.com/shlinkio/shlink/issues/40) Taken into account the `X-Forwarded-For` header in order to get the visitor information, in case the server is behind a load balancer or proxy
+
+
+## 1.0.0 - 2016-08-01
+
+#### Added
+
+* [#33](https://github.com/shlinkio/shlink/issues/33) Created a command that generates a short code charset by randomizing the default one
+* [#23](https://github.com/shlinkio/shlink/issues/23) Translated application literals
+* [#21](https://github.com/shlinkio/shlink/issues/21) Allowed to filter visits by date range
+* [#4](https://github.com/shlinkio/shlink/issues/4) Added installation steps
+* [#12](https://github.com/shlinkio/shlink/issues/12) Improved code coverage
+
+#### Changed
+
+* [#15](https://github.com/shlinkio/shlink/issues/15) HTTP requests now return JSON/HTML responses for errors (4xx and 5xx) based on `Accept` header
+* [#22](https://github.com/shlinkio/shlink/issues/22) Now visits locations data is saved on a `visit_locations` table
+* [#20](https://github.com/shlinkio/shlink/issues/20) Injected cross domain headers in response only if the `Origin` header is present in the request
+* [#11](https://github.com/shlinkio/shlink/issues/11) Separated code into multiple modules
+* [#18](https://github.com/shlinkio/shlink/issues/18) Grouped routable middleware in an Action namespace
+* [#6](https://github.com/shlinkio/shlink/issues/6) Project no longer depends on [zendframework/zend-expressive-helpers](https://github.com/zendframework/zend-expressive-helpers) package
+* [#30](https://github.com/shlinkio/shlink/issues/30) Replaced the "services" first level config entry by "dependencies", in order to fulfill default Expressive naming
+* [#25](https://github.com/shlinkio/shlink/issues/25) Replaced "Middleware" suffix on routable middlewares by "Action"
+* [#19](https://github.com/shlinkio/shlink/issues/19) Changed the vendor and app namespace from `Acelaya\UrlShortener` to `Shlinkio\Shlink`
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* [#36](https://github.com/shlinkio/shlink/issues/36) Removed hhvm from the CI matrix since it doesn't support array constants and will fail
+
+#### Fixed
+
+* [#24](https://github.com/shlinkio/shlink/issues/24) Prevented duplicated short codes errors because of the case insensitive behavior on MySQL
+
+
+## 0.2.0 - 2016-08-01
+
+#### Added
+
+* [#8](https://github.com/shlinkio/shlink/issues/8) Created a REST API
+* [#10](https://github.com/shlinkio/shlink/issues/10) Added more CLI functionality
+* [#5](https://github.com/shlinkio/shlink/issues/5) Created a CHANGELOG file
+
+#### Changed
+
+* [#9](https://github.com/shlinkio/shlink/issues/9) Used [symfony/console](https://github.com/symfony/console) to dispatch console requests, instead of trying to integrate the process with expressive
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Alejandro Celaya
+Copyright (c) 2018 Alejandro Celaya
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,9 +1,188 @@
 # Shlink
 
-[![Build Status](https://travis-ci.org/shlinkio/shlink.svg?branch=master)](https://travis-ci.org/shlinkio/shlink)
-[![Code Coverage](https://scrutinizer-ci.com/g/shlinkio/shlink/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/shlinkio/shlink/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master)
-[![Latest Stable Version](https://poser.pugx.org/shlinkio/shlink/v/stable.png)](https://packagist.org/packages/shlinkio/shlink)
-[![License](https://poser.pugx.org/shlinkio/shlink/license.png)](https://packagist.org/packages/shlinkio/shlink)
+[![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)
+[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master)
+[![Latest Stable Version](https://img.shields.io/github/release/shlinkio/shlink.svg?style=flat-square)](https://packagist.org/packages/shlinkio/shlink)
+[![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/master/LICENSE)
+[![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://acel.me/donate)
 
-A PHP-based URL shortener application with analytics and management
+A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own custom domain.
+
+## Installation
+
+First make sure the host where you are going to run shlink fulfills these requirements:
+
+* PHP 7.1 or greater with JSON, APCu, intl, curl, PDO and gd extensions enabled.
+* MySQL, 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.
+
+* **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.
+
+    Finally, decompress the file in the location of your choice.
+
+* **Building from sources**
+
+    If for any reason you want to build the project yourself, follow these steps:
+
+    * Clone the project with git (`git clone https://github.com/shlinkio/shlink.git`), or download it by clicking the **Clone or download** green button.
+    * Download the [Composer](https://getcomposer.org/download/) PHP package manager inside the project folder.
+    * Run `./build.sh 1.0.0`, replacing the version with the version number you are going to build (the version number is 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.
+
+    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.
+
+Despite how you built the project, you are going to need to install it now, by following these steps:
+
+* If you are going to use MySQL 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.**
+* Configure the web server of your choice to serve shlink using your short domain.
+
+    For example, assuming your domain is doma.in and shlink is in the `/path/to/shlink` folder, this would be the basic configuration 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.1-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>
+    ```
+
+* 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**
+
+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, so it should be easy to schedule them to be run in the background (for example, using cron jobs):
+
+* Resolve IP address locations: `/path/to/shlink/bin/cli visit:process`
+
+    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.
+
+## 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:
+
+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.
+
+The 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 the assets neccessary for Shlink to function.
+
+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.
+
+## Using a docker image
+
+Currently there's no official docker image, but there's a work in progress alpha version you can find [here](https://hub.docker.com/r/shlinkio/shlink/).
+
+The idea will be that you can just generate a container using the image and provide predefined config files via volumes or CLI arguments, so that you get shlink up and running.
+
+Currently the image does not expose an entry point which let's you interact with shlink's CLI interface, nor allows configuration to be passed.
+
+## Using shlink
+
+Once shlink is installed, there are two main ways to interact with it:
+
+* **The command line**. Try running `bin/cli` and see all the available commands.
+
+    All of those commands can be run with the `--help`/`-h` flag in order to see how to use them and all the available options.
+
+    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).
+
+    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.
+
+Both the API and CLI allow you to do the same operations, except for API key management, which can be done from the command line interface only.
+
+### Shlink CLI Help
+
+```
+Usage:
+  command [options] [arguments]
+
+Options:
+  -h, --help            Display this help message
+  -q, --quiet           Do not output any message
+  -V, --version         Display this application version
+      --ansi            Force ANSI output
+      --no-ansi         Disable ANSI output
+  -n, --no-interaction  Do not ask any interactive question
+  -v|vv|vvv, --verbose  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+
+Available commands:
+  help                        Displays help for a command
+  list                        Lists commands
+ api-key
+  api-key:disable             Disables an API key.
+  api-key:generate            Generates a new valid API key.
+  api-key:list                Lists all the available API keys.
+ config
+  config:generate-charset     Generates a character set sample just by shuffling the default one, "123456789bcdfghjkmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ". Then it can be set in the SHORTCODE_CHARS environment variable
+  config:generate-secret      Generates a random secret string that can be used for JWT token encryption
+ short-url
+  short-url:delete            [short-code:delete] Deletes a short URL
+  short-url:generate          [shortcode:generate|short-code:generate] Generates a short URL for provided long URL and returns it
+  short-url:list              [shortcode:list|short-code:list] List all short URLs
+  short-url:parse             [shortcode:parse|short-code:parse] Returns the long URL behind a short code
+  short-url:process-previews  [shortcode:process-previews|short-code:process-previews] Processes and generates the previews for every URL, improving performance for later web requests.
+  short-url:visits            [shortcode:visits|short-code:visits] Returns the detailed visits information for provided short code
+ tag
+  tag:create                  Creates one or more tags.
+  tag:delete                  Deletes one or more tags.
+  tag:list                    Lists existing tags.
+  tag:rename                  Renames one existing tag.
+ visit
+  visit:process               Processes visits where location is not set yet
+```

bin/cli

@@ -1,5 +1,7 @@
 #!/usr/bin/env php
 <?php
+declare(strict_types=1);
+
 use Interop\Container\ContainerInterface;
 use Symfony\Component\Console\Application as CliApp;
 

bin/install

@@ -1,30 +1,12 @@
 #!/usr/bin/env php
 <?php
-use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
-use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Installer;
+
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Filesystem\Filesystem;
-use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Zend\ServiceManager\Factory\InvokableFactory;
-use Zend\ServiceManager\ServiceManager;
+use Zend\ServiceManager\ServiceLocatorInterface;
 
-chdir(dirname(__DIR__));
-
-require __DIR__ . '/../vendor/autoload.php';
-
-$container = new ServiceManager([
-    'factories' => [
-        Application::class => InstallApplicationFactory::class,
-        Filesystem::class => InvokableFactory::class,
-        QuestionHelper::class => InvokableFactory::class,
-    ],
-    'services' => [
-        'config' => [
-            ConfigAbstractFactory::class => [
-                DatabaseConfigCustomizerPlugin::class => [QuestionHelper::class, Filesystem::class]
-            ],
-        ],
-    ],
-]);
+/** @var ServiceLocatorInterface $container */
+$container = include __DIR__ . '/../config/install-container.php';
 $container->build(Application::class)->run();

bin/update

@@ -1,30 +1,12 @@
 #!/usr/bin/env php
 <?php
-use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
-use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Installer;
+
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Filesystem\Filesystem;
-use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Zend\ServiceManager\Factory\InvokableFactory;
-use Zend\ServiceManager\ServiceManager;
+use Zend\ServiceManager\ServiceLocatorInterface;
 
-chdir(dirname(__DIR__));
-
-require __DIR__ . '/../vendor/autoload.php';
-
-$container = new ServiceManager([
-    'factories' => [
-        Application::class => InstallApplicationFactory::class,
-        Filesystem::class => InvokableFactory::class,
-        QuestionHelper::class => InvokableFactory::class,
-    ],
-    'services' => [
-        'config' => [
-            ConfigAbstractFactory::class => [
-                DatabaseConfigCustomizerPlugin::class => [QuestionHelper::class, Filesystem::class]
-            ],
-        ],
-    ],
-]);
+/** @var ServiceLocatorInterface $container */
+$container = include __DIR__ . '/../config/install-container.php';
 $container->build(Application::class, ['isUpdate' => true])->run();

build.sh

@@ -8,41 +8,51 @@ if [ "$#" -ne 1 ]; then
 fi
 
 version=$1
-builtcontent=$(readlink -f "../shlink_${version}_dist")
+builtcontent="./build/shlink_${version}_dist"
 projectdir=$(pwd)
+[ -f ./composer.phar ] && composerBin='./composer.phar' || composerBin='composer'
 
 # Copy project content to temp dir
 echo 'Copying project files...'
 rm -rf "${builtcontent}"
-mkdir "${builtcontent}"
-sudo chmod -R 777 "${projectdir}"/data/infra/{database,nginx}
-cp -R "${projectdir}"/* "${builtcontent}"
+mkdir -p "${builtcontent}"
+rsync -av * "${builtcontent}" \
+    --exclude=data/infra \
+    --exclude=**/.gitignore \
+    --exclude=CHANGELOG.md \
+    --exclude=composer.lock \
+    --exclude=vendor \
+    --exclude=docs \
+    --exclude=indocker \
+    --exclude=docker* \
+    --exclude=func_tests_bootstrap.php \
+    --exclude=php* \
+    --exclude=infection.json \
+    --exclude=phpstan.neon \
+    --exclude=config/autoload/*local* \
+    --exclude=**/test* \
+    --exclude=build*
 cd "${builtcontent}"
 
 # Install dependencies
-rm -rf vendor
-rm -f composer.lock
-composer self-update
-composer install --no-dev --optimize-autoloader --no-progress --no-interaction
+echo "Installing dependencies with $composerBin..."
+${composerBin} self-update
+${composerBin} install --no-dev --optimize-autoloader --no-progress --no-interaction
 
 # Delete development files
 echo 'Deleting dev files...'
-rm build.sh
-rm CHANGELOG.md
 rm composer.*
-rm LICENSE
-rm indocker
-rm docker-compose.yml
-rm php*
-rm README.md
-rm -rf build
-rm -ff data/database.sqlite
-rm -rf data/infra
-rm -rf data/{cache,log,proxies}/{*,.gitignore}
-rm -rf config/params/{*,.gitignore}
-rm -rf config/autoload/{{,*.}local.php{,.dist},.gitignore}
+rm -f data/database.sqlite
+
+# Update shlink version in config
+sed -i "s/%SHLINK_VERSION%/${version}/g" config/autoload/app_options.global.php
 
 # Compressing file
-rm -f "${projectdir}"/build/shlink_${version}_dist.zip
-zip -ry "${projectdir}"/build/shlink_${version}_dist.zip "../shlink_${version}_dist"
+echo 'Compressing files...'
+cd "${projectdir}"/build
+rm -f ./shlink_${version}_dist.zip
+zip -ry ./shlink_${version}_dist.zip ./shlink_${version}_dist
+cd "${projectdir}"
 rm -rf "${builtcontent}"
+
+echo 'Done!'

composer.json

@@ -12,55 +12,59 @@
         }
     ],
     "require": {
-        "php": "^7.0",
-        "acelaya/ze-content-based-error-handler": "^2.0",
+        "php": "^7.1",
+        "ext-json": "*",
+        "ext-pdo": "*",
+        "acelaya/ze-content-based-error-handler": "^2.2",
+        "akrabat/ip-address-middleware": "^1.0",
+        "cakephp/chronos": "^1.2",
         "cocur/slugify": "^3.0",
-        "doctrine/annotations": "^1.4 <1.5",
-        "doctrine/cache": "^1.6 <1.7",
-        "doctrine/collections": "^1.4 <1.5",
-        "doctrine/common": "^2.7 <2.8",
-        "doctrine/dbal": "^2.5 <2.6",
+        "doctrine/cache": "^1.6",
         "doctrine/migrations": "^1.4",
-        "doctrine/orm": "^2.5 <2.6",
-        "endroid/qrcode": "^1.7",
+        "doctrine/orm": "^2.5",
+        "endroid/qr-code": "^1.7",
         "firebase/php-jwt": "^4.0",
         "guzzlehttp/guzzle": "^6.2",
-        "http-interop/http-middleware": "^0.4.1",
         "mikehaertl/phpwkhtmltopdf": "^2.2",
         "monolog/monolog": "^1.21",
         "roave/security-advisories": "dev-master",
-        "symfony/console": "^3.0",
-        "symfony/filesystem": "^3.0",
-        "symfony/process": "^3.0",
+        "symfony/console": "^4.0 <4.1.5",
+        "symfony/filesystem": "^4.0",
+        "symfony/process": "^4.0",
         "theorchard/monolog-cascade": "^0.4",
         "zendframework/zend-config": "^3.0",
         "zendframework/zend-config-aggregator": "^1.0",
-        "zendframework/zend-expressive": "^2.0",
-        "zendframework/zend-expressive-fastroute": "^2.0",
-        "zendframework/zend-expressive-helpers": "^4.2",
-        "zendframework/zend-expressive-platesrenderer": "^1.3",
+        "zendframework/zend-diactoros": "^2.0",
+        "zendframework/zend-expressive": "^3.0",
+        "zendframework/zend-expressive-fastroute": "^3.0",
+        "zendframework/zend-expressive-helpers": "^5.0",
+        "zendframework/zend-expressive-platesrenderer": "^2.0",
         "zendframework/zend-i18n": "^2.7",
+        "zendframework/zend-inputfilter": "^2.8",
         "zendframework/zend-paginator": "^2.6",
-        "zendframework/zend-servicemanager": "^3.0",
+        "zendframework/zend-servicemanager": "^3.2",
         "zendframework/zend-stdlib": "^3.0"
     },
     "require-dev": {
         "filp/whoops": "^2.0",
-        "phpunit/dbunit": "^3.0",
-        "phpunit/phpcov": "^4.0",
-        "phpunit/phpunit": "^6.0",
+        "infection/infection": "^0.9.0",
+        "phpstan/phpstan": "^0.10.0",
+        "phpunit/phpcov": "^5.0",
+        "phpunit/phpunit": "^7.0",
         "slevomat/coding-standard": "^4.0",
-        "squizlabs/php_codesniffer": "^3.1",
-        "symfony/var-dumper": "^3.0",
-        "vlucas/phpdotenv": "^2.2",
-        "zendframework/zend-expressive-tooling": "^0.4"
+        "squizlabs/php_codesniffer": "^3.2.3",
+        "symfony/dotenv": "^4.0",
+        "symfony/var-dumper": "^4.0",
+        "zendframework/zend-component-installer": "^2.1",
+        "zendframework/zend-expressive-tooling": "^1.0"
     },
     "autoload": {
         "psr-4": {
             "Shlinkio\\Shlink\\CLI\\": "module/CLI/src",
             "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
             "Shlinkio\\Shlink\\Core\\": "module/Core/src",
-            "Shlinkio\\Shlink\\Common\\": "module/Common/src"
+            "Shlinkio\\Shlink\\Common\\": "module/Common/src",
+            "Shlinkio\\Shlink\\Installer\\": "module/Installer/src"
         },
         "files": [
             "module/Common/functions/functions.php"
@@ -77,32 +81,53 @@
             "ShlinkioTest\\Shlink\\Common\\": [
                 "module/Common/test",
                 "module/Common/test-func"
-            ]
+            ],
+            "ShlinkioTest\\Shlink\\Installer\\": "module/Installer/test"
         }
     },
     "scripts": {
         "check": [
             "@cs",
+            "@stan",
             "@test",
-            "@func-test"
+            "@infect"
         ],
+
         "cs": "phpcs",
-        "cs-fix": "phpcbf",
-        "serve": "php -S 0.0.0.0:8000 -t public/",
-        "test": "phpunit --coverage-php build/coverage-unit.cov",
-        "pretty-test": "phpunit --coverage-html build/coverage",
-        "func-test": "phpunit -c phpunit-func.xml --coverage-php build/coverage-func.cov",
-        "complete-pretty-test": [
-            "@test",
-            "@func-test",
+        "cs:fix": "phpcbf",
+        "stan": "phpstan analyse module/*/src/ --level=6 -c phpstan.neon",
+
+        "test": [
+            "@test:unit",
+            "@test:func"
+        ],
+        "test:unit": "phpunit --coverage-php build/coverage-unit.cov",
+        "test:func": "phpunit -c phpunit-func.xml --coverage-php build/coverage-func.cov",
+
+        "test:pretty": [
+            "@test:unit",
+            "@test:func",
             "phpcov merge build --html build/html"
-        ]
+        ],
+        "test:unit:pretty": "phpunit --coverage-html build/coverage",
+
+        "infect": "infection --threads=4 --min-msi=60 --only-covered --log-verbosity=2",
+        "infect:show": "infection --threads=4 --min-msi=60 --only-covered --log-verbosity=2 --show-mutations"
+    },
+    "scripts-descriptions": {
+        "check": "<fg=blue;options=bold>Alias for \"cs\", \"stan\", \"test\" and \"infect\"</>",
+        "cs": "<fg=blue;options=bold>Checks coding styles</>",
+        "cs:fix": "<fg=blue;options=bold>Fixes coding styles, when possible</>",
+        "stan": "<fg=blue;options=bold>Inspects code with phpstan</>",
+        "test": "<fg=blue;options=bold>Runs all test suites</>",
+        "test:unit": "<fg=blue;options=bold>Runs unit test suites</>",
+        "test:func": "<fg=blue;options=bold>Runs functional test suites (covering entity repositories)</>",
+        "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:show": "<fg=blue;options=bold>Checks unit tests quality applying mutation testing and shows applied mutators</>"
     },
     "config": {
-        "process-timeout": 0,
-        "sort-packages": true,
-        "platform": {
-            "php": "7.0"
-        }
+        "sort-packages": true
     }
 }

config/autoload/app_options.global.php

@@ -1,14 +1,15 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\Common;
+use function Shlinkio\Shlink\Common\env;
 
 return [
 
     'app_options' => [
         'name' => 'Shlink',
-        'version' => '1.2.0',
-        'secret_key' => Common\env('SECRET_KEY'),
+        'version' => '%SHLINK_VERSION%',
+        'secret_key' => env('SECRET_KEY'),
+        'disable_track_param' => null,
     ],
 
 ];

config/autoload/delete_short_urls.global.php

@@ -0,0 +1,13 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink;
+
+return [
+
+    'delete_short_urls' => [
+        'visits_threshold' => 15,
+        'check_visits_threshold' => true,
+    ],
+
+];

config/autoload/dependencies.global.php

@@ -5,26 +5,24 @@ use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory
 use Zend\Expressive;
 use Zend\Expressive\Container;
 use Zend\Expressive\Helper;
-use Zend\Expressive\Middleware;
-use Zend\Expressive\Plates;
-use Zend\Expressive\Router;
-use Zend\Expressive\Template;
+use Zend\Expressive\Router\Middleware\ImplicitOptionsMiddleware;
 use Zend\ServiceManager\Factory\InvokableFactory;
-use Zend\Stratigility\Middleware\ErrorHandler;
 
 return [
 
     'dependencies' => [
         'factories' => [
-            Expressive\Application::class => Container\ApplicationFactory::class,
-            Template\TemplateRendererInterface::class => Plates\PlatesRendererFactory::class,
-            Router\RouterInterface::class => Router\FastRouteRouterFactory::class,
-            ErrorHandler::class => Container\ErrorHandlerFactory::class,
-            Middleware\ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,
+            ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,
 
             Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
             Helper\ServerUrlHelper::class => InvokableFactory::class,
         ],
+
+        'delegators' => [
+            Expressive\Application::class => [
+                Container\ApplicationConfigInjectionDelegator::class,
+            ],
+        ],
     ],
 
 ];

config/autoload/middleware-pipeline.global.php

@@ -1,11 +1,8 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\Common\Middleware\LocaleMiddleware;
-use Shlinkio\Shlink\Rest\Middleware\BodyParserMiddleware;
-use Shlinkio\Shlink\Rest\Middleware\CheckAuthenticationMiddleware;
-use Shlinkio\Shlink\Rest\Middleware\CrossDomainMiddleware;
-use Shlinkio\Shlink\Rest\Middleware\PathVersionMiddleware;
+namespace Shlinkio\Shlink;
+
 use Zend\Expressive;
 use Zend\Stratigility\Middleware\ErrorHandler;
 
@@ -15,21 +12,23 @@ return [
         'pre-routing' => [
             'middleware' => [
                 ErrorHandler::class,
-                LocaleMiddleware::class,
+                Expressive\Helper\ContentLengthMiddleware::class,
+                Common\Middleware\LocaleMiddleware::class,
             ],
-            'priority' => 11,
+            'priority' => 12,
         ],
         'pre-routing-rest' => [
             'path' => '/rest',
             'middleware' => [
-                PathVersionMiddleware::class,
+                Rest\Middleware\PathVersionMiddleware::class,
+                Rest\Middleware\ShortUrl\ShortCodePathMiddleware::class,
             ],
             'priority' => 11,
         ],
 
         'routing' => [
             'middleware' => [
-                Expressive\Application::ROUTING_MIDDLEWARE,
+                Expressive\Router\Middleware\RouteMiddleware::class,
             ],
             'priority' => 10,
         ],
@@ -37,17 +36,18 @@ return [
         'rest' => [
             'path' => '/rest',
             'middleware' => [
-                CrossDomainMiddleware::class,
-                Expressive\Middleware\ImplicitOptionsMiddleware::class,
-                BodyParserMiddleware::class,
-                CheckAuthenticationMiddleware::class,
+                Rest\Middleware\CrossDomainMiddleware::class,
+                Expressive\Router\Middleware\ImplicitOptionsMiddleware::class,
+                Rest\Middleware\BodyParserMiddleware::class,
+                Rest\Middleware\AuthenticationMiddleware::class,
             ],
             'priority' => 5,
         ],
 
         'post-routing' => [
             'middleware' => [
-                Expressive\Application::DISPATCH_MIDDLEWARE,
+                Expressive\Router\Middleware\DispatchMiddleware::class,
+                Core\Response\NotFoundHandler::class,
             ],
             'priority' => 1,
         ],

config/config.php

@@ -1,27 +1,26 @@
 <?php
 declare(strict_types=1);
 
-use Acelaya\ExpressiveErrorHandler;
-use Shlinkio\Shlink\CLI;
-use Shlinkio\Shlink\Common;
-use Shlinkio\Shlink\Core;
-use Shlinkio\Shlink\Rest;
-use Zend\ConfigAggregator;
+namespace Shlinkio\Shlink;
 
-/**
- * Configuration files are loaded in a specific order. First ``global.php``, then ``*.global.php``.
- * then ``local.php`` and finally ``*.local.php``. This way local settings overwrite global settings.
- *
- * The configuration can be cached. This can be done by setting ``config_cache_enabled`` to ``true``.
- *
- * Obviously, if you use closures in your config you can't cache it.
- */
+use Acelaya\ExpressiveErrorHandler;
+use Zend\ConfigAggregator;
+use Zend\Expressive;
 
 return (new ConfigAggregator\ConfigAggregator([
+    Expressive\ConfigProvider::class,
+    Expressive\Router\ConfigProvider::class,
+    Expressive\Router\FastRouteRouter\ConfigProvider::class,
+    Expressive\Plates\ConfigProvider::class,
+    Expressive\Helper\ConfigProvider::class,
+    \class_exists(Expressive\Swoole\ConfigProvider::class)
+        ? Expressive\Swoole\ConfigProvider::class
+        : new ConfigAggregator\ArrayProvider([]),
     ExpressiveErrorHandler\ConfigProvider::class,
     Common\ConfigProvider::class,
     Core\ConfigProvider::class,
     CLI\ConfigProvider::class,
+    Installer\ConfigProvider::class,
     Rest\ConfigProvider::class,
     new ConfigAggregator\ZendConfigProvider('config/{autoload/{{,*.}global,{,*.}local},params/generated_config}.php'),
 ], 'data/cache/app_config.php'))->getMergedConfig();

config/container.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-use Dotenv\Dotenv;
+use Symfony\Component\Dotenv\Dotenv;
 use Zend\ServiceManager\ServiceManager;
 
 chdir(dirname(__DIR__));
@@ -12,8 +12,8 @@ require 'vendor/autoload.php';
 if (class_exists(Dotenv::class)) {
     error_reporting(E_ALL);
     ini_set('display_errors', '1');
-    $dotenv = new Dotenv(__DIR__ . '/..');
-    $dotenv->load();
+    $dotenv = new Dotenv();
+    $dotenv->load(__DIR__ . '/../.env');
 }
 
 // Build container

config/install-container.php

@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+use Shlinkio\Shlink\Installer\Config\Plugin\DatabaseConfigCustomizer;
+use Shlinkio\Shlink\Installer\Factory\InstallApplicationFactory;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Filesystem\Filesystem;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+use Zend\ServiceManager\Factory\InvokableFactory;
+use Zend\ServiceManager\ServiceManager;
+
+chdir(dirname(__DIR__));
+
+require __DIR__ . '/../vendor/autoload.php';
+
+$container = new ServiceManager([
+    'factories' => [
+        Application::class => InstallApplicationFactory::class,
+        Filesystem::class => InvokableFactory::class,
+    ],
+    'services' => [
+        'config' => [
+            ConfigAbstractFactory::class => [
+                DatabaseConfigCustomizer::class => [Filesystem::class],
+            ],
+        ],
+    ],
+]);
+return $container;

data/infra/php.Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-alpine
+FROM php:7.1.22-fpm-alpine
 MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
 
 RUN apk update

data/infra/travis-php/apcu.ini

@@ -1 +0,0 @@
-extension="apcu.so"

data/infra/travis-php/memcached.ini

@@ -1 +0,0 @@
-extension="memcached.so"

data/migrations/Version20171021093246.php

@@ -20,7 +20,7 @@ class Version20171021093246 extends AbstractMigration
     public function up(Schema $schema)
     {
         $shortUrls = $schema->getTable('short_urls');
-        if ($shortUrls->hasColumn('value_since')) {
+        if ($shortUrls->hasColumn('valid_since')) {
             return;
         }
 
@@ -39,7 +39,7 @@ class Version20171021093246 extends AbstractMigration
     public function down(Schema $schema)
     {
         $shortUrls = $schema->getTable('short_urls');
-        if (! $shortUrls->hasColumn('value_since')) {
+        if (! $shortUrls->hasColumn('valid_since')) {
             return;
         }
 

data/migrations/Version20180801183328.php

@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20180801183328 extends AbstractMigration
+{
+    private const NEW_SIZE = 255;
+    private const OLD_SIZE = 10;
+
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function up(Schema $schema): void
+    {
+        $this->setSize($schema, self::NEW_SIZE);
+    }
+
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function down(Schema $schema): void
+    {
+        $this->setSize($schema, self::OLD_SIZE);
+    }
+
+    /**
+     * @param Schema $schema
+     * @param int $size
+     * @throws SchemaException
+     */
+    private function setSize(Schema $schema, int $size): void
+    {
+        $schema->getTable('short_urls')->getColumn('short_code')->setLength($size);
+    }
+}

data/migrations/Version20180913205455.php

@@ -0,0 +1,74 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+use Shlinkio\Shlink\Common\Exception\WrongIpException;
+use Shlinkio\Shlink\Common\Util\IpAddress;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20180913205455 extends AbstractMigration
+{
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema): void
+    {
+        // Nothing to create
+    }
+
+    /**
+     * @param Schema $schema
+     * @throws DBALException
+     */
+    public function postUp(Schema $schema): void
+    {
+        $qb = $this->connection->createQueryBuilder();
+        $qb->select('id', 'remote_addr')
+           ->from('visits');
+        $st = $this->connection->executeQuery($qb->getSQL());
+
+        $qb = $this->connection->createQueryBuilder();
+        $qb->update('visits', 'v')
+           ->set('v.remote_addr', ':obfuscatedAddr')
+           ->where('v.id=:id');
+
+        while ($row = $st->fetch(\PDO::FETCH_ASSOC)) {
+            $addr = $row['remote_addr'] ?? null;
+            if ($addr === null) {
+                continue;
+            }
+
+            $qb->setParameters([
+                'id' => $row['id'],
+                'obfuscatedAddr' => $this->determineAddress((string) $addr),
+            ])->execute();
+        }
+    }
+
+    private function determineAddress(string $addr): ?string
+    {
+        if ($addr === IpAddress::LOCALHOST) {
+            return $addr;
+        }
+
+        try {
+            return (string) IpAddress::fromString($addr)->getObfuscatedCopy();
+        } catch (WrongIpException $e) {
+            return null;
+        }
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema): void
+    {
+        // Nothing to rollback
+    }
+}

data/migrations/Version20180915110857.php

@@ -0,0 +1,50 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20180915110857 extends AbstractMigration
+{
+    private const ON_DELETE_MAP = [
+        'visit_locations' => 'SET NULL',
+        'short_urls' => 'CASCADE',
+    ];
+
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function up(Schema $schema): void
+    {
+        $visits = $schema->getTable('visits');
+        $foreignKeys = $visits->getForeignKeys();
+
+        // Remove all existing foreign keys and add them again with CASCADE delete
+        foreach ($foreignKeys as $foreignKey) {
+            $visits->removeForeignKey($foreignKey->getName());
+            $foreignTable = $foreignKey->getForeignTableName();
+
+            $visits->addForeignKeyConstraint(
+                $foreignTable,
+                $foreignKey->getLocalColumns(),
+                $foreignKey->getForeignColumns(),
+                [
+                    'onDelete' => self::ON_DELETE_MAP[$foreignTable],
+                    'onUpdate' => 'RESTRICT',
+                ]
+            );
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        // Nothing to run
+    }
+}

docs/swagger/definitions/Pagination.json

@@ -3,11 +3,23 @@
     "properties": {
         "currentPage": {
             "type": "integer",
-            "description": "The number of current page being displayed."
+            "description": "The number of current page."
         },
         "pagesCount": {
             "type": "integer",
-            "description": "The total number of pages that can be displayed."
+            "description": "The total number of pages that can be obtained."
+        },
+        "itemsPerPage": {
+            "type": "integer",
+            "description": "The number of items for every page."
+        },
+        "itemsInCurrentPage": {
+            "type": "integer",
+            "description": "The number of items in current page (could be smaller than itemsPerPage)."
+        },
+        "totalItems": {
+            "type": "integer",
+            "description": "The total number of items among all pages."
         }
     }
 }

docs/swagger/definitions/ShortUrl.json

@@ -5,7 +5,11 @@
             "type": "string",
             "description": "The short code for this short URL."
         },
-        "originalUrl": {
+        "shortUrl": {
+            "type": "string",
+            "description": "The short URL."
+        },
+        "longUrl": {
             "type": "string",
             "description": "The original long URL."
         },
@@ -24,6 +28,11 @@
                 "type": "string"
             },
             "description": "A list of tags applied to this short URL"
+        },
+        "originalUrl": {
+            "deprecated": true,
+            "type": "string",
+            "description": "The original long URL. [DEPRECATED. Use longUrl instead]"
         }
     }
 }

docs/swagger/definitions/Visit.json

@@ -2,17 +2,25 @@
     "type": "object",
     "properties": {
         "referer": {
-            "type": "string"
+            "type": "string",
+            "description": "The origin from which the visit was performed"
         },
         "date": {
             "type": "string",
-            "format": "date-time"
-        },
-        "remoteAddr": {
-            "type": "string"
+            "format": "date-time",
+            "description": "The date in which the visit was performed"
         },
         "userAgent": {
-            "type": "string"
+            "type": "string",
+            "description": "The user agent from which the visit was performed"
+        },
+        "visitLocation": {
+            "$ref": "./VisitLocation.json"
+        },
+        "remoteAddr": {
+            "type": "string",
+            "description": "This value is deprecated and will always be null",
+            "deprecated": true
         }
     }
 }

docs/swagger/definitions/VisitLocation.json

@@ -0,0 +1,26 @@
+{
+    "type": "object",
+    "properties": {
+        "cityName": {
+            "type": "string"
+        },
+        "countryCode": {
+            "type": "string"
+        },
+        "countryName": {
+            "type": "string"
+        },
+        "latitude": {
+            "type": "string"
+        },
+        "longitude": {
+            "type": "string"
+        },
+        "regionName": {
+            "type": "string"
+        },
+        "timezone": {
+            "type": "string"
+        }
+    }
+}

docs/swagger/parameters/Authorization.json

@@ -1,7 +0,0 @@
-{
-    "name": "Authorization",
-    "in": "header",
-    "description": "The authorization token with Bearer type",
-    "required": true,
-    "type": "string"
-}

docs/swagger/paths/v1_authenticate.json

@@ -1,28 +1,45 @@
 {
     "post": {
+        "deprecated": true,
+        "operationId": "authenticate",
         "tags": [
             "Authentication"
         ],
-        "summary": "Perform authentication",
-        "description": "Performs an authentication",
-        "parameters": [
-            {
-                "name": "apiKey",
-                "in": "formData",
-                "description": "The API key to authenticate with",
-                "required": true,
-                "type": "string"
+        "summary": "[Deprecated] Perform authentication",
+        "description": "**This endpoint is deprecated, since the authentication can be performed via API key now**. Performs an authentication.",
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "apiKey"
+                        ],
+                        "properties": {
+                            "apiKey": {
+                                "description": "The API key to authenticate with",
+                                "type": "string"
+                            }
+                        }
+                    }
+                }
             }
-        ],
+        },
         "responses": {
             "200": {
                 "description": "The authentication worked.",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "token": {
-                            "type": "string",
-                            "description": "The authentication token that needs to be sent in the Authorization header"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "token": {
+                                    "type": "string",
+                                    "description": "The authentication token that needs to be sent in the Authorization header"
+                                }
+                            }
                         }
                     }
                 },
@@ -34,20 +51,32 @@
             },
             "400": {
                 "description": "An API key was not provided.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                 }
             },
             "401": {
                 "description": "The API key is incorrect, is disabled or has expired.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                 }
             },
             "500": {
                 "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                 }
             }
         }

docs/swagger/paths/v1_short-codes.json

@@ -1,182 +0,0 @@
-{
-    "get": {
-        "tags": [
-            "ShortCodes"
-        ],
-        "summary": "List short URLs",
-        "description": "Returns the list of short codes",
-        "parameters": [
-            {
-                "name": "page",
-                "in": "query",
-                "description": "The page to be displayed. Defaults to 1",
-                "required": false,
-                "type": "integer"
-            },
-            {
-                "name": "searchTerm",
-                "in": "query",
-                "description": "A query used to filter results by searching for it on the longUrl and shortCode fields. (Since v1.3.0)",
-                "required": false,
-                "type": "string"
-            },
-            {
-                "name": "tags",
-                "in": "query",
-                "description": "A list of tags used to filter the resultset. Only short URLs tagged with at least one of the provided tags will be returned. (Since v1.3.0)",
-                "required": false,
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            },
-            {
-                "name": "orderBy",
-                "in": "query",
-                "description": "The field from which you want to order the result. (Since v1.3.0)",
-                "enum": [
-                    "originalUrl",
-                    "shortCode",
-                    "dateCreated",
-                    "visits"
-                ],
-                "required": false,
-                "type": "string"
-            },
-            {
-                "$ref": "../parameters/Authorization.json"
-            }
-        ],
-        "responses": {
-            "200": {
-                "description": "The list of short URLs",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "shortUrls": {
-                            "type": "object",
-                            "properties": {
-                                "data": {
-                                    "type": "array",
-                                    "items": {
-                                        "$ref": "../definitions/ShortUrl.json"
-                                    }
-                                },
-                                "pagination": {
-                                    "$ref": "../definitions/Pagination.json"
-                                }
-                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "shortUrls": {
-                            "data": [
-                                {
-                                    "shortCode": "12C18",
-                                    "originalUrl": "https://store.steampowered.com",
-                                    "dateCreated": "2016-08-21T20:34:16+02:00",
-                                    "visitsCount": 328,
-                                    "tags": [
-                                        "games",
-                                        "tech"
-                                    ]
-                                },
-                                {
-                                    "shortCode": "12Kb3",
-                                    "originalUrl": "https://shlink.io",
-                                    "dateCreated": "2016-05-01T20:34:16+02:00",
-                                    "visitsCount": 1029,
-                                    "tags": [
-                                        "shlink"
-                                    ]
-                                },
-                                {
-                                    "shortCode": "123bA",
-                                    "originalUrl": "https://www.google.com",
-                                    "dateCreated": "2015-10-01T20:34:16+02:00",
-                                    "visitsCount": 25,
-                                    "tags": []
-                                }
-                            ],
-                            "pagination": {
-                                "currentPage": 5,
-                                "pagesCount": 12
-                            }
-                        }
-                    }
-                }
-            },
-            "500": {
-                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            }
-        }
-    },
-    "post": {
-        "tags": [
-            "ShortCodes"
-        ],
-        "summary": "Create short URL",
-        "description": "Creates a new short code",
-        "parameters": [
-            {
-                "name": "longUrl",
-                "in": "formData",
-                "description": "The URL to parse",
-                "required": true,
-                "type": "string"
-            },
-            {
-                "name": "tags",
-                "in": "formData",
-                "description": "The URL to parse",
-                "required": false,
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            },
-            {
-                "$ref": "../parameters/Authorization.json"
-            }
-        ],
-        "responses": {
-            "200": {
-                "description": "The result of parsing the long URL",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "longUrl": {
-                            "type": "string",
-                            "description": "The original long URL that has been parsed"
-                        },
-                        "shortUrl": {
-                            "type": "string",
-                            "description": "The generated short URL"
-                        },
-                        "shortCode": {
-                            "type": "string",
-                            "description": "the short code that is being used in the short URL"
-                        }
-                    }
-                }
-            },
-            "400": {
-                "description": "The long URL was not provided or is invalid.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            },
-            "500": {
-                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            }
-        }
-    }
-}

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

@@ -1,58 +0,0 @@
-{
-    "get": {
-        "tags": [
-            "ShortCodes"
-        ],
-        "summary": "Parse short code",
-        "description": "Get the long URL behind a short code.",
-        "parameters": [
-            {
-                "name": "shortCode",
-                "in": "path",
-                "type": "string",
-                "description": "The short code to resolve.",
-                "required": true
-            },
-            {
-                "$ref": "../parameters/Authorization.json"
-            }
-        ],
-        "responses": {
-            "200": {
-                "description": "The long URL behind a short code.",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "longUrl": {
-                            "type": "string",
-                            "description": "The original long URL behind the short code."
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "longUrl": "https://shlink.io"
-                    }
-                }
-            },
-            "400": {
-                "description": "Provided shortCode does not match the character set currently used by the app to generate short codes.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            },
-            "404": {
-                "description": "No URL was found for provided short code.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            },
-            "500": {
-                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            }
-        }
-    }
-}

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

@@ -1,74 +0,0 @@
-{
-    "put": {
-        "tags": [
-            "ShortCodes",
-            "Tags"
-        ],
-        "summary": "Edit tags on short URL",
-        "description": "Edit the tags on provided short code.",
-        "parameters": [
-            {
-                "name": "shortCode",
-                "in": "path",
-                "type": "string",
-                "description": "The shortCode in which we want to edit tags.",
-                "required": true
-            },
-            {
-                "name": "tags",
-                "in": "formData",
-                "type": "array",
-                "items": {
-                    "type": "string"
-                },
-                "description": "The list of tags to set to the short URL.",
-                "required": true
-            },
-            {
-                "$ref": "../parameters/Authorization.json"
-            }
-        ],
-        "responses": {
-            "200": {
-                "description": "List of tags.",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "tags": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "tags": [
-                            "games",
-                            "tech"
-                        ]
-                    }
-                }
-            },
-            "400": {
-                "description": "The request body does not contain a \"tags\" param with array type.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            },
-            "404": {
-                "description": "No short URL was found for provided short code.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            },
-            "500": {
-                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            }
-        }
-    }
-}

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

@@ -1,81 +0,0 @@
-{
-    "get": {
-        "tags": [
-            "ShortCodes",
-            "Visits"
-        ],
-        "summary": "List visits for short URL",
-        "description": "Get the list of visits on provided short code.",
-        "parameters": [
-            {
-                "name": "shortCode",
-                "in": "path",
-                "type": "string",
-                "description": "The shortCode from which we want to get the visits.",
-                "required": true
-            },
-            {
-                "$ref": "../parameters/Authorization.json"
-            }
-        ],
-        "responses": {
-            "200": {
-                "description": "List of visits.",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "visits": {
-                            "type": "object",
-                            "properties": {
-                                "data": {
-                                    "type": "array",
-                                    "items": {
-                                        "$ref": "../definitions/Visit.json"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "examples": {
-                    "application/json": {
-                        "visits": {
-                            "data": [
-                                {
-                                    "referer": "https://twitter.com",
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "remoteAddr": "10.20.30.40",
-                                    "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0"
-                                },
-                                {
-                                    "referer": "https://t.co",
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "remoteAddr": "11.22.33.44",
-                                    "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
-                                },
-                                {
-                                    "referer": null,
-                                    "date": "2015-08-20T05:05:03+04:00",
-                                    "remoteAddr": "110.220.5.6",
-                                    "userAgent": "some_web_crawler/1.4"
-                                }
-                            ]
-                        }
-                    }
-                }
-            },
-            "404": {
-                "description": "The short code does not belong to any short URL.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            },
-            "500": {
-                "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
-                }
-            }
-        }
-    }
-}

docs/swagger/paths/v1_short-urls.json

@@ -0,0 +1,253 @@
+{
+    "get": {
+        "operationId": "listShortUrls",
+        "tags": [
+            "Short URLs"
+        ],
+        "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": [
+            {
+                "name": "page",
+                "in": "query",
+                "description": "The page to be displayed. Defaults to 1",
+                "required": false,
+                "schema": {
+                    "type": "integer"
+                }
+            },
+            {
+                "name": "searchTerm",
+                "in": "query",
+                "description": "A query used to filter results by searching for it on the longUrl and shortCode fields. (Since v1.3.0)",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "tags[]",
+                "in": "query",
+                "description": "A list of tags used to filter the resultset. Only short URLs tagged with at least one of the provided tags will be returned. (Since v1.3.0)",
+                "required": false,
+                "schema": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            {
+                "name": "orderBy",
+                "in": "query",
+                "description": "The field from which you want to order the result. (Since v1.3.0)",
+                "required": false,
+                "schema": {
+                    "type": "string",
+                    "enum": [
+                        "longUrl",
+                        "shortCode",
+                        "dateCreated",
+                        "visits"
+                    ]
+                }
+            }
+        ],
+        "security": [
+            {
+                "ApiKey": []
+            },
+            {
+                "Bearer": []
+            }
+        ],
+        "responses": {
+            "200": {
+                "description": "The list of short URLs",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "shortUrls": {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "../definitions/ShortUrl.json"
+                                            }
+                                        },
+                                        "pagination": {
+                                            "$ref": "../definitions/Pagination.json"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "shortUrls": {
+                            "data": [
+                                {
+                                    "shortCode": "12C18",
+                                    "shortUrl": "https://doma.in/12C18",
+                                    "longUrl": "https://store.steampowered.com",
+                                    "dateCreated": "2016-08-21T20:34:16+02:00",
+                                    "visitsCount": 328,
+                                    "tags": [
+                                        "games",
+                                        "tech"
+                                    ]
+                                },
+                                {
+                                    "shortCode": "12Kb3",
+                                    "shortUrl": "https://doma.in/12Kb3",
+                                    "longUrl": "https://shlink.io",
+                                    "dateCreated": "2016-05-01T20:34:16+02:00",
+                                    "visitsCount": 1029,
+                                    "tags": [
+                                        "shlink"
+                                    ]
+                                },
+                                {
+                                    "shortCode": "123bA",
+                                    "shortUrl": "https://doma.in/123bA",
+                                    "longUrl": "https://www.google.com",
+                                    "dateCreated": "2015-10-01T20:34:16+02:00",
+                                    "visitsCount": 25,
+                                    "tags": []
+                                }
+                            ],
+                            "pagination": {
+                                "currentPage": 5,
+                                "pagesCount": 12,
+                                "itemsPerPage": 10,
+                                "itemsInCurrentPage": 10,
+                                "totalItems": 115
+                            }
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    },
+
+    "post": {
+        "operationId": "createShortUrl",
+        "tags": [
+            "Short URLs"
+        ],
+        "summary": "Create short URL",
+        "description": "Creates a new 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.",
+        "security": [
+            {
+                "ApiKey": []
+            },
+            {
+                "Bearer": []
+            }
+        ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "longUrl"
+                        ],
+                        "properties": {
+                            "longUrl": {
+                                "description": "The URL to parse",
+                                "type": "string"
+                            },
+                            "tags": {
+                                "description": "The URL to parse",
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            },
+                            "validSince": {
+                                "description": "The date (in ISO-8601 format) from which this short code will be valid",
+                                "type": "string"
+                            },
+                            "validUntil": {
+                                "description": "The date (in ISO-8601 format) until which this short code will be valid",
+                                "type": "string"
+                            },
+                            "customSlug": {
+                                "description": "A unique custom slug to be used instead of the generated short code",
+                                "type": "string"
+                            },
+                            "maxVisits": {
+                                "description": "The maximum number of allowed visits for this short code",
+                                "type": "number"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "responses": {
+            "200": {
+                "description": "The result of parsing the long URL",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "longUrl": {
+                                    "type": "string",
+                                    "description": "The original long URL that has been parsed"
+                                },
+                                "shortUrl": {
+                                    "type": "string",
+                                    "description": "The generated short URL"
+                                },
+                                "shortCode": {
+                                    "type": "string",
+                                    "description": "the short code that is being used in the short URL"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "400": {
+                "description": "The long URL was not provided or is invalid.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

docs/swagger/paths/v1_short-urls_shorten.json

@@ -0,0 +1,126 @@
+{
+    "get": {
+        "operationId": "shortenUrl",
+        "tags": [
+            "Short URLs"
+        ],
+        "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": [
+            {
+                "name": "apiKey",
+                "in": "query",
+                "description": "The API key used to authenticate the request",
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "longUrl",
+                "in": "query",
+                "description": "The URL to be shortened",
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "format",
+                "in": "query",
+                "description": "The format in which you want the response to be returned. You can also use the \"Accept\" header instead of this",
+                "required": false,
+                "schema": {
+                    "type": "string",
+                    "enum": [
+                        "txt",
+                        "json"
+                    ]
+                }
+            }
+        ],
+        "responses": {
+            "200": {
+                "description": "The list of short URLs",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "longUrl": {
+                                    "type": "string",
+                                    "description": "The original long URL that has been shortened"
+                                },
+                                "shortUrl": {
+                                    "type": "string",
+                                    "description": "The generated short URL"
+                                },
+                                "shortCode": {
+                                    "type": "string",
+                                    "description": "the short code that is being used in the short URL"
+                                }
+                            }
+                        }
+                    },
+                    "text/plain": {
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "longUrl": "https://github.com/shlinkio/shlink",
+                        "shortUrl": "https://dom.ain/abc123",
+                        "shortCode": "abc123"
+                    },
+                    "text/plain": "https://dom.ain/abc123"
+                }
+            },
+            "400": {
+                "description": "The long URL was not provided or is invalid.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    },
+                    "text/plain": {
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "error": "INVALID_URL",
+                        "message": "Provided URL foo is invalid. Try with a different one."
+                    },
+                    "text/plain": "INVALID_URL"
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    },
+                    "text/plain": {
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "error": "UNKNOWN_ERROR",
+                        "message": "Unexpected error occurred"
+                    },
+                    "text/plain": "UNKNOWN_ERROR"
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,240 @@
+{
+    "get": {
+        "operationId": "getShortUrl",
+        "tags": [
+            "Short URLs"
+        ],
+        "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": [
+            {
+                "name": "shortCode",
+                "in": "path",
+                "description": "The short code to resolve.",
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            }
+        ],
+        "security": [
+            {
+                "ApiKey": []
+            },
+            {
+                "Bearer": []
+            }
+        ],
+        "responses": {
+            "200": {
+                "description": "The URL info behind a short code.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/ShortUrl.json"
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "shortCode": "12Kb3",
+                        "shortUrl": "https://doma.in/12Kb3",
+                        "longUrl": "https://shlink.io",
+                        "dateCreated": "2016-05-01T20:34:16+02:00",
+                        "visitsCount": 1029,
+                        "tags": [
+                            "shlink"
+                        ]
+                    }
+                }
+            },
+            "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": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    },
+
+    "put": {
+        "operationId": "editShortUrl",
+        "tags": [
+            "Short URLs"
+        ],
+        "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": [
+            {
+                "name": "shortCode",
+                "in": "path",
+                "description": "The short code to edit.",
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            }
+        ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "properties": {
+                            "validSince": {
+                                "description": "The date (in ISO-8601 format) from which this short code will be valid",
+                                "type": "string"
+                            },
+                            "validUntil": {
+                                "description": "The date (in ISO-8601 format) until which this short code will be valid",
+                                "type": "string"
+                            },
+                            "maxVisits": {
+                                "description": "The maximum number of allowed visits for this short code",
+                                "type": "number"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "security": [
+            {
+                "ApiKey": []
+            },
+            {
+                "Bearer": []
+            }
+        ],
+        "responses": {
+            "204": {
+                "description": "The short code has been properly updated."
+            },
+            "400": {
+                "description": "Provided meta arguments are invalid.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "404": {
+                "description": "No short URL was found for provided short code.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    },
+
+    "delete": {
+        "operationId": "deleteShortUrl",
+        "tags": [
+            "Short URLs"
+        ],
+        "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": [
+            {
+                "name": "shortCode",
+                "in": "path",
+                "description": "The short code to edit.",
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            }
+        ],
+        "security": [
+            {
+                "ApiKey": []
+            },
+            {
+                "Bearer": []
+            }
+        ],
+        "responses": {
+            "204": {
+                "description": "The short URL has been properly deleted."
+            },
+            "400": {
+                "description": "The visits threshold in shlink does not allow this short URL to be deleted.",
+                "content": {
+                    "application/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."
+                    }
+                }
+            },
+            "404": {
+                "description": "No short URL was found for provided short code.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,110 @@
+{
+    "put": {
+        "operationId": "editShortUrlTags",
+        "tags": [
+            "Short URLs"
+        ],
+        "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": [
+            {
+                "name": "shortCode",
+                "in": "path",
+                "description": "The short code for the short URL in which we want to edit tags.",
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            }
+        ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "tags"
+                        ],
+                        "properties": {
+                            "tags": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                },
+                                "description": "The list of tags to set to the short URL."
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "security": [
+            {
+                "ApiKey": []
+            },
+            {
+                "Bearer": []
+            }
+        ],
+        "responses": {
+            "200": {
+                "description": "List of tags.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "tags": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "tags": [
+                            "games",
+                            "tech"
+                        ]
+                    }
+                }
+            },
+            "400": {
+                "description": "The request body does not contain a \"tags\" param with array type.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "404": {
+                "description": "No short URL was found for provided short code.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,126 @@
+{
+    "get": {
+        "operationId": "getShortUrlVisits",
+        "tags": [
+            "Visits"
+        ],
+        "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": [
+            {
+                "name": "shortCode",
+                "in": "path",
+                "description": "The short code for the short URL from which we want to get the visits.",
+                "required": true,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "startDate",
+                "in": "query",
+                "description": "The date (in ISO-8601 format) from which we want to get visits.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
+            },
+            {
+                "name": "endDate",
+                "in": "query",
+                "description": "The date (in ISO-8601 format) until which we want to get visits.",
+                "required": false,
+                "schema": {
+                    "type": "string"
+                }
+            }
+        ],
+        "security": [
+            {
+                "ApiKey": []
+            },
+            {
+                "Bearer": []
+            }
+        ],
+        "responses": {
+            "200": {
+                "description": "List of visits.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "visits": {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "../definitions/Visit.json"
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "visits": {
+                            "data": [
+                                {
+                                    "referer": "https://twitter.com",
+                                    "date": "2015-08-20T05:05:03+04:00",
+                                    "userAgent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0 Mozilla/5.0 (Macintosh; Intel Mac OS X x.y; rv:42.0) Gecko/20100101 Firefox/42.0",
+                                    "visitLocation": null
+                                },
+                                {
+                                    "referer": "https://t.co",
+                                    "date": "2015-08-20T05:05:03+04:00",
+                                    "userAgent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36",
+                                    "visitLocation": {
+                                        "cityName": "Cupertino",
+                                        "countryCode": "US",
+                                        "countryName": "United States",
+                                        "latitude": "37.3042",
+                                        "longitude": "-122.0946",
+                                        "regionName": "California",
+                                        "timezone": "America/Los_Angeles"
+                                    }
+                                },
+                                {
+                                    "referer": null,
+                                    "date": "2015-08-20T05:05:03+04:00",
+                                    "userAgent": "some_web_crawler/1.4",
+                                    "visitLocation": null
+                                }
+                            ]
+                        }
+                    }
+                }
+            },
+            "404": {
+                "description": "The short code does not belong to any short URL.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

docs/swagger/paths/v1_tags.json

@@ -1,28 +1,36 @@
 {
     "get": {
+        "operationId": "listTags",
         "tags": [
             "Tags"
         ],
         "summary": "List existing tags",
         "description": "Returns the list of all tags used in any short URL, ordered by name",
-        "parameters": [
+        "security": [
             {
-                "$ref": "../parameters/Authorization.json"
+                "ApiKey": []
+            },
+            {
+                "Bearer": []
             }
         ],
         "responses": {
             "200": {
                 "description": "The list of tags",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "tags": {
+                "content": {
+                    "application/json": {
+                        "schema": {
                             "type": "object",
                             "properties": {
-                                "data": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "string"
+                                "tags": {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "string"
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -44,44 +52,72 @@
             },
             "500": {
                 "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                 }
             }
         }
     },
 
     "post": {
+        "operationId": "createTags",
         "tags": [
             "Tags"
         ],
         "summary": "Create tags",
         "description": "Provided a list of tags, creates all that do not yet exist",
-        "parameters": [
+        "security": [
             {
-                "$ref": "../parameters/Authorization.json"
+                "ApiKey": []
             },
             {
-                "name": "tags[]",
-                "in": "formData",
-                "description": "The list of tag names to create",
-                "required": true,
-                "type": "array"
+                "Bearer": []
             }
         ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "tags"
+                        ],
+                        "properties": {
+                            "tags": {
+                                "description": "The list of tag names to create",
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "responses": {
             "200": {
                 "description": "The list of tags",
-                "schema": {
-                    "type": "object",
-                    "properties": {
-                        "tags": {
+                "content": {
+                    "application/json": {
+                        "schema": {
                             "type": "object",
                             "properties": {
-                                "data": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "string"
+                                "tags": {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "string"
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -103,79 +139,121 @@
             },
             "500": {
                 "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                 }
             }
         }
     },
 
     "put": {
+        "operationId": "renameTag",
         "tags": [
             "Tags"
         ],
         "summary": "Rename tag",
         "description": "Renames one existing tag",
-        "parameters": [
+        "security": [
             {
-                "$ref": "../parameters/Authorization.json"
+                "ApiKey": []
             },
             {
-                "name": "oldName",
-                "in": "formData",
-                "description": "Current name of the tag",
-                "required": true,
-                "type": "string"
-            },
-            {
-                "name": "newName",
-                "in": "formData",
-                "description": "New name of the tag",
-                "required": true,
-                "type": "string"
+                "Bearer": []
             }
         ],
+        "requestBody": {
+            "description": "Request body.",
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "type": "object",
+                        "required": [
+                            "oldName",
+                            "newName"
+                        ],
+                        "properties": {
+                            "oldName": {
+                                "description": "Current name of the tag",
+                                "type": "string"
+                            },
+                            "newName": {
+                                "description": "New name of the tag",
+                                "type": "string"
+                            }
+                        }
+                    }
+                }
+            }
+        },
         "responses": {
             "204": {
                 "description": "The tag has been properly renamed"
             },
             "400": {
                 "description": "You have not provided either the oldName or the newName params.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                 }
             },
             "404": {
                 "description": "There's no tag found with the name provided in oldName param.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                 }
             },
             "500": {
                 "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                 }
             }
         }
     },
 
     "delete": {
+        "operationId": "deleteTags",
         "tags": [
             "Tags"
         ],
         "summary": "Delete tags",
         "description": "Deletes provided list of tags",
         "parameters": [
-            {
-                "$ref": "../parameters/Authorization.json"
-            },
             {
                 "name": "tags[]",
                 "in": "query",
                 "description": "The names of the tags to delete",
                 "required": true,
-                "type": "array"
+                "schema": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
+        ],
+        "security": [
+            {
+                "ApiKey": []
+            },
+            {
+                "Bearer": []
             }
         ],
         "responses": {
@@ -184,8 +262,12 @@
             },
             "500": {
                 "description": "Unexpected error.",
-                "schema": {
-                    "$ref": "../definitions/Error.json"
+                "content": {
+                    "application/json": {
+                        "schema": {
+                            "$ref": "../definitions/Error.json"
+                        }
+                    }
                 }
             }
         }

docs/swagger/swagger.json

@@ -1,44 +1,86 @@
 {
-    "swagger": "2.0",
+    "openapi": "3.0.0",
     "info": {
         "title": "Shlink",
         "description": "Shlink, the self-hosted URL shortener",
         "version": "1.0"
     },
-    "schemes": [
-        "http",
-        "https"
+
+    "servers": [
+        {
+            "url": "{schema}://{server}/rest",
+            "variables": {
+                "schema": {
+                    "default": "https",
+                    "enum": ["https", "http"]
+                },
+                "server": {
+                    "default": ""
+                }
+            }
+        }
     ],
-    "basePath": "/rest",
-    "produces": [
-        "application/json"
-    ],
-    "consumes": [
-        "application/x-www-form-urlencoded",
-        "application/json"
+
+    "components": {
+        "securitySchemes": {
+            "ApiKey": {
+                "description": "A valid shlink API key",
+                "type": "apiKey",
+                "in": "header",
+                "name": "X-Api-Key"
+            },
+            "Bearer": {
+                "description": "**[Deprecated]** The JWT identifying a previously authenticated API key",
+                "type": "http",
+                "scheme": "bearer",
+                "bearerFormat": "JWT"
+            }
+        }
+    },
+
+    "tags": [
+        {
+            "name": "Short URLs",
+            "description": "Operations that can be performed on short URLs"
+        },
+        {
+            "name": "Tags",
+            "description": "Let you handle the list of available tags"
+        },
+        {
+            "name": "Visits",
+            "description": "Operations to manage visits on short URLs"
+        },
+        {
+            "name": "Authentication",
+            "description": "Authentication-related endpoints"
+        }
     ],
 
     "paths": {
-        "/v1/authenticate": {
-            "$ref": "paths/v1_authenticate.json"
+        "/v1/short-urls": {
+            "$ref": "paths/v1_short-urls.json"
         },
-
-        "/v1/short-codes": {
-            "$ref": "paths/v1_short-codes.json"
+        "/v1/short-urls/shorten": {
+            "$ref": "paths/v1_short-urls_shorten.json"
         },
-        "/v1/short-codes/{shortCode}": {
-            "$ref": "paths/v1_short-codes_{shortCode}.json"
+        "/v1/short-urls/{shortCode}": {
+            "$ref": "paths/v1_short-urls_{shortCode}.json"
         },
-        "/v1/short-codes/{shortCode}/tags": {
-            "$ref": "paths/v1_short-codes_{shortCode}_tags.json"
+        "/v1/short-urls/{shortCode}/tags": {
+            "$ref": "paths/v1_short-urls_{shortCode}_tags.json"
         },
 
         "/v1/tags": {
             "$ref": "paths/v1_tags.json"
         },
 
-        "/v1/short-codes/{shortCode}/visits": {
-            "$ref": "paths/v1_short-codes_{shortCode}_visits.json"
+        "/v1/short-urls/{shortCode}/visits": {
+            "$ref": "paths/v1_short-urls_{shortCode}_visits.json"
+        },
+
+        "/v1/authenticate": {
+            "$ref": "paths/v1_authenticate.json"
         }
     }
 }

infection.json

@@ -0,0 +1,22 @@
+{
+    "source": {
+        "directories": [
+            "module/*/src"
+        ],
+        "excludes": []
+    },
+    "timeout": 10,
+    "logs": {
+        "text": "build/infection/infection-log.txt",
+        "summary": "build/infection/summary-log.txt",
+        "debug": "build/infection/debug-log.txt"
+    },
+    "tmpDir": "build/infection/temp",
+    "phpUnit": {
+        "configDir": "."
+    },
+    "mutators": {
+        "@default": true,
+        "IdenticalEqual": false
+    }
+}

module/CLI/config/cli.config.php

@@ -1,29 +1,35 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\CLI\Command;
-use Shlinkio\Shlink\Common;
+namespace Shlinkio\Shlink\CLI;
+
+use function Shlinkio\Shlink\Common\env;
 
 return [
 
     'cli' => [
-        'locale' => Common\env('CLI_LOCALE', 'en'),
+        'locale' => env('CLI_LOCALE', 'en'),
         'commands' => [
-            Command\Shortcode\GenerateShortcodeCommand::class,
-            Command\Shortcode\ResolveUrlCommand::class,
-            Command\Shortcode\ListShortcodesCommand::class,
-            Command\Shortcode\GetVisitsCommand::class,
-            Command\Shortcode\GeneratePreviewCommand::class,
-            Command\Visit\ProcessVisitsCommand::class,
-            Command\Config\GenerateCharsetCommand::class,
-            Command\Config\GenerateSecretCommand::class,
-            Command\Api\GenerateKeyCommand::class,
-            Command\Api\DisableKeyCommand::class,
-            Command\Api\ListKeysCommand::class,
-            Command\Tag\ListTagsCommand::class,
-            Command\Tag\CreateTagCommand::class,
-            Command\Tag\RenameTagCommand::class,
-            Command\Tag\DeleteTagsCommand::class,
+            Command\ShortUrl\GenerateShortUrlCommand::NAME => Command\ShortUrl\GenerateShortUrlCommand::class,
+            Command\ShortUrl\ResolveUrlCommand::NAME => Command\ShortUrl\ResolveUrlCommand::class,
+            Command\ShortUrl\ListShortUrlsCommand::NAME => Command\ShortUrl\ListShortUrlsCommand::class,
+            Command\ShortUrl\GetVisitsCommand::NAME => Command\ShortUrl\GetVisitsCommand::class,
+            Command\ShortUrl\GeneratePreviewCommand::NAME => Command\ShortUrl\GeneratePreviewCommand::class,
+            Command\ShortUrl\DeleteShortUrlCommand::NAME => Command\ShortUrl\DeleteShortUrlCommand::class,
+
+            Command\Visit\ProcessVisitsCommand::NAME => Command\Visit\ProcessVisitsCommand::class,
+
+            Command\Config\GenerateCharsetCommand::NAME => Command\Config\GenerateCharsetCommand::class,
+            Command\Config\GenerateSecretCommand::NAME => Command\Config\GenerateSecretCommand::class,
+
+            Command\Api\GenerateKeyCommand::NAME => Command\Api\GenerateKeyCommand::class,
+            Command\Api\DisableKeyCommand::NAME => Command\Api\DisableKeyCommand::class,
+            Command\Api\ListKeysCommand::NAME => Command\Api\ListKeysCommand::class,
+
+            Command\Tag\ListTagsCommand::NAME => Command\Tag\ListTagsCommand::class,
+            Command\Tag\CreateTagCommand::NAME => Command\Tag\CreateTagCommand::class,
+            Command\Tag\RenameTagCommand::NAME => Command\Tag\RenameTagCommand::class,
+            Command\Tag\DeleteTagsCommand::NAME => Command\Tag\DeleteTagsCommand::class,
         ],
     ],
 

module/CLI/config/dependencies.config.php

@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\CLI\Command;
-use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
-use Shlinkio\Shlink\Common\Service\IpLocationResolver;
+namespace Shlinkio\Shlink\CLI;
+
+use Shlinkio\Shlink\Common\Service\IpApiLocationResolver;
 use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Service;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
@@ -15,19 +15,24 @@ return [
 
     'dependencies' => [
         'factories' => [
-            Application::class => ApplicationFactory::class,
+            Application::class => Factory\ApplicationFactory::class,
+
+            Command\ShortUrl\GenerateShortUrlCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\ResolveUrlCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\ListShortUrlsCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\GetVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\GeneratePreviewCommand::class => ConfigAbstractFactory::class,
+            Command\ShortUrl\DeleteShortUrlCommand::class => ConfigAbstractFactory::class,
 
-            Command\Shortcode\GenerateShortcodeCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\ResolveUrlCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\ListShortcodesCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\GetVisitsCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\GeneratePreviewCommand::class => ConfigAbstractFactory::class,
             Command\Visit\ProcessVisitsCommand::class => ConfigAbstractFactory::class,
+
             Command\Config\GenerateCharsetCommand::class => ConfigAbstractFactory::class,
             Command\Config\GenerateSecretCommand::class => ConfigAbstractFactory::class,
+
             Command\Api\GenerateKeyCommand::class => ConfigAbstractFactory::class,
             Command\Api\DisableKeyCommand::class => ConfigAbstractFactory::class,
             Command\Api\ListKeysCommand::class => ConfigAbstractFactory::class,
+
             Command\Tag\ListTagsCommand::class => ConfigAbstractFactory::class,
             Command\Tag\CreateTagCommand::class => ConfigAbstractFactory::class,
             Command\Tag\RenameTagCommand::class => ConfigAbstractFactory::class,
@@ -36,29 +41,41 @@ return [
     ],
 
     ConfigAbstractFactory::class => [
-        Command\Shortcode\GenerateShortcodeCommand::class => [
+        Command\ShortUrl\GenerateShortUrlCommand::class => [
             Service\UrlShortener::class,
             'translator',
             'config.url_shortener.domain',
         ],
-        Command\Shortcode\ResolveUrlCommand::class => [Service\UrlShortener::class, 'translator'],
-        Command\Shortcode\ListShortcodesCommand::class => [Service\ShortUrlService::class, 'translator'],
-        Command\Shortcode\GetVisitsCommand::class => [Service\VisitsTracker::class, 'translator'],
-        Command\Shortcode\GeneratePreviewCommand::class => [
+        Command\ShortUrl\ResolveUrlCommand::class => [Service\UrlShortener::class, 'translator'],
+        Command\ShortUrl\ListShortUrlsCommand::class => [
+            Service\ShortUrlService::class,
+            'translator',
+            'config.url_shortener.domain',
+        ],
+        Command\ShortUrl\GetVisitsCommand::class => [Service\VisitsTracker::class, 'translator'],
+        Command\ShortUrl\GeneratePreviewCommand::class => [
             Service\ShortUrlService::class,
             PreviewGenerator::class,
             'translator',
         ],
-        Command\Visit\ProcessVisitsCommand::class => [
-            Service\VisitService::class,
-            IpLocationResolver::class,
+        Command\ShortUrl\DeleteShortUrlCommand::class => [
+            Service\ShortUrl\DeleteShortUrlService::class,
             'translator',
         ],
+
+        Command\Visit\ProcessVisitsCommand::class => [
+            Service\VisitService::class,
+            IpApiLocationResolver::class,
+            'translator',
+        ],
+
         Command\Config\GenerateCharsetCommand::class => ['translator'],
         Command\Config\GenerateSecretCommand::class => ['translator'],
+
         Command\Api\GenerateKeyCommand::class => [ApiKeyService::class, 'translator'],
         Command\Api\DisableKeyCommand::class => [ApiKeyService::class, 'translator'],
         Command\Api\ListKeysCommand::class => [ApiKeyService::class, 'translator'],
+
         Command\Tag\ListTagsCommand::class => [Service\Tag\TagService::class, Translator::class],
         Command\Tag\CreateTagCommand::class => [Service\Tag\TagService::class, Translator::class],
         Command\Tag\RenameTagCommand::class => [Service\Tag\TagService::class, Translator::class],

module/CLI/lang/es.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Shlink 1.0\n"
-"POT-Creation-Date: 2017-10-21 20:17+0200\n"
-"PO-Revision-Date: 2017-10-21 20:19+0200\n"
+"POT-Creation-Date: 2018-09-16 18:36+0200\n"
+"PO-Revision-Date: 2018-09-16 18:37+0200\n"
 "Last-Translator: Alejandro Celaya <alejandro@alejandrocelaya.com>\n"
 "Language-Team: \n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -24,8 +24,8 @@ msgid "The API key to disable"
 msgstr "La clave de API a deshabilitar"
 
 #, php-format
-msgid "API key %s properly disabled"
-msgstr "Clave de API %s deshabilitada correctamente"
+msgid "API key \"%s\" properly disabled"
+msgstr "Clave de API \"%s\" deshabilitada correctamente"
 
 #, php-format
 msgid "API key \"%s\" does not exist."
@@ -39,8 +39,9 @@ msgstr ""
 "La fecha en la que la clave de API debe expirar. Utiliza cualquier valor "
 "válido en PHP."
 
-msgid "Generated API key"
-msgstr "Generada clave de API"
+#, php-format
+msgid "Generated API key: \"%s\""
+msgstr "Generada clave de API. \"%s\""
 
 msgid "Lists all the available API keys."
 msgstr "Lista todas las claves de API disponibles."
@@ -51,12 +52,12 @@ msgstr "Define si sólo las claves de API habilitadas deben ser devueltas."
 msgid "Key"
 msgstr "Clave"
 
-msgid "Expiration date"
-msgstr "Fecha de caducidad"
-
 msgid "Is enabled"
 msgstr "Está habilitada"
 
+msgid "Expiration date"
+msgstr "Fecha de caducidad"
+
 #, php-format
 msgid ""
 "Generates a character set sample just by shuffling the default one, \"%s\". "
@@ -65,8 +66,9 @@ msgstr ""
 "Genera un grupo de caracteres simplemente mexclando el grupo por defecto \"%s"
 "\". Después puede ser utilizado en la variable de entrono SHORTCODE_CHARS"
 
-msgid "Character set:"
-msgstr "Grupo de caracteres:"
+#, php-format
+msgid "Character set: \"%s\""
+msgstr "Grupo de caracteres: \"%s\""
 
 msgid ""
 "Generates a random secret string that can be used for JWT token encryption"
@@ -74,8 +76,44 @@ msgstr ""
 "Genera una cadena de caracteres aleatoria que puede ser usada para cifrar "
 "tokens JWT"
 
-msgid "Secret key:"
-msgstr "Clave secreta:"
+#, php-format
+msgid "Secret key: \"%s\""
+msgstr "Clave secreta: \"%s\""
+
+msgid "Deletes a short URL"
+msgstr "Elimina una URL"
+
+msgid "The short code for the short URL to be deleted"
+msgstr "El código corto de la URL corta a eliminar"
+
+msgid ""
+"Ignores the safety visits threshold check, which could make short URLs with "
+"many visits to be accidentally deleted"
+msgstr ""
+"Ignora el límite de seguridad de visitas, pudiendo resultar en el borrado "
+"accidental de URLs con muchas visitas"
+
+#, php-format
+msgid "Provided short code \"%s\" could not be found."
+msgstr "El código corto proporcionado \"%s\" no ha podido ser encontrado."
+
+#, php-format
+msgid ""
+"It was not possible to delete the short URL with short code \"%s\" because "
+"it has more than %s visits."
+msgstr ""
+"No se pudo eliminar la URL acortada con código corto \"%s\" porque tiene más "
+"de %s visitas."
+
+msgid "Do you want to delete it anyway?"
+msgstr "¿Aún así quieres eliminarla?"
+
+msgid "Short URL was not deleted."
+msgstr "La URL corta no ha sido eliminada."
+
+#, php-format
+msgid "Short URL with short code \"%s\" successfully deleted."
+msgstr "La URL acortada con el código corto \"%s\" eliminada correctamente."
 
 msgid ""
 "Processes and generates the previews for every URL, improving performance "
@@ -97,9 +135,8 @@ msgstr " <info>¡Correcto!</info>"
 msgid "Error"
 msgstr "Error"
 
-msgid "Generates a short code for provided URL and returns the short URL"
-msgstr ""
-"Genera un código corto para la URL proporcionada y devuelve la URL acortada"
+msgid "Generates a short URL for provided long URL and returns it"
+msgstr "Genera una URL corta para la URL larga proporcionada y la devuelve"
 
 msgid "The long URL to parse"
 msgstr "La URL larga a procesar"
@@ -125,17 +162,22 @@ msgid "If provided, this slug will be used instead of generating a short code"
 msgstr ""
 "Si se proporciona, este slug será usado en vez de generar un código corto"
 
-msgid "A long URL was not provided. Which URL do you want to shorten?:"
+msgid "This will limit the number of visits for this short URL."
+msgstr "Esto limitará el número de visitas a esta URL acortada."
+
+#, fuzzy
+#| msgid "A long URL was not provided. Which URL do you want to shorten?:"
+msgid "A long URL was not provided. Which URL do you want to be shortened?"
 msgstr "No se ha proporcionado una URL larga. ¿Qué URL deseas acortar?"
 
 msgid "A URL was not provided!"
 msgstr "¡No se ha proporcionado una URL!"
 
-msgid "Processed URL:"
-msgstr "URL procesada:"
+msgid "Processed long URL:"
+msgstr "URL larga procesada:"
 
-msgid "Generated URL:"
-msgstr "URL generada:"
+msgid "Generated short URL:"
+msgstr "URL corta generada:"
 
 #, php-format
 msgid "Provided URL \"%s\" is invalid. Try with a different one."
@@ -166,8 +208,8 @@ msgid "Allows to filter visits, returning only those newer than end date"
 msgstr ""
 "Permite filtrar las visitas, devolviendo sólo aquellas más nuevas que endDate"
 
-msgid "A short code was not provided. Which short code do you want to use?:"
-msgstr "No se prporcionó un código corto. ¿Qué código corto deseas usar?:"
+msgid "A short code was not provided. Which short code do you want to use?"
+msgstr "No se proporcionó un código corto. ¿Qué código corto deseas usar?"
 
 msgid "Referer"
 msgstr "Origen"
@@ -175,12 +217,12 @@ msgstr "Origen"
 msgid "Date"
 msgstr "Fecha"
 
-msgid "Remote Address"
-msgstr "Dirección remota"
-
 msgid "User agent"
 msgstr "Agente de usuario"
 
+msgid "Country"
+msgstr "País"
+
 msgid "List all short URLs"
 msgstr "Listar todas las URLs cortas"
 
@@ -210,8 +252,11 @@ msgstr "Si se desea mostrar las etiquetas o no"
 msgid "Short code"
 msgstr "Código corto"
 
-msgid "Original URL"
-msgstr "URL original"
+msgid "Short URL"
+msgstr "URL corta"
+
+msgid "Long URL"
+msgstr "URL larga"
 
 msgid "Date created"
 msgstr "Fecha de creación"
@@ -222,8 +267,8 @@ msgstr "Número de visitas"
 msgid "Tags"
 msgstr "Etiquetas"
 
-msgid "You have reached last page"
-msgstr "Has alcanzado la última página"
+msgid "Short URLs properly listed"
+msgstr "URLs cortas listadas correctamente"
 
 msgid "Continue with page"
 msgstr "Continuar con la página"
@@ -234,13 +279,9 @@ msgstr "Devuelve la URL larga detrás de un código corto"
 msgid "The short code to parse"
 msgstr "El código corto a convertir"
 
-msgid "A short code was not provided. Which short code do you want to parse?:"
+msgid "A short code was not provided. Which short code do you want to parse?"
 msgstr ""
-"No se proporcionó un código corto. ¿Qué código corto quieres convertir?:"
-
-#, php-format
-msgid "No URL found for short code \"%s\""
-msgstr "No se ha encontrado ninguna URL para el código corto \"%s\""
+"No se proporcionó un código corto. ¿Qué código corto quieres convertir?"
 
 msgid "Long URL:"
 msgstr "URL larga:"
@@ -249,10 +290,6 @@ msgstr "URL larga:"
 msgid "Provided short code \"%s\" has an invalid format."
 msgstr "El código corto proporcionado \"%s\" tiene un formato inválido."
 
-#, php-format
-msgid "Provided short code \"%s\" could not be found."
-msgstr "El código corto proporcionado \"%s\" no ha podido ser encontrado."
-
 msgid "Creates one or more tags."
 msgstr "Crea una o más etiquetas."
 
@@ -262,8 +299,8 @@ msgstr "El nombre de las etiquetas a crear"
 msgid "You have to provide at least one tag name"
 msgstr "Debes proporcionar al menos un nombre de etiqueta"
 
-msgid "Created tags"
-msgstr "Etiquetas creadas"
+msgid "Tags properly created"
+msgstr "Etiquetas correctamente creadas"
 
 msgid "Deletes one or more tags."
 msgstr "Elimina una o más etiquetas."
@@ -271,8 +308,8 @@ msgstr "Elimina una o más etiquetas."
 msgid "The name of the tags to delete"
 msgstr "El nombre de las etiquetas a eliminar"
 
-msgid "Deleted tags"
-msgstr "Etiquetas eliminadas"
+msgid "Tags properly deleted"
+msgstr "Etiquetas correctamente eliminadas"
 
 msgid "Lists existing tags."
 msgstr "Lista las etiquetas existentes."
@@ -313,5 +350,30 @@ msgstr "Ignorada IP de localhost"
 msgid "Address located at \"%s\""
 msgstr "Dirección localizada en \"%s\""
 
+msgid "An error occurred while locating IP"
+msgstr "Se produjo un error al localizar la IP"
+
+#, php-format
+msgid "IP location resolver limit reached. Waiting %s seconds..."
+msgstr "Limite del localizador de IPs alcanzado. Esperando %s segundos..."
+
 msgid "Finished processing all IPs"
 msgstr "Finalizado el procesado de todas las IPs"
+
+#~ msgid "Remote Address"
+#~ msgstr "Dirección remota"
+
+#~ msgid "Original URL"
+#~ msgstr "URL original"
+
+#~ msgid "You have reached last page"
+#~ msgstr "Has alcanzado la última página"
+
+#~ msgid "No URL found for short code \"%s\""
+#~ msgstr "No se ha encontrado ninguna URL para el código corto \"%s\""
+
+#~ msgid "Created tags"
+#~ msgstr "Etiquetas creadas"
+
+#~ msgid "Deleted tags"
+#~ msgstr "Etiquetas eliminadas"

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

@@ -8,10 +8,14 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
+use function sprintf;
 
 class DisableKeyCommand extends Command
 {
+    public const NAME = 'api-key:disable';
+
     /**
      * @var ApiKeyServiceInterface
      */
@@ -28,28 +32,23 @@ class DisableKeyCommand extends Command
         parent::__construct();
     }
 
-    public function configure()
+    protected function configure(): void
     {
-        $this->setName('api-key:disable')
+        $this->setName(self::NAME)
              ->setDescription($this->translator->translate('Disables an API key.'))
              ->addArgument('apiKey', InputArgument::REQUIRED, $this->translator->translate('The API key to disable'));
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $apiKey = $input->getArgument('apiKey');
+        $io = new SymfonyStyle($input, $output);
 
         try {
             $this->apiKeyService->disable($apiKey);
-            $output->writeln(sprintf(
-                $this->translator->translate('API key %s properly disabled'),
-                '<info>' . $apiKey . '</info>'
-            ));
+            $io->success(sprintf($this->translator->translate('API key "%s" properly disabled'), $apiKey));
         } catch (\InvalidArgumentException $e) {
-            $output->writeln(sprintf(
-                '<error>' . $this->translator->translate('API key "%s" does not exist.') . '</error>',
-                $apiKey
-            ));
+            $io->error(sprintf($this->translator->translate('API key "%s" does not exist.'), $apiKey));
         }
     }
 }

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

@@ -3,15 +3,20 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
+use Cake\Chronos\Chronos;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
+use function sprintf;
 
 class GenerateKeyCommand extends Command
 {
+    public const NAME = 'api-key:generate';
+
     /**
      * @var ApiKeyServiceInterface
      */
@@ -28,9 +33,9 @@ class GenerateKeyCommand extends Command
         parent::__construct();
     }
 
-    public function configure()
+    protected function configure(): void
     {
-        $this->setName('api-key:generate')
+        $this->setName(self::NAME)
              ->setDescription($this->translator->translate('Generates a new valid API key.'))
              ->addOption(
                  'expirationDate',
@@ -40,10 +45,13 @@ class GenerateKeyCommand extends Command
              );
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $expirationDate = $input->getOption('expirationDate');
-        $apiKey = $this->apiKeyService->create(isset($expirationDate) ? new \DateTime($expirationDate) : null);
-        $output->writeln($this->translator->translate('Generated API key') . sprintf(': <info>%s</info>', $apiKey));
+        $apiKey = $this->apiKeyService->create(isset($expirationDate) ? Chronos::parse($expirationDate) : null);
+
+        (new SymfonyStyle($input, $output))->success(
+            sprintf($this->translator->translate('Generated API key: "%s"'), $apiKey)
+        );
     }
 }

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

@@ -6,14 +6,22 @@ namespace Shlinkio\Shlink\CLI\Command\Api;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
 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\I18n\Translator\TranslatorInterface;
+use function array_filter;
+use function sprintf;
 
 class ListKeysCommand extends Command
 {
+    private const ERROR_STRING_PATTERN = '<fg=red>%s</>';
+    private const SUCCESS_STRING_PATTERN = '<info>%s</info>';
+    private const WARNING_STRING_PATTERN = '<comment>%s</comment>';
+
+    public const NAME = 'api-key:list';
+
     /**
      * @var ApiKeyServiceInterface
      */
@@ -30,9 +38,9 @@ class ListKeysCommand extends Command
         parent::__construct();
     }
 
-    public function configure()
+    protected function configure(): void
     {
-        $this->setName('api-key:list')
+        $this->setName(self::NAME)
              ->setDescription($this->translator->translate('Lists all the available API keys.'))
              ->addOption(
                  'enabledOnly',
@@ -42,80 +50,50 @@ class ListKeysCommand extends Command
              );
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
+        $io = new SymfonyStyle($input, $output);
         $enabledOnly = $input->getOption('enabledOnly');
         $list = $this->apiKeyService->listKeys($enabledOnly);
-
-        $table = new Table($output);
-        if ($enabledOnly) {
-            $table->setHeaders([
-                $this->translator->translate('Key'),
-                $this->translator->translate('Expiration date'),
-            ]);
-        } else {
-            $table->setHeaders([
-                $this->translator->translate('Key'),
-                $this->translator->translate('Is enabled'),
-                $this->translator->translate('Expiration date'),
-            ]);
-        }
+        $rows = [];
 
         /** @var ApiKey $row */
         foreach ($list as $row) {
             $key = $row->getKey();
             $expiration = $row->getExpirationDate();
-            $rowData = [];
-            $formatMethod = ! $row->isEnabled()
-                ? 'getErrorString'
-                : ($row->isExpired() ? 'getWarningString' : 'getSuccessString');
+            $messagePattern = $this->determineMessagePattern($row);
 
-            if ($enabledOnly) {
-                $rowData[] = $this->{$formatMethod}($key);
-            } else {
-                $rowData[] = $this->{$formatMethod}($key);
-                $rowData[] = $this->{$formatMethod}($this->getEnabledSymbol($row));
+            // Set columns for this row
+            $rowData = [sprintf($messagePattern, $key)];
+            if (! $enabledOnly) {
+                $rowData[] = sprintf($messagePattern, $this->getEnabledSymbol($row));
             }
+            $rowData[] = $expiration !== null ? $expiration->toAtomString() : '-';
 
-            $rowData[] = isset($expiration) ? $expiration->format(\DateTime::ATOM) : '-';
-            $table->addRow($rowData);
+            $rows[] = $rowData;
         }
 
-        $table->render();
+        $io->table(array_filter([
+            $this->translator->translate('Key'),
+            ! $enabledOnly ? $this->translator->translate('Is enabled') : null,
+            $this->translator->translate('Expiration date'),
+        ]), $rows);
     }
 
-    /**
-     * @param string $string
-     * @return string
-     */
-    protected function getErrorString($string)
+    private function determineMessagePattern(ApiKey $apiKey): string
     {
-        return sprintf('<fg=red>%s</>', $string);
-    }
+        if (! $apiKey->isEnabled()) {
+            return self::ERROR_STRING_PATTERN;
+        }
 
-    /**
-     * @param string $string
-     * @return string
-     */
-    protected function getSuccessString($string)
-    {
-        return sprintf('<info>%s</info>', $string);
-    }
-
-    /**
-     * @param $string
-     * @return string
-     */
-    protected function getWarningString($string)
-    {
-        return sprintf('<comment>%s</comment>', $string);
+        return $apiKey->isExpired() ? self::WARNING_STRING_PATTERN : self::SUCCESS_STRING_PATTERN;
     }
 
     /**
      * @param ApiKey $apiKey
      * @return string
      */
-    protected function getEnabledSymbol(ApiKey $apiKey)
+    private function getEnabledSymbol(ApiKey $apiKey): string
     {
         return ! $apiKey->isEnabled() || $apiKey->isExpired() ? '---' : '+++';
     }

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

@@ -7,10 +7,15 @@ use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
+use function sprintf;
+use function str_shuffle;
 
 class GenerateCharsetCommand extends Command
 {
+    public const NAME = 'config:generate-charset';
+
     /**
      * @var TranslatorInterface
      */
@@ -22,18 +27,20 @@ class GenerateCharsetCommand extends Command
         parent::__construct();
     }
 
-    public function configure()
+    protected function configure(): void
     {
-        $this->setName('config:generate-charset')
+        $this->setName(self::NAME)
              ->setDescription(sprintf($this->translator->translate(
                  'Generates a character set sample just by shuffling the default one, "%s". '
                  . 'Then it can be set in the SHORTCODE_CHARS environment variable'
              ), UrlShortener::DEFAULT_CHARS));
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $charSet = str_shuffle(UrlShortener::DEFAULT_CHARS);
-        $output->writeln($this->translator->translate('Character set:') . sprintf(' <info>%s</info>', $charSet));
+        (new SymfonyStyle($input, $output))->success(
+            sprintf($this->translator->translate('Character set: "%s"'), $charSet)
+        );
     }
 }

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

@@ -7,12 +7,16 @@ use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
+use function sprintf;
 
 class GenerateSecretCommand extends Command
 {
     use StringUtilsTrait;
 
+    public const NAME = 'config:generate-secret';
+
     /**
      * @var TranslatorInterface
      */
@@ -24,17 +28,19 @@ class GenerateSecretCommand extends Command
         parent::__construct();
     }
 
-    public function configure()
+    protected function configure(): void
     {
-        $this->setName('config:generate-secret')
+        $this->setName(self::NAME)
              ->setDescription($this->translator->translate(
                  'Generates a random secret string that can be used for JWT token encryption'
              ));
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $secret = $this->generateRandomString(32);
-        $output->writeln($this->translator->translate('Secret key:') . sprintf(' <info>%s</info>', $secret));
+        (new SymfonyStyle($input, $output))->success(
+            sprintf($this->translator->translate('Secret key: "%s"'), $secret)
+        );
     }
 }

module/CLI/src/Command/Install/InstallCommand.php

@@ -1,249 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Command\Install;
-
-use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManagerInterface;
-use Shlinkio\Shlink\CLI\Install\Plugin;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Exception\LogicException;
-use Symfony\Component\Console\Exception\RuntimeException;
-use Symfony\Component\Console\Helper\ProcessHelper;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Filesystem;
-use Zend\Config\Writer\WriterInterface;
-
-class InstallCommand extends Command
-{
-    const GENERATED_CONFIG_PATH = 'config/params/generated_config.php';
-
-    /**
-     * @var InputInterface
-     */
-    private $input;
-    /**
-     * @var OutputInterface
-     */
-    private $output;
-    /**
-     * @var QuestionHelper
-     */
-    private $questionHelper;
-    /**
-     * @var ProcessHelper
-     */
-    private $processHelper;
-    /**
-     * @var WriterInterface
-     */
-    private $configWriter;
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-    /**
-     * @var ConfigCustomizerPluginManagerInterface
-     */
-    private $configCustomizers;
-    /**
-     * @var bool
-     */
-    private $isUpdate;
-
-    /**
-     * InstallCommand constructor.
-     * @param WriterInterface $configWriter
-     * @param Filesystem $filesystem
-     * @param bool $isUpdate
-     * @throws LogicException
-     */
-    public function __construct(
-        WriterInterface $configWriter,
-        Filesystem $filesystem,
-        ConfigCustomizerPluginManagerInterface $configCustomizers,
-        $isUpdate = false
-    ) {
-        parent::__construct();
-        $this->configWriter = $configWriter;
-        $this->isUpdate = $isUpdate;
-        $this->filesystem = $filesystem;
-        $this->configCustomizers = $configCustomizers;
-    }
-
-    public function configure()
-    {
-        $this
-            ->setName('shlink:install')
-            ->setDescription('Installs or updates Shlink');
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        $this->input = $input;
-        $this->output = $output;
-        $this->questionHelper = $this->getHelper('question');
-        $this->processHelper = $this->getHelper('process');
-
-        $output->writeln([
-            '<info>Welcome to Shlink!!</info>',
-            'This will guide you through the installation process.',
-        ]);
-
-        // Check if a cached config file exists and drop it if so
-        if ($this->filesystem->exists('data/cache/app_config.php')) {
-            $output->write('Deleting old cached config...');
-            try {
-                $this->filesystem->remove('data/cache/app_config.php');
-                $output->writeln(' <info>Success</info>');
-            } catch (IOException $e) {
-                $output->writeln(
-                    ' <error>Failed!</error> You will have to manually delete the data/cache/app_config.php file to get'
-                    . ' new config applied.'
-                );
-                if ($output->isVerbose()) {
-                    $this->getApplication()->renderException($e, $output);
-                }
-                return;
-            }
-        }
-
-        // If running update command, ask the user to import previous config
-        $config = $this->isUpdate ? $this->importConfig() : new CustomizableAppConfig();
-
-        // Ask for custom config params
-        foreach ([
-            Plugin\DatabaseConfigCustomizerPlugin::class,
-            Plugin\UrlShortenerConfigCustomizerPlugin::class,
-            Plugin\LanguageConfigCustomizerPlugin::class,
-            Plugin\ApplicationConfigCustomizerPlugin::class,
-        ] as $pluginName) {
-            /** @var Plugin\ConfigCustomizerPluginInterface $configCustomizer */
-            $configCustomizer = $this->configCustomizers->get($pluginName);
-            $configCustomizer->process($input, $output, $config);
-        }
-
-        // Generate config params files
-        $this->configWriter->toFile(self::GENERATED_CONFIG_PATH, $config->getArrayCopy(), false);
-        $output->writeln(['<info>Custom configuration properly generated!</info>', '']);
-
-        // If current command is not update, generate database
-        if (!  $this->isUpdate) {
-            $this->output->writeln('Initializing database...');
-            if (! $this->runCommand(
-                'php vendor/bin/doctrine.php orm:schema-tool:create',
-                'Error generating database.'
-            )) {
-                return;
-            }
-        }
-
-        // Run database migrations
-        $output->writeln('Updating database...');
-        if (! $this->runCommand('php vendor/bin/doctrine-migrations migrations:migrate', 'Error updating database.')) {
-            return;
-        }
-
-        // Generate proxies
-        $output->writeln('Generating proxies...');
-        if (! $this->runCommand('php vendor/bin/doctrine.php orm:generate-proxies', 'Error generating proxies.')) {
-            return;
-        }
-    }
-
-    /**
-     * @return CustomizableAppConfig
-     * @throws RuntimeException
-     */
-    private function importConfig()
-    {
-        $config = new CustomizableAppConfig();
-
-        // Ask the user if he/she wants to import an older configuration
-        $importConfig = $this->questionHelper->ask($this->input, $this->output, new ConfirmationQuestion(
-            '<question>Do you want to import previous configuration? (Y/n):</question> '
-        ));
-        if (! $importConfig) {
-            return $config;
-        }
-
-        // Ask the user for the older shlink path
-        $keepAsking = true;
-        do {
-            $config->setImportedInstallationPath($this->ask(
-                'Previous shlink installation path from which to import config'
-            ));
-            $configFile = $config->getImportedInstallationPath() . '/' . self::GENERATED_CONFIG_PATH;
-            $configExists = $this->filesystem->exists($configFile);
-
-            if (! $configExists) {
-                $keepAsking = $this->questionHelper->ask($this->input, $this->output, new ConfirmationQuestion(
-                    'Provided path does not seem to be a valid shlink root path. '
-                    . '<question>Do you want to try another path? (Y/n):</question> '
-                ));
-            }
-        } while (! $configExists && $keepAsking);
-
-        // If after some retries the user has chosen not to test another path, return
-        if (! $configExists) {
-            return $config;
-        }
-
-        // Read the config file
-        $config->exchangeArray(include $configFile);
-        return $config;
-    }
-
-    /**
-     * @param string $text
-     * @param string|null $default
-     * @param bool $allowEmpty
-     * @return string
-     * @throws RuntimeException
-     */
-    private function ask($text, $default = null, $allowEmpty = false)
-    {
-        if ($default !== null) {
-            $text .= ' (defaults to ' . $default . ')';
-        }
-        do {
-            $value = $this->questionHelper->ask($this->input, $this->output, new Question(
-                '<question>' . $text . ':</question> ',
-                $default
-            ));
-            if (empty($value) && ! $allowEmpty) {
-                $this->output->writeln('<error>Value can\'t be empty</error>');
-            }
-        } while (empty($value) && $default === null && ! $allowEmpty);
-
-        return $value;
-    }
-
-    /**
-     * @param string $command
-     * @param string $errorMessage
-     * @return bool
-     */
-    private function runCommand($command, $errorMessage)
-    {
-        $process = $this->processHelper->run($this->output, $command);
-        if ($process->isSuccessful()) {
-            $this->output->writeln('    <info>Success!</info>');
-            return true;
-        }
-
-        if ($this->output->isVerbose()) {
-            return false;
-        }
-
-        $this->output->writeln(
-            '    <error>' . $errorMessage . '</error>  Run this command with -vvv to see specific error info.'
-        );
-        return false;
-    }
-}

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

@@ -0,0 +1,101 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
+
+use Shlinkio\Shlink\Core\Exception;
+use Shlinkio\Shlink\Core\Service\ShortUrl\DeleteShortUrlServiceInterface;
+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\I18n\Translator\TranslatorInterface;
+
+class DeleteShortUrlCommand extends Command
+{
+    public const NAME = 'short-url:delete';
+    private const ALIASES = ['short-code:delete'];
+
+    /**
+     * @var DeleteShortUrlServiceInterface
+     */
+    private $deleteShortUrlService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    public function __construct(DeleteShortUrlServiceInterface $deleteShortUrlService, TranslatorInterface $translator)
+    {
+        $this->deleteShortUrlService = $deleteShortUrlService;
+        $this->translator = $translator;
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setAliases(self::ALIASES)
+            ->setDescription(
+                $this->translator->translate('Deletes a short URL')
+            )
+            ->addArgument(
+                'shortCode',
+                InputArgument::REQUIRED,
+                $this->translator->translate('The short code for the short URL to be deleted')
+            )
+            ->addOption(
+                'ignore-threshold',
+                'i',
+                InputOption::VALUE_NONE,
+                $this->translator->translate(
+                    'Ignores the safety visits threshold check, which could make short URLs with many visits to be '
+                    . 'accidentally deleted'
+                )
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): void
+    {
+        $io = new SymfonyStyle($input, $output);
+        $shortCode = $input->getArgument('shortCode');
+        $ignoreThreshold = $input->getOption('ignore-threshold');
+
+        try {
+            $this->runDelete($io, $shortCode, $ignoreThreshold);
+        } catch (Exception\InvalidShortCodeException $e) {
+            $io->error(
+                \sprintf($this->translator->translate('Provided short code "%s" could not be found.'), $shortCode)
+            );
+        } catch (Exception\DeleteShortUrlException $e) {
+            $this->retry($io, $shortCode, $e);
+        }
+    }
+
+    private function retry(SymfonyStyle $io, string $shortCode, Exception\DeleteShortUrlException $e): void
+    {
+        $warningMsg = \sprintf($this->translator->translate(
+            '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 . '</>');
+        $forceDelete = $io->confirm($this->translator->translate('Do you want to delete it anyway?'), false);
+
+        if ($forceDelete) {
+            $this->runDelete($io, $shortCode, true);
+        } else {
+            $io->warning($this->translator->translate('Short URL was not deleted.'));
+        }
+    }
+
+    private function runDelete(SymfonyStyle $io, string $shortCode, bool $ignoreThreshold): void
+    {
+        $this->deleteShortUrlService->deleteByShortCode($shortCode, $ignoreThreshold);
+        $io->success(\sprintf(
+            $this->translator->translate('Short URL with short code "%s" successfully deleted.'),
+            $shortCode
+        ));
+    }
+}

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

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
 use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
@@ -9,10 +9,14 @@ use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
 
 class GeneratePreviewCommand extends Command
 {
+    public const NAME = 'short-url:process-previews';
+    private const ALIASES = ['shortcode:process-previews', 'short-code:process-previews'];
+
     /**
      * @var PreviewGeneratorInterface
      */
@@ -37,17 +41,19 @@ class GeneratePreviewCommand extends Command
         parent::__construct(null);
     }
 
-    public function configure()
+    protected function configure(): void
     {
-        $this->setName('shortcode:process-previews')
-             ->setDescription(
-                 $this->translator->translate(
-                     'Processes and generates the previews for every URL, improving performance for later web requests.'
-                 )
-             );
+        $this
+            ->setName(self::NAME)
+            ->setAliases(self::ALIASES)
+            ->setDescription(
+                $this->translator->translate(
+                    'Processes and generates the previews for every URL, improving performance for later web requests.'
+                )
+            );
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $page = 1;
         do {
@@ -59,22 +65,20 @@ class GeneratePreviewCommand extends Command
             }
         } while ($page <= $shortUrls->count());
 
-        $output->writeln('<info>' . $this->translator->translate('Finished processing all URLs') . '</info>');
+        (new SymfonyStyle($input, $output))->success($this->translator->translate('Finished processing all URLs'));
     }
 
-    protected function processUrl($url, OutputInterface $output)
+    private function processUrl($url, OutputInterface $output): void
     {
         try {
-            $output->write(sprintf($this->translator->translate('Processing URL %s...'), $url));
+            $output->write(\sprintf($this->translator->translate('Processing URL %s...'), $url));
             $this->previewGenerator->generatePreview($url);
             $output->writeln($this->translator->translate(' <info>Success!</info>'));
         } catch (PreviewGenerationException $e) {
-            $messages = [' <error>' . $this->translator->translate('Error') . '</error>'];
+            $output->writeln(' <error>' . $this->translator->translate('Error') . '</error>');
             if ($output->isVerbose()) {
-                $messages[] = '<error>' . $e->__toString() . '</error>';
+                $this->getApplication()->renderException($e, $output);
             }
-
-            $output->writeln($messages);
         }
     }
 }

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

@@ -0,0 +1,152 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
+
+use Cake\Chronos\Chronos;
+use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
+use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
+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;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Zend\Diactoros\Uri;
+use Zend\I18n\Translator\TranslatorInterface;
+
+class GenerateShortUrlCommand extends Command
+{
+    use ShortUrlBuilderTrait;
+
+    public const NAME = 'short-url:generate';
+    private const ALIASES = ['shortcode:generate', 'short-code:generate'];
+
+    /**
+     * @var UrlShortenerInterface
+     */
+    private $urlShortener;
+    /**
+     * @var array
+     */
+    private $domainConfig;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    public function __construct(
+        UrlShortenerInterface $urlShortener,
+        TranslatorInterface $translator,
+        array $domainConfig
+    ) {
+        $this->urlShortener = $urlShortener;
+        $this->translator = $translator;
+        $this->domainConfig = $domainConfig;
+        parent::__construct(null);
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setAliases(self::ALIASES)
+            ->setDescription(
+                $this->translator->translate('Generates a short URL for provided long URL and returns it')
+            )
+            ->addArgument('longUrl', InputArgument::REQUIRED, $this->translator->translate('The long URL to parse'))
+            ->addOption(
+                'tags',
+                't',
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                $this->translator->translate('Tags to apply to the new short URL')
+            )
+            ->addOption('validSince', 's', InputOption::VALUE_REQUIRED, $this->translator->translate(
+                'The date from which this short URL will be valid. '
+                . 'If someone tries to access it before this date, it will not be found.'
+            ))
+            ->addOption('validUntil', 'u', InputOption::VALUE_REQUIRED, $this->translator->translate(
+                'The date until which this short URL will be valid. '
+                . 'If someone tries to access it after this date, it will not be found.'
+            ))
+            ->addOption('customSlug', 'c', InputOption::VALUE_REQUIRED, $this->translator->translate(
+                'If provided, this slug will be used instead of generating a short code'
+            ))
+            ->addOption('maxVisits', 'm', InputOption::VALUE_REQUIRED, $this->translator->translate(
+                'This will limit the number of visits for this short URL.'
+            ));
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output): void
+    {
+        $io = new SymfonyStyle($input, $output);
+        $longUrl = $input->getArgument('longUrl');
+        if (! empty($longUrl)) {
+            return;
+        }
+
+        $longUrl = $io->ask(
+            $this->translator->translate('A long URL was not provided. Which URL do you want to be shortened?')
+        );
+        if (! empty($longUrl)) {
+            $input->setArgument('longUrl', $longUrl);
+        }
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): void
+    {
+        $io = new SymfonyStyle($input, $output);
+        $longUrl = $input->getArgument('longUrl');
+        if (empty($longUrl)) {
+            $io->error($this->translator->translate('A URL was not provided!'));
+            return;
+        }
+
+        $tags = $input->getOption('tags');
+        $processedTags = [];
+        foreach ($tags as $key => $tag) {
+            $explodedTags = \explode(',', $tag);
+            $processedTags = \array_merge($processedTags, $explodedTags);
+        }
+        $tags = $processedTags;
+        $customSlug = $input->getOption('customSlug');
+        $maxVisits = $input->getOption('maxVisits');
+
+        try {
+            $shortCode = $this->urlShortener->urlToShortCode(
+                new Uri($longUrl),
+                $tags,
+                $this->getOptionalDate($input, 'validSince'),
+                $this->getOptionalDate($input, 'validUntil'),
+                $customSlug,
+                $maxVisits !== null ? (int) $maxVisits : null
+            )->getShortCode();
+            $shortUrl = $this->buildShortUrl($this->domainConfig, $shortCode);
+
+            $io->writeln([
+                \sprintf('%s <info>%s</info>', $this->translator->translate('Processed long URL:'), $longUrl),
+                \sprintf('%s <info>%s</info>', $this->translator->translate('Generated short URL:'), $shortUrl),
+            ]);
+        } catch (InvalidUrlException $e) {
+            $io->error(\sprintf(
+                $this->translator->translate('Provided URL "%s" is invalid. Try with a different one.'),
+                $longUrl
+            ));
+        } catch (NonUniqueSlugException $e) {
+            $io->error(\sprintf(
+                $this->translator->translate(
+                    'Provided slug "%s" is already in use by another URL. Try with a different one.'
+                ),
+                $customSlug
+            ));
+        }
+    }
+
+    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,22 +1,24 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
+use Cake\Chronos\Chronos;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Helper\Table;
 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\Question\Question;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
 
 class GetVisitsCommand extends Command
 {
+    public const NAME = 'short-url:visits';
+    private const ALIASES = ['shortcode:visits', 'short-code:visits'];
+
     /**
      * @var VisitsTrackerInterface
      */
@@ -30,12 +32,14 @@ class GetVisitsCommand extends Command
     {
         $this->visitsTracker = $visitsTracker;
         $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
     }
 
-    public function configure()
+    protected function configure(): void
     {
-        $this->setName('shortcode:visits')
+        $this
+            ->setName(self::NAME)
+            ->setAliases(self::ALIASES)
             ->setDescription(
                 $this->translator->translate('Returns the detailed visits information for provided short code')
             )
@@ -58,58 +62,52 @@ class GetVisitsCommand extends Command
             );
     }
 
-    public function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         $shortCode = $input->getArgument('shortCode');
         if (! empty($shortCode)) {
             return;
         }
 
-        /** @var QuestionHelper $helper */
-        $helper = $this->getHelper('question');
-        $question = new Question(sprintf(
-            '<question>%s</question> ',
-            $this->translator->translate('A short code was not provided. Which short code do you want to use?:')
-        ));
-
-        $shortCode = $helper->ask($input, $output, $question);
+        $io = new SymfonyStyle($input, $output);
+        $shortCode = $io->ask(
+            $this->translator->translate('A short code was not provided. Which short code do you want to use?')
+        );
         if (! empty($shortCode)) {
             $input->setArgument('shortCode', $shortCode);
         }
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
+        $io = new SymfonyStyle($input, $output);
         $shortCode = $input->getArgument('shortCode');
         $startDate = $this->getDateOption($input, 'startDate');
         $endDate = $this->getDateOption($input, 'endDate');
 
         $visits = $this->visitsTracker->info($shortCode, new DateRange($startDate, $endDate));
-        $table = new Table($output);
-        $table->setHeaders([
-            $this->translator->translate('Referer'),
-            $this->translator->translate('Date'),
-            $this->translator->translate('Remote Address'),
-            $this->translator->translate('User agent'),
-        ]);
-
+        $rows = [];
         foreach ($visits as $row) {
             $rowData = $row->jsonSerialize();
-            // Unset location info
-            unset($rowData['visitLocation']);
 
-            $table->addRow(array_values($rowData));
+            // Unset location info and remote addr
+            unset($rowData['visitLocation'], $rowData['remoteAddr']);
+
+            $rowData['country'] = $row->getVisitLocation()->getCountryName();
+
+            $rows[] = \array_values($rowData);
         }
-        $table->render();
+        $io->table([
+            $this->translator->translate('Referer'),
+            $this->translator->translate('Date'),
+            $this->translator->translate('User agent'),
+            $this->translator->translate('Country'),
+        ], $rows);
     }
 
-    protected function getDateOption(InputInterface $input, $key)
+    private function getDateOption(InputInterface $input, $key)
     {
         $value = $input->getOption($key);
-        if (isset($value)) {
-            $value = new \DateTime($value);
-        }
-
-        return $value;
+        return ! empty($value) ? Chronos::parse($value) : $value;
     }
 }

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

@@ -0,0 +1,155 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
+
+use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
+use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
+use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
+use Shlinkio\Shlink\Core\Transformer\ShortUrlDataTransformer;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Zend\I18n\Translator\TranslatorInterface;
+
+class ListShortUrlsCommand extends Command
+{
+    use PaginatorUtilsTrait;
+
+    public const NAME = 'short-url:list';
+    private const ALIASES = ['shortcode:list', 'short-code:list'];
+
+    /**
+     * @var ShortUrlServiceInterface
+     */
+    private $shortUrlService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+    /**
+     * @var array
+     */
+    private $domainConfig;
+
+    public function __construct(
+        ShortUrlServiceInterface $shortUrlService,
+        TranslatorInterface $translator,
+        array $domainConfig
+    ) {
+        $this->shortUrlService = $shortUrlService;
+        $this->translator = $translator;
+        parent::__construct();
+        $this->domainConfig = $domainConfig;
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setAliases(self::ALIASES)
+            ->setDescription($this->translator->translate('List all short URLs'))
+            ->addOption(
+                'page',
+                'p',
+                InputOption::VALUE_OPTIONAL,
+                sprintf(
+                    $this->translator->translate('The first page to list (%s items per page)'),
+                    PaginableRepositoryAdapter::ITEMS_PER_PAGE
+                ),
+                1
+            )
+            ->addOption(
+                'searchTerm',
+                's',
+                InputOption::VALUE_OPTIONAL,
+                $this->translator->translate(
+                    'A query used to filter results by searching for it on the longUrl and shortCode fields'
+                )
+            )
+            ->addOption(
+                'tags',
+                't',
+                InputOption::VALUE_OPTIONAL,
+                $this->translator->translate('A comma-separated list of tags to filter results')
+            )
+            ->addOption(
+                'orderBy',
+                'o',
+                InputOption::VALUE_OPTIONAL,
+                $this->translator->translate(
+                    'The field from which we want to order by. Pass ASC or DESC separated by a comma'
+                )
+            )
+            ->addOption(
+                'showTags',
+                null,
+                InputOption::VALUE_NONE,
+                $this->translator->translate('Whether to display the tags or not')
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): void
+    {
+        $io = new SymfonyStyle($input, $output);
+        $page = (int) $input->getOption('page');
+        $searchTerm = $input->getOption('searchTerm');
+        $tags = $input->getOption('tags');
+        $tags = ! empty($tags) ? \explode(',', $tags) : [];
+        $showTags = $input->getOption('showTags');
+        $transformer = new ShortUrlDataTransformer($this->domainConfig);
+
+        do {
+            $result = $this->shortUrlService->listShortUrls($page, $searchTerm, $tags, $this->processOrderBy($input));
+            $page++;
+
+            $headers = [
+                $this->translator->translate('Short code'),
+                $this->translator->translate('Short URL'),
+                $this->translator->translate('Long URL'),
+                $this->translator->translate('Date created'),
+                $this->translator->translate('Visits count'),
+            ];
+            if ($showTags) {
+                $headers[] = $this->translator->translate('Tags');
+            }
+
+            $rows = [];
+            foreach ($result as $row) {
+                $shortUrl = $transformer->transform($row);
+                if ($showTags) {
+                    $shortUrl['tags'] = \implode(', ', $shortUrl['tags']);
+                } else {
+                    unset($shortUrl['tags']);
+                }
+
+                unset($shortUrl['originalUrl']);
+                $rows[] = \array_values($shortUrl);
+            }
+            $io->table($headers, $rows);
+
+            if ($this->isLastPage($result)) {
+                $continue = false;
+                $io->success($this->translator->translate('Short URLs properly listed'));
+            } else {
+                $continue = $io->confirm(
+                    \sprintf($this->translator->translate('Continue with page') . ' <options=bold>%s</>?', $page),
+                    false
+                );
+            }
+        } while ($continue);
+    }
+
+    private function processOrderBy(InputInterface $input)
+    {
+        $orderBy = $input->getOption('orderBy');
+        if (empty($orderBy)) {
+            return null;
+        }
+
+        $orderBy = \explode(',', $orderBy);
+        return \count($orderBy) === 1 ? $orderBy[0] : [$orderBy[0] => $orderBy[1]];
+    }
+}

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

@@ -0,0 +1,86 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
+
+use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
+use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
+use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Zend\I18n\Translator\TranslatorInterface;
+
+class ResolveUrlCommand extends Command
+{
+    public const NAME = 'short-url:parse';
+    private const ALIASES = ['shortcode:parse', 'short-code:parse'];
+
+    /**
+     * @var UrlShortenerInterface
+     */
+    private $urlShortener;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    public function __construct(UrlShortenerInterface $urlShortener, TranslatorInterface $translator)
+    {
+        $this->urlShortener = $urlShortener;
+        $this->translator = $translator;
+        parent::__construct(null);
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName(self::NAME)
+            ->setAliases(self::ALIASES)
+            ->setDescription($this->translator->translate('Returns the long URL behind a short code'))
+            ->addArgument(
+                'shortCode',
+                InputArgument::REQUIRED,
+                $this->translator->translate('The short code to parse')
+            );
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output): void
+    {
+        $shortCode = $input->getArgument('shortCode');
+        if (! empty($shortCode)) {
+            return;
+        }
+
+        $io = new SymfonyStyle($input, $output);
+        $shortCode = $io->ask(
+            $this->translator->translate('A short code was not provided. Which short code do you want to parse?')
+        );
+        if (! empty($shortCode)) {
+            $input->setArgument('shortCode', $shortCode);
+        }
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): void
+    {
+        $io = new SymfonyStyle($input, $output);
+        $shortCode = $input->getArgument('shortCode');
+
+        try {
+            $url = $this->urlShortener->shortCodeToUrl($shortCode);
+            $output->writeln(
+                \sprintf('%s <info>%s</info>', $this->translator->translate('Long URL:'), $url->getLongUrl())
+            );
+        } catch (InvalidShortCodeException $e) {
+            $io->error(
+                \sprintf($this->translator->translate('Provided short code "%s" has an invalid format.'), $shortCode)
+            );
+        } catch (EntityDoesNotExistException $e) {
+            $io->error(
+                \sprintf($this->translator->translate('Provided short code "%s" could not be found.'), $shortCode)
+            );
+        }
+    }
+}

module/CLI/src/Command/Shortcode/GenerateShortcodeCommand.php

@@ -1,151 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
-
-use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
-use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
-use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\QuestionHelper;
-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\Question\Question;
-use Zend\Diactoros\Uri;
-use Zend\I18n\Translator\TranslatorInterface;
-
-class GenerateShortcodeCommand extends Command
-{
-    /**
-     * @var UrlShortenerInterface
-     */
-    private $urlShortener;
-    /**
-     * @var array
-     */
-    private $domainConfig;
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    public function __construct(
-        UrlShortenerInterface $urlShortener,
-        TranslatorInterface $translator,
-        array $domainConfig
-    ) {
-        $this->urlShortener = $urlShortener;
-        $this->translator = $translator;
-        $this->domainConfig = $domainConfig;
-        parent::__construct(null);
-    }
-
-    public function configure()
-    {
-        $this->setName('shortcode:generate')
-             ->setDescription(
-                 $this->translator->translate('Generates a short code for provided URL and returns the short URL')
-             )
-             ->addArgument('longUrl', InputArgument::REQUIRED, $this->translator->translate('The long URL to parse'))
-             ->addOption(
-                 'tags',
-                 't',
-                 InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-                 $this->translator->translate('Tags to apply to the new short URL')
-             )
-             ->addOption('validSince', 's', InputOption::VALUE_REQUIRED, $this->translator->translate(
-                 'The date from which this short URL will be valid. '
-                 . 'If someone tries to access it before this date, it will not be found.'
-             ))
-             ->addOption('validUntil', 'u', InputOption::VALUE_REQUIRED, $this->translator->translate(
-                 'The date until which this short URL will be valid. '
-                 . 'If someone tries to access it after this date, it will not be found.'
-             ))
-             ->addOption('customSlug', 'c', InputOption::VALUE_REQUIRED, $this->translator->translate(
-                 'If provided, this slug will be used instead of generating a short code'
-             ))
-             ->addOption('maxVisits', 'm', InputOption::VALUE_REQUIRED, $this->translator->translate(
-                 'This will limit the number of visits for this short URL.'
-             ));
-    }
-
-    public function interact(InputInterface $input, OutputInterface $output)
-    {
-        $longUrl = $input->getArgument('longUrl');
-        if (! empty($longUrl)) {
-            return;
-        }
-
-        /** @var QuestionHelper $helper */
-        $helper = $this->getHelper('question');
-        $question = new Question(sprintf(
-            '<question>%s</question> ',
-            $this->translator->translate('A long URL was not provided. Which URL do you want to shorten?:')
-        ));
-
-        $longUrl = $helper->ask($input, $output, $question);
-        if (! empty($longUrl)) {
-            $input->setArgument('longUrl', $longUrl);
-        }
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        $longUrl = $input->getArgument('longUrl');
-        $tags = $input->getOption('tags');
-        $processedTags = [];
-        foreach ($tags as $key => $tag) {
-            $explodedTags = explode(',', $tag);
-            $processedTags = array_merge($processedTags, $explodedTags);
-        }
-        $tags = $processedTags;
-        $customSlug = $input->getOption('customSlug');
-        $maxVisits = $input->getOption('maxVisits');
-
-        try {
-            if (! isset($longUrl)) {
-                $output->writeln(sprintf('<error>%s</error>', $this->translator->translate('A URL was not provided!')));
-                return;
-            }
-
-            $shortCode = $this->urlShortener->urlToShortCode(
-                new Uri($longUrl),
-                $tags,
-                $this->getOptionalDate($input, 'validSince'),
-                $this->getOptionalDate($input, 'validUntil'),
-                $customSlug,
-                $maxVisits !== null ? (int) $maxVisits : null
-            );
-            $shortUrl = (new Uri())->withPath($shortCode)
-                                   ->withScheme($this->domainConfig['schema'])
-                                   ->withHost($this->domainConfig['hostname']);
-
-            $output->writeln([
-                sprintf('%s <info>%s</info>', $this->translator->translate('Processed URL:'), $longUrl),
-                sprintf('%s <info>%s</info>', $this->translator->translate('Generated URL:'), $shortUrl),
-            ]);
-        } catch (InvalidUrlException $e) {
-            $output->writeln(sprintf(
-                '<error>' . $this->translator->translate(
-                    'Provided URL "%s" is invalid. Try with a different one.'
-                ) . '</error>',
-                $longUrl
-            ));
-        } catch (NonUniqueSlugException $e) {
-            $output->writeln(sprintf(
-                '<error>' . $this->translator->translate(
-                    'Provided slug "%s" is already in use by another URL. Try with a different one.'
-                ) . '</error>',
-                $customSlug
-            ));
-        }
-    }
-
-    private function getOptionalDate(InputInterface $input, string $fieldName)
-    {
-        $since = $input->getOption($fieldName);
-        return $since !== null ? new \DateTime($since) : null;
-    }
-}

module/CLI/src/Command/Shortcode/ListShortcodesCommand.php

@@ -1,151 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
-
-use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
-use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
-use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Zend\I18n\Translator\TranslatorInterface;
-
-class ListShortcodesCommand extends Command
-{
-    use PaginatorUtilsTrait;
-
-    /**
-     * @var ShortUrlServiceInterface
-     */
-    private $shortUrlService;
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    public function __construct(ShortUrlServiceInterface $shortUrlService, TranslatorInterface $translator)
-    {
-        $this->shortUrlService = $shortUrlService;
-        $this->translator = $translator;
-        parent::__construct(null);
-    }
-
-    public function configure()
-    {
-        $this->setName('shortcode:list')
-             ->setDescription($this->translator->translate('List all short URLs'))
-             ->addOption(
-                 'page',
-                 'p',
-                 InputOption::VALUE_OPTIONAL,
-                 sprintf(
-                     $this->translator->translate('The first page to list (%s items per page)'),
-                     PaginableRepositoryAdapter::ITEMS_PER_PAGE
-                 ),
-                 1
-             )
-             ->addOption(
-                 'searchTerm',
-                 's',
-                 InputOption::VALUE_OPTIONAL,
-                 $this->translator->translate(
-                     'A query used to filter results by searching for it on the longUrl and shortCode fields'
-                 )
-             )
-             ->addOption(
-                 'tags',
-                 't',
-                 InputOption::VALUE_OPTIONAL,
-                 $this->translator->translate('A comma-separated list of tags to filter results')
-             )
-             ->addOption(
-                 'orderBy',
-                 'o',
-                 InputOption::VALUE_OPTIONAL,
-                 $this->translator->translate(
-                     'The field from which we want to order by. Pass ASC or DESC separated by a comma'
-                 )
-             )
-             ->addOption(
-                 'showTags',
-                 null,
-                 InputOption::VALUE_NONE,
-                 $this->translator->translate('Whether to display the tags or not')
-             );
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        $page = (int) $input->getOption('page');
-        $searchTerm = $input->getOption('searchTerm');
-        $tags = $input->getOption('tags');
-        $tags = ! empty($tags) ? explode(',', $tags) : [];
-        $showTags = $input->getOption('showTags');
-
-        /** @var QuestionHelper $helper */
-        $helper = $this->getHelper('question');
-
-        do {
-            $result = $this->shortUrlService->listShortUrls($page, $searchTerm, $tags, $this->processOrderBy($input));
-            $page++;
-            $table = new Table($output);
-
-            $headers = [
-                $this->translator->translate('Short code'),
-                $this->translator->translate('Original URL'),
-                $this->translator->translate('Date created'),
-                $this->translator->translate('Visits count'),
-            ];
-            if ($showTags) {
-                $headers[] = $this->translator->translate('Tags');
-            }
-            $table->setHeaders($headers);
-
-            foreach ($result as $row) {
-                $shortUrl = $row->jsonSerialize();
-                if ($showTags) {
-                    $shortUrl['tags'] = [];
-                    foreach ($row->getTags() as $tag) {
-                        $shortUrl['tags'][] = $tag->getName();
-                    }
-                    $shortUrl['tags'] = implode(', ', $shortUrl['tags']);
-                } else {
-                    unset($shortUrl['tags']);
-                }
-
-                $table->addRow(array_values($shortUrl));
-            }
-            $table->render();
-
-            if ($this->isLastPage($result)) {
-                $continue = false;
-                $output->writeln(
-                    sprintf('<info>%s</info>', $this->translator->translate('You have reached last page'))
-                );
-            } else {
-                $continue = $helper->ask($input, $output, new ConfirmationQuestion(
-                    sprintf('<question>' . $this->translator->translate(
-                        'Continue with page'
-                    ) . ' <bg=cyan;options=bold>%s</>? (y/N)</question> ', $page),
-                    false
-                ));
-            }
-        } while ($continue);
-    }
-
-    protected function processOrderBy(InputInterface $input)
-    {
-        $orderBy = $input->getOption('orderBy');
-        if (empty($orderBy)) {
-            return null;
-        }
-
-        $orderBy = explode(',', $orderBy);
-        return count($orderBy) === 1 ? $orderBy[0] : [$orderBy[0] => $orderBy[1]];
-    }
-}

module/CLI/src/Command/Shortcode/ResolveUrlCommand.php

@@ -1,91 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Command\Shortcode;
-
-use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
-use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
-use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\Question;
-use Zend\I18n\Translator\TranslatorInterface;
-
-class ResolveUrlCommand extends Command
-{
-    /**
-     * @var UrlShortenerInterface
-     */
-    private $urlShortener;
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    public function __construct(UrlShortenerInterface $urlShortener, TranslatorInterface $translator)
-    {
-        $this->urlShortener = $urlShortener;
-        $this->translator = $translator;
-        parent::__construct(null);
-    }
-
-    public function configure()
-    {
-        $this->setName('shortcode:parse')
-             ->setDescription($this->translator->translate('Returns the long URL behind a short code'))
-             ->addArgument(
-                 'shortCode',
-                 InputArgument::REQUIRED,
-                 $this->translator->translate('The short code to parse')
-             );
-    }
-
-    public function interact(InputInterface $input, OutputInterface $output)
-    {
-        $shortCode = $input->getArgument('shortCode');
-        if (! empty($shortCode)) {
-            return;
-        }
-
-        /** @var QuestionHelper $helper */
-        $helper = $this->getHelper('question');
-        $question = new Question(sprintf(
-            '<question>%s</question> ',
-            $this->translator->translate('A short code was not provided. Which short code do you want to parse?:')
-        ));
-
-        $shortCode = $helper->ask($input, $output, $question);
-        if (! empty($shortCode)) {
-            $input->setArgument('shortCode', $shortCode);
-        }
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        $shortCode = $input->getArgument('shortCode');
-
-        try {
-            $longUrl = $this->urlShortener->shortCodeToUrl($shortCode);
-            if (! isset($longUrl)) {
-                $output->writeln(sprintf(
-                    '<error>' . $this->translator->translate('No URL found for short code "%s"') . '</error>',
-                    $shortCode
-                ));
-                return;
-            }
-
-            $output->writeln(sprintf('%s <info>%s</info>', $this->translator->translate('Long URL:'), $longUrl));
-        } catch (InvalidShortCodeException $e) {
-            $output->writeln(sprintf('<error>' . $this->translator->translate(
-                'Provided short code "%s" has an invalid format.'
-            ) . '</error>', $shortCode));
-        } catch (EntityDoesNotExistException $e) {
-            $output->writeln(sprintf('<error>' . $this->translator->translate(
-                'Provided short code "%s" could not be found.'
-            ) . '</error>', $shortCode));
-        }
-    }
-}

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

@@ -8,10 +8,13 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
 
 class CreateTagCommand extends Command
 {
+    public const NAME = 'tag:create';
+
     /**
      * @var TagServiceInterface
      */
@@ -28,10 +31,10 @@ class CreateTagCommand extends Command
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
-            ->setName('tag:create')
+            ->setName(self::NAME)
             ->setDescription($this->translator->translate('Creates one or more tags.'))
             ->addOption(
                 'name',
@@ -41,21 +44,17 @@ class CreateTagCommand extends Command
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
+        $io = new SymfonyStyle($input, $output);
         $tagNames = $input->getOption('name');
+
         if (empty($tagNames)) {
-            $output->writeln(sprintf(
-                '<comment>%s</comment>',
-                $this->translator->translate('You have to provide at least one tag name')
-            ));
+            $io->warning($this->translator->translate('You have to provide at least one tag name'));
             return;
         }
 
         $this->tagService->createTags($tagNames);
-        $output->writeln($this->translator->translate('Created tags') . sprintf(': ["<info>%s</info>"]', implode(
-            '</info>", "<info>',
-            $tagNames
-        )));
+        $io->success($this->translator->translate('Tags properly created'));
     }
 }

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

@@ -8,10 +8,13 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
 
 class DeleteTagsCommand extends Command
 {
+    public const NAME = 'tag:delete';
+
     /**
      * @var TagServiceInterface
      */
@@ -28,10 +31,10 @@ class DeleteTagsCommand extends Command
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
-            ->setName('tag:delete')
+            ->setName(self::NAME)
             ->setDescription($this->translator->translate('Deletes one or more tags.'))
             ->addOption(
                 'name',
@@ -41,21 +44,17 @@ class DeleteTagsCommand extends Command
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
+        $io = new SymfonyStyle($input, $output);
         $tagNames = $input->getOption('name');
+
         if (empty($tagNames)) {
-            $output->writeln(sprintf(
-                '<comment>%s</comment>',
-                $this->translator->translate('You have to provide at least one tag name')
-            ));
+            $io->warning($this->translator->translate('You have to provide at least one tag name'));
             return;
         }
 
         $this->tagService->deleteTags($tagNames);
-        $output->writeln($this->translator->translate('Deleted tags') . sprintf(': ["<info>%s</info>"]', implode(
-            '</info>", "<info>',
-            $tagNames
-        )));
+        $io->success($this->translator->translate('Tags properly deleted'));
     }
 }

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

@@ -6,13 +6,16 @@ namespace Shlinkio\Shlink\CLI\Command\Tag;
 use Shlinkio\Shlink\Core\Entity\Tag;
 use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
+use function array_map;
 
 class ListTagsCommand extends Command
 {
+    public const NAME = 'tag:list';
+
     /**
      * @var TagServiceInterface
      */
@@ -29,20 +32,17 @@ class ListTagsCommand extends Command
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
-            ->setName('tag:list')
+            ->setName(self::NAME)
             ->setDescription($this->translator->translate('Lists existing tags.'));
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
-        $table = new Table($output);
-        $table->setHeaders([$this->translator->translate('Name')])
-              ->setRows($this->getTagsRows());
-
-        $table->render();
+        $io = new SymfonyStyle($input, $output);
+        $io->table([$this->translator->translate('Name')], $this->getTagsRows());
     }
 
     private function getTagsRows()

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

@@ -9,10 +9,14 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
+use function sprintf;
 
 class RenameTagCommand extends Command
 {
+    public const NAME = 'tag:rename';
+
     /**
      * @var TagServiceInterface
      */
@@ -29,27 +33,26 @@ class RenameTagCommand extends Command
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
-            ->setName('tag:rename')
+            ->setName(self::NAME)
             ->setDescription($this->translator->translate('Renames one existing tag.'))
             ->addArgument('oldName', InputArgument::REQUIRED, $this->translator->translate('Current name of the tag.'))
             ->addArgument('newName', InputArgument::REQUIRED, $this->translator->translate('New name of the tag.'));
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
+        $io = new SymfonyStyle($input, $output);
         $oldName = $input->getArgument('oldName');
         $newName = $input->getArgument('newName');
 
         try {
             $this->tagService->renameTag($oldName, $newName);
-            $output->writeln(sprintf('<info>%s</info>', $this->translator->translate('Tag properly renamed.')));
+            $io->success($this->translator->translate('Tag properly renamed.'));
         } catch (EntityDoesNotExistException $e) {
-            $output->writeln('<error>' . sprintf($this->translator->translate(
-                'A tag with name "%s" was not found'
-            ), $oldName) . '</error>');
+            $io->error(sprintf($this->translator->translate('A tag with name "%s" was not found'), $oldName));
         }
     }
 }

module/CLI/src/Command/Visit/ProcessVisitsCommand.php

@@ -5,16 +5,20 @@ namespace Shlinkio\Shlink\CLI\Command\Visit;
 
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
 use Shlinkio\Shlink\Common\Service\IpLocationResolverInterface;
+use Shlinkio\Shlink\Common\Util\IpAddress;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Service\VisitServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
 use Zend\I18n\Translator\TranslatorInterface;
+use function sleep;
+use function sprintf;
 
 class ProcessVisitsCommand extends Command
 {
-    const LOCALHOST = '127.0.0.1';
+    public const NAME = 'visit:process';
 
     /**
      * @var VisitServiceInterface
@@ -40,43 +44,71 @@ class ProcessVisitsCommand extends Command
         parent::__construct(null);
     }
 
-    public function configure()
+    protected function configure(): void
     {
-        $this->setName('visit:process')
+        $this->setName(self::NAME)
              ->setDescription(
                  $this->translator->translate('Processes visits where location is not set yet')
              );
     }
 
-    public function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
+        $io = new SymfonyStyle($input, $output);
         $visits = $this->visitService->getUnlocatedVisits();
 
+        $count = 0;
         foreach ($visits as $visit) {
+            if (! $visit->hasRemoteAddr()) {
+                $io->writeln(
+                    sprintf('<comment>%s</comment>', $this->translator->translate('Ignored visit with no IP address')),
+                    OutputInterface::VERBOSITY_VERBOSE
+                );
+                continue;
+            }
+
             $ipAddr = $visit->getRemoteAddr();
-            $output->write(sprintf('%s <info>%s</info>', $this->translator->translate('Processing IP'), $ipAddr));
-            if ($ipAddr === self::LOCALHOST) {
-                $output->writeln(
+            $io->write(sprintf('%s <info>%s</info>', $this->translator->translate('Processing IP'), $ipAddr));
+            if ($ipAddr === IpAddress::LOCALHOST) {
+                $io->writeln(
                     sprintf(' (<comment>%s</comment>)', $this->translator->translate('Ignored localhost address'))
                 );
                 continue;
             }
 
+            $count++;
             try {
                 $result = $this->ipLocationResolver->resolveIpLocation($ipAddr);
+
                 $location = new VisitLocation();
                 $location->exchangeArray($result);
                 $visit->setVisitLocation($location);
                 $this->visitService->saveVisit($visit);
-                $output->writeln(sprintf(
+
+                $io->writeln(sprintf(
                     ' (' . $this->translator->translate('Address located at "%s"') . ')',
                     $location->getCityName()
                 ));
             } catch (WrongIpException $e) {
-                continue;
+                $io->writeln(
+                    sprintf(' <error>%s</error>', $this->translator->translate('An error occurred while locating IP'))
+                );
+                if ($io->isVerbose()) {
+                    $this->getApplication()->renderException($e, $output);
+                }
+            }
+
+            if ($count === $this->ipLocationResolver->getApiLimit()) {
+                $count = 0;
+                $seconds = $this->ipLocationResolver->getApiInterval();
+                $io->note(sprintf(
+                    $this->translator->translate('IP location resolver limit reached. Waiting %s seconds...'),
+                    $seconds
+                ));
+                sleep($seconds);
             }
         }
 
-        $output->writeln($this->translator->translate('Finished processing all IPs'));
+        $io->success($this->translator->translate('Finished processing all IPs'));
     }
 }

module/CLI/src/Factory/ApplicationFactory.php

@@ -5,8 +5,11 @@ namespace Shlinkio\Shlink\CLI\Factory;
 
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Symfony\Component\Console\Application as CliApp;
+use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
 use Zend\I18n\Translator\Translator;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
@@ -20,28 +23,23 @@ class ApplicationFactory implements FactoryInterface
      * @param  ContainerInterface $container
      * @param  string $requestedName
      * @param  null|array $options
-     * @return object
+     * @return CliApp
+     * @throws NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
      * @throws ServiceNotFoundException if unable to resolve the service.
-     * @throws ServiceNotCreatedException if an exception is raised when
-     *     creating a service.
+     * @throws ServiceNotCreatedException if an exception is raised when creating a service.
      * @throws ContainerException if any other error occurs
      */
-    public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
+    public function __invoke(ContainerInterface $container, $requestedName, array $options = null): CliApp
     {
         $config = $container->get('config')['cli'];
         $appOptions = $container->get(AppOptions::class);
         $translator = $container->get(Translator::class);
         $translator->setLocale($config['locale']);
 
-        $commands = isset($config['commands']) ? $config['commands'] : [];
+        $commands = $config['commands'] ?? [];
         $app = new CliApp($appOptions->getName(), $appOptions->getVersion());
-        foreach ($commands as $command) {
-            if (! $container->has($command)) {
-                continue;
-            }
-
-            $app->add($container->get($command));
-        }
+        $app->setCommandLoader(new ContainerCommandLoader($container, $commands));
 
         return $app;
     }

module/CLI/src/Install/ConfigCustomizerPluginManager.php

@@ -1,12 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Install;
-
-use Shlinkio\Shlink\CLI\Install\Plugin\ConfigCustomizerPluginInterface;
-use Zend\ServiceManager\AbstractPluginManager;
-
-class ConfigCustomizerPluginManager extends AbstractPluginManager implements ConfigCustomizerPluginManagerInterface
-{
-    protected $instanceOf = ConfigCustomizerPluginInterface::class;
-}

module/CLI/src/Install/ConfigCustomizerPluginManagerInterface.php

@@ -1,10 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Install;
-
-use Psr\Container\ContainerInterface;
-
-interface ConfigCustomizerPluginManagerInterface extends ContainerInterface
-{
-}

module/CLI/src/Install/Plugin/AbstractConfigCustomizerPlugin.php

@@ -1,68 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
-
-use Symfony\Component\Console\Exception\RuntimeException;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\Question;
-
-abstract class AbstractConfigCustomizerPlugin implements ConfigCustomizerPluginInterface
-{
-    /**
-     * @var QuestionHelper
-     */
-    protected $questionHelper;
-
-    public function __construct(QuestionHelper $questionHelper)
-    {
-        $this->questionHelper = $questionHelper;
-    }
-
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @param string $text
-     * @param string|null $default
-     * @param bool $allowEmpty
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function ask(InputInterface $input, OutputInterface $output, $text, $default = null, $allowEmpty = false)
-    {
-        if ($default !== null) {
-            $text .= ' (defaults to ' . $default . ')';
-        }
-        do {
-            $value = $this->questionHelper->ask($input, $output, new Question(
-                '<question>' . $text . ':</question> ',
-                $default
-            ));
-            if (empty($value) && ! $allowEmpty) {
-                $output->writeln('<error>Value can\'t be empty</error>');
-            }
-        } while (empty($value) && $default === null && ! $allowEmpty);
-
-        return $value;
-    }
-
-    /**
-     * @param OutputInterface $output
-     * @param string $text
-     */
-    protected function printTitle(OutputInterface $output, $text)
-    {
-        $text = trim($text);
-        $length = strlen($text) + 4;
-        $header = str_repeat('*', $length);
-
-        $output->writeln([
-            '',
-            '<info>' . $header . '</info>',
-            '<info>* ' . strtoupper($text) . ' *</info>',
-            '<info>' . $header . '</info>',
-        ]);
-    }
-}

module/CLI/src/Install/Plugin/ApplicationConfigCustomizerPlugin.php

@@ -1,43 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
-
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-
-class ApplicationConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
-{
-    use StringUtilsTrait;
-
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @param CustomizableAppConfig $appConfig
-     * @return void
-     * @throws \Symfony\Component\Console\Exception\RuntimeException
-     */
-    public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig)
-    {
-        $this->printTitle($output, 'APPLICATION');
-
-        if ($appConfig->hasApp() && $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
-            '<question>Do you want to keep imported application config? (Y/n):</question> '
-        ))) {
-            return;
-        }
-
-        $appConfig->setApp([
-            'SECRET' => $this->ask(
-                $input,
-                $output,
-                'Define a secret string that will be used to sign API tokens (leave empty to autogenerate one)',
-                null,
-                true
-            ) ?: $this->generateRandomString(32),
-        ]);
-    }
-}

module/CLI/src/Install/Plugin/ConfigCustomizerPluginInterface.php

@@ -1,19 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
-
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-interface ConfigCustomizerPluginInterface
-{
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @param CustomizableAppConfig $appConfig
-     * @return void
-     */
-    public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig);
-}

module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php

@@ -1,100 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
-
-use Acelaya\ZsmAnnotatedServices\Annotation as DI;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Symfony\Component\Console\Exception\RuntimeException;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ChoiceQuestion;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Filesystem;
-
-class DatabaseConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
-{
-    const DATABASE_DRIVERS = [
-        'MySQL' => 'pdo_mysql',
-        'PostgreSQL' => 'pdo_pgsql',
-        'SQLite' => 'pdo_sqlite',
-    ];
-
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * DatabaseConfigCustomizerPlugin constructor.
-     * @param QuestionHelper $questionHelper
-     * @param Filesystem $filesystem
-     *
-     * @DI\Inject({QuestionHelper::class, Filesystem::class})
-     */
-    public function __construct(QuestionHelper $questionHelper, Filesystem $filesystem)
-    {
-        parent::__construct($questionHelper);
-        $this->filesystem = $filesystem;
-    }
-
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @param CustomizableAppConfig $appConfig
-     * @return void
-     * @throws IOException
-     * @throws RuntimeException
-     */
-    public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig)
-    {
-        $this->printTitle($output, 'DATABASE');
-
-        if ($appConfig->hasDatabase() && $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
-            '<question>Do you want to keep imported database config? (Y/n):</question> '
-        ))) {
-            // If the user selected to keep DB config and is configured to use sqlite, copy DB file
-            if ($appConfig->getDatabase()['DRIVER'] === self::DATABASE_DRIVERS['SQLite']) {
-                try {
-                    $this->filesystem->copy(
-                        $appConfig->getImportedInstallationPath() . '/' . CustomizableAppConfig::SQLITE_DB_PATH,
-                        CustomizableAppConfig::SQLITE_DB_PATH
-                    );
-                } catch (IOException $e) {
-                    $output->writeln('<error>It wasn\'t possible to import the SQLite database</error>');
-                    throw $e;
-                }
-            }
-
-            return;
-        }
-
-        // Select database type
-        $params = [];
-        $databases = array_keys(self::DATABASE_DRIVERS);
-        $dbType = $this->questionHelper->ask($input, $output, new ChoiceQuestion(
-            '<question>Select database type (defaults to ' . $databases[0] . '):</question>',
-            $databases,
-            0
-        ));
-        $params['DRIVER'] = self::DATABASE_DRIVERS[$dbType];
-
-        // Ask for connection params if database is not SQLite
-        if ($params['DRIVER'] !== self::DATABASE_DRIVERS['SQLite']) {
-            $params['NAME'] = $this->ask($input, $output, 'Database name', 'shlink');
-            $params['USER'] = $this->ask($input, $output, 'Database username');
-            $params['PASSWORD'] = $this->ask($input, $output, 'Database password');
-            $params['HOST'] = $this->ask($input, $output, 'Database host', 'localhost');
-            $params['PORT'] = $this->ask($input, $output, 'Database port', $this->getDefaultDbPort($params['DRIVER']));
-        }
-
-        $appConfig->setDatabase($params);
-    }
-
-    private function getDefaultDbPort($driver)
-    {
-        return $driver === 'pdo_mysql' ? '3306' : '5432';
-    }
-}

module/CLI/src/Install/Plugin/LanguageConfigCustomizerPlugin.php

@@ -1,49 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
-
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Symfony\Component\Console\Exception\RuntimeException;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ChoiceQuestion;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-
-class LanguageConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
-{
-    const SUPPORTED_LANGUAGES = ['en', 'es'];
-
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @param CustomizableAppConfig $appConfig
-     * @return void
-     * @throws RuntimeException
-     */
-    public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig)
-    {
-        $this->printTitle($output, 'LANGUAGE');
-
-        if ($appConfig->hasLanguage() && $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
-            '<question>Do you want to keep imported language? (Y/n):</question> '
-        ))) {
-            return;
-        }
-
-        $appConfig->setLanguage([
-            'DEFAULT' => $this->questionHelper->ask($input, $output, new ChoiceQuestion(
-                '<question>Select default language for the application in general (defaults to '
-                . self::SUPPORTED_LANGUAGES[0] . '):</question>',
-                self::SUPPORTED_LANGUAGES,
-                0
-            )),
-            'CLI' => $this->questionHelper->ask($input, $output, new ChoiceQuestion(
-                '<question>Select default language for CLI executions (defaults to '
-                . self::SUPPORTED_LANGUAGES[0] . '):</question>',
-                self::SUPPORTED_LANGUAGES,
-                0
-            )),
-        ]);
-    }
-}

module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizerPlugin.php

@@ -1,57 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
-
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Shlinkio\Shlink\Core\Service\UrlShortener;
-use Symfony\Component\Console\Exception\RuntimeException;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ChoiceQuestion;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-
-class UrlShortenerConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
-{
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     * @param CustomizableAppConfig $appConfig
-     * @return void
-     * @throws RuntimeException
-     */
-    public function process(InputInterface $input, OutputInterface $output, CustomizableAppConfig $appConfig)
-    {
-        $this->printTitle($output, 'URL SHORTENER');
-
-        if ($appConfig->hasUrlShortener() && $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
-            '<question>Do you want to keep imported URL shortener config? (Y/n):</question> '
-        ))) {
-            return;
-        }
-
-        // Ask for URL shortener params
-        $appConfig->setUrlShortener([
-            'SCHEMA' => $this->questionHelper->ask($input, $output, new ChoiceQuestion(
-                '<question>Select schema for generated short URLs (defaults to http):</question>',
-                ['http', 'https'],
-                0
-            )),
-            'HOSTNAME' => $this->ask($input, $output, 'Hostname for generated URLs'),
-            'CHARS' => $this->ask(
-                $input,
-                $output,
-                'Character set for generated short codes (leave empty to autogenerate one)',
-                null,
-                true
-            ) ?: str_shuffle(UrlShortener::DEFAULT_CHARS),
-            'VALIDATE_URL' => $this->questionHelper->ask(
-                $input,
-                $output,
-                new ConfirmationQuestion(
-                    '<question>Do you want to validate long urls by 200 HTTP status code on response (Y/n):</question>'
-                )
-            ),
-        ]);
-    }
-}

module/CLI/src/Model/CustomizableAppConfig.php

@@ -1,269 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\CLI\Model;
-
-use Zend\Stdlib\ArraySerializableInterface;
-
-final class CustomizableAppConfig implements ArraySerializableInterface
-{
-    const SQLITE_DB_PATH = 'data/database.sqlite';
-
-    /**
-     * @var array
-     */
-    private $database;
-    /**
-     * @var array
-     */
-    private $urlShortener;
-    /**
-     * @var array
-     */
-    private $language;
-    /**
-     * @var array
-     */
-    private $app;
-    /**
-     * @var string
-     */
-    private $importedInstallationPath;
-
-    /**
-     * @return array
-     */
-    public function getDatabase()
-    {
-        return $this->database;
-    }
-
-    /**
-     * @param array $database
-     * @return $this
-     */
-    public function setDatabase(array $database)
-    {
-        $this->database = $database;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasDatabase()
-    {
-        return ! empty($this->database);
-    }
-
-    /**
-     * @return array
-     */
-    public function getUrlShortener()
-    {
-        return $this->urlShortener;
-    }
-
-    /**
-     * @param array $urlShortener
-     * @return $this
-     */
-    public function setUrlShortener(array $urlShortener)
-    {
-        $this->urlShortener = $urlShortener;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasUrlShortener()
-    {
-        return ! empty($this->urlShortener);
-    }
-
-    /**
-     * @return array
-     */
-    public function getLanguage()
-    {
-        return $this->language;
-    }
-
-    /**
-     * @param array $language
-     * @return $this
-     */
-    public function setLanguage(array $language)
-    {
-        $this->language = $language;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasLanguage()
-    {
-        return ! empty($this->language);
-    }
-
-    /**
-     * @return array
-     */
-    public function getApp()
-    {
-        return $this->app;
-    }
-
-    /**
-     * @param array $app
-     * @return $this
-     */
-    public function setApp(array $app)
-    {
-        $this->app = $app;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasApp()
-    {
-        return ! empty($this->app);
-    }
-
-    /**
-     * @return string
-     */
-    public function getImportedInstallationPath()
-    {
-        return $this->importedInstallationPath;
-    }
-
-    /**
-     * @param string $importedInstallationPath
-     * @return $this|self
-     */
-    public function setImportedInstallationPath($importedInstallationPath)
-    {
-        $this->importedInstallationPath = $importedInstallationPath;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasImportedInstallationPath()
-    {
-        return $this->importedInstallationPath !== null;
-    }
-
-    /**
-     * Exchange internal values from provided array
-     *
-     * @param array $array
-     * @return void
-     */
-    public function exchangeArray(array $array)
-    {
-        if (isset($array['app_options'], $array['app_options']['secret_key'])) {
-            $this->setApp([
-                'SECRET' => $array['app_options']['secret_key'],
-            ]);
-        }
-
-        if (isset($array['entity_manager'], $array['entity_manager']['connection'])) {
-            $this->deserializeDatabase($array['entity_manager']['connection']);
-        }
-
-        if (isset($array['translator'], $array['translator']['locale'], $array['cli'], $array['cli']['locale'])) {
-            $this->setLanguage([
-                'DEFAULT' => $array['translator']['locale'],
-                'CLI' => $array['cli']['locale'],
-            ]);
-        }
-
-        if (isset($array['url_shortener'])) {
-            $urlShortener = $array['url_shortener'];
-            $this->setUrlShortener([
-                'SCHEMA' => $urlShortener['domain']['schema'],
-                'HOSTNAME' => $urlShortener['domain']['hostname'],
-                'CHARS' => $urlShortener['shortcode_chars'],
-                'VALIDATE_URL' => $urlShortener['validate_url'] ?? true,
-            ]);
-        }
-    }
-
-    private function deserializeDatabase(array $conn)
-    {
-        if (! isset($conn['driver'])) {
-            return;
-        }
-        $driver = $conn['driver'];
-
-        $params = ['DRIVER' => $driver];
-        if ($driver !== 'pdo_sqlite') {
-            $params['USER'] = $conn['user'];
-            $params['PASSWORD'] = $conn['password'];
-            $params['NAME'] = $conn['dbname'];
-            $params['HOST'] = $conn['host'];
-            $params['PORT'] = $conn['port'];
-        }
-
-        $this->setDatabase($params);
-    }
-
-    /**
-     * Return an array representation of the object
-     *
-     * @return array
-     */
-    public function getArrayCopy()
-    {
-        $config = [
-            'app_options' => [
-                'secret_key' => $this->app['SECRET'],
-            ],
-            'entity_manager' => [
-                'connection' => [
-                    'driver' => $this->database['DRIVER'],
-                ],
-            ],
-            'translator' => [
-                'locale' => $this->language['DEFAULT'],
-            ],
-            'cli' => [
-                'locale' => $this->language['CLI'],
-            ],
-            'url_shortener' => [
-                'domain' => [
-                    'schema' => $this->urlShortener['SCHEMA'],
-                    'hostname' => $this->urlShortener['HOSTNAME'],
-                ],
-                'shortcode_chars' => $this->urlShortener['CHARS'],
-                'validate_url' => $this->urlShortener['VALIDATE_URL'],
-            ],
-        ];
-
-        // Build dynamic database config based on selected driver
-        if ($this->database['DRIVER'] === 'pdo_sqlite') {
-            $config['entity_manager']['connection']['path'] = self::SQLITE_DB_PATH;
-        } else {
-            $config['entity_manager']['connection']['user'] = $this->database['USER'];
-            $config['entity_manager']['connection']['password'] = $this->database['PASSWORD'];
-            $config['entity_manager']['connection']['dbname'] = $this->database['NAME'];
-            $config['entity_manager']['connection']['host'] = $this->database['HOST'];
-            $config['entity_manager']['connection']['port'] = $this->database['PORT'];
-
-            if ($this->database['DRIVER'] === 'pdo_mysql') {
-                $config['entity_manager']['connection']['driverOptions'] = [
-                    \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
-                ];
-            }
-        }
-
-        return $config;
-    }
-}

module/CLI/test/Command/Api/DisableKeyCommandTest.php

@@ -59,6 +59,6 @@ class DisableKeyCommandTest extends TestCase
             'apiKey' => $apiKey,
         ]);
         $output = $this->commandTester->getDisplay();
-        $this->assertEquals('API key "abcd1234" does not exist.' . PHP_EOL, $output);
+        $this->assertContains('API key "abcd1234" does not exist.', $output);
     }
 }

module/CLI/test/Command/Api/GenerateKeyCommandTest.php

@@ -3,10 +3,12 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
+use Cake\Chronos\Chronos;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Api\GenerateKeyCommand;
+use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -37,7 +39,8 @@ class GenerateKeyCommandTest extends TestCase
      */
     public function noExpirationDateIsDefinedIfNotProvided()
     {
-        $this->apiKeyService->create(null)->shouldBeCalledTimes(1);
+        $this->apiKeyService->create(null)->shouldBeCalledTimes(1)
+                                          ->willReturn(new ApiKey());
         $this->commandTester->execute([
             'command' => 'api-key:generate',
         ]);
@@ -46,9 +49,10 @@ class GenerateKeyCommandTest extends TestCase
     /**
      * @test
      */
-    public function expirationDateIsDefinedIfWhenProvided()
+    public function expirationDateIsDefinedIfProvided()
     {
-        $this->apiKeyService->create(Argument::type(\DateTime::class))->shouldBeCalledTimes(1);
+        $this->apiKeyService->create(Argument::type(Chronos::class))->shouldBeCalledTimes(1)
+                                                                    ->willReturn(new ApiKey());
         $this->commandTester->execute([
             'command' => 'api-key:generate',
             '--expirationDate' => '2016-01-01',

module/CLI/test/Command/Config/GenerateCharsetCommandTest.php

@@ -5,7 +5,6 @@ namespace ShlinkioTest\Shlink\CLI\Command\Config;
 
 use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Config\GenerateCharsetCommand;
-use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Zend\I18n\Translator\Translator;
@@ -32,7 +31,6 @@ class GenerateCharsetCommandTest extends TestCase
     public function charactersAreGeneratedFromDefault()
     {
         $prefix = 'Character set: ';
-        $prefixLength = strlen($prefix);
 
         $this->commandTester->execute([
             'command' => 'config:generate-charset',
@@ -40,13 +38,7 @@ class GenerateCharsetCommandTest extends TestCase
         $output = $this->commandTester->getDisplay();
 
         // Both default character set and the new one should have the same length
-        $this->assertEquals($prefixLength + strlen(UrlShortener::DEFAULT_CHARS) + 1, strlen($output));
-
-        // Both default character set and the new one should have the same characters
-        $charset = substr($output, $prefixLength, strlen(UrlShortener::DEFAULT_CHARS));
-        $orderedDefault = $this->orderStringLetters(UrlShortener::DEFAULT_CHARS);
-        $orderedCharset = $this->orderStringLetters($charset);
-        $this->assertEquals($orderedDefault, $orderedCharset);
+        $this->assertContains($prefix, $output);
     }
 
     protected function orderStringLetters($string)

module/CLI/test/Command/ShortUrl/DeleteShortCodeCommandTest.php

@@ -0,0 +1,120 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\DeleteShortUrlCommand;
+use Shlinkio\Shlink\Core\Exception;
+use Shlinkio\Shlink\Core\Service\ShortUrl\DeleteShortUrlServiceInterface;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Zend\I18n\Translator\Translator;
+
+class DeleteShortCodeCommandTest extends TestCase
+{
+    /**
+     * @var CommandTester
+     */
+    private $commandTester;
+    /**
+     * @var ObjectProphecy
+     */
+    private $service;
+
+    public function setUp()
+    {
+        $this->service = $this->prophesize(DeleteShortUrlServiceInterface::class);
+
+        $command = new DeleteShortUrlCommand($this->service->reveal(), Translator::factory([]));
+        $app = new Application();
+        $app->add($command);
+
+        $this->commandTester = new CommandTester($command);
+    }
+
+    /**
+     * @test
+     */
+    public function successMessageIsPrintedIfUrlIsProperlyDeleted()
+    {
+        $shortCode = 'abc123';
+        $deleteByShortCode = $this->service->deleteByShortCode($shortCode, false)->will(function () {
+        });
+
+        $this->commandTester->execute(['shortCode' => $shortCode]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains(\sprintf('Short URL with short code "%s" successfully deleted.', $shortCode), $output);
+        $deleteByShortCode->shouldHaveBeenCalledTimes(1);
+    }
+
+    /**
+     * @test
+     */
+    public function invalidShortCodePrintsMessage()
+    {
+        $shortCode = 'abc123';
+        $deleteByShortCode = $this->service->deleteByShortCode($shortCode, false)->willThrow(
+            Exception\InvalidShortCodeException::class
+        );
+
+        $this->commandTester->execute(['shortCode' => $shortCode]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains(\sprintf('Provided short code "%s" could not be found.', $shortCode), $output);
+        $deleteByShortCode->shouldHaveBeenCalledTimes(1);
+    }
+
+    /**
+     * @test
+     */
+    public function deleteIsRetriedWhenThresholdIsReachedAndQuestionIsAccepted()
+    {
+        $shortCode = 'abc123';
+        $deleteByShortCode = $this->service->deleteByShortCode($shortCode, Argument::type('bool'))->will(
+            function (array $args) {
+                $ignoreThreshold = \array_pop($args);
+
+                if (!$ignoreThreshold) {
+                    throw new Exception\DeleteShortUrlException(10);
+                }
+            }
+        );
+        $this->commandTester->setInputs(['yes']);
+
+        $this->commandTester->execute(['shortCode' => $shortCode]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains(\sprintf(
+            'It was not possible to delete the short URL with short code "%s" because it has more than 10 visits.',
+            $shortCode
+        ), $output);
+        $this->assertContains(\sprintf('Short URL with short code "%s" successfully deleted.', $shortCode), $output);
+        $deleteByShortCode->shouldHaveBeenCalledTimes(2);
+    }
+
+    /**
+     * @test
+     */
+    public function deleteIsNotRetriedWhenThresholdIsReachedAndQuestionIsDeclined()
+    {
+        $shortCode = 'abc123';
+        $deleteByShortCode = $this->service->deleteByShortCode($shortCode, false)->willThrow(
+            new Exception\DeleteShortUrlException(10)
+        );
+        $this->commandTester->setInputs(['no']);
+
+        $this->commandTester->execute(['shortCode' => $shortCode]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains(\sprintf(
+            'It was not possible to delete the short URL with short code "%s" because it has more than 10 visits.',
+            $shortCode
+        ), $output);
+        $this->assertContains('Short URL was not deleted.', $output);
+        $deleteByShortCode->shouldHaveBeenCalledTimes(1);
+    }
+}

module/CLI/test/Command/ShortUrl/GeneratePreviewCommandTest.php

@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\GeneratePreviewCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\GeneratePreviewCommand;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
 use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;

module/CLI/test/Command/ShortUrl/GenerateShortcodeCommandTest.php

@@ -1,12 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\GenerateShortcodeCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\GenerateShortUrlCommand;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Application;
@@ -27,7 +28,7 @@ class GenerateShortcodeCommandTest extends TestCase
     public function setUp()
     {
         $this->urlShortener = $this->prophesize(UrlShortener::class);
-        $command = new GenerateShortcodeCommand($this->urlShortener->reveal(), Translator::factory([]), [
+        $command = new GenerateShortUrlCommand($this->urlShortener->reveal(), Translator::factory([]), [
             'schema' => 'http',
             'hostname' => 'foo.com',
         ]);
@@ -41,8 +42,12 @@ class GenerateShortcodeCommandTest extends TestCase
      */
     public function properShortCodeIsCreatedIfLongUrlIsCorrect()
     {
-        $this->urlShortener->urlToShortCode(Argument::cetera())->willReturn('abc123')
-                                                               ->shouldBeCalledTimes(1);
+        $this->urlShortener->urlToShortCode(Argument::cetera())
+            ->willReturn(
+                (new ShortUrl())->setShortCode('abc123')
+                                ->setLongUrl('')
+            )
+            ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute([
             'command' => 'shortcode:generate',
@@ -65,8 +70,9 @@ class GenerateShortcodeCommandTest extends TestCase
             'longUrl' => 'http://domain.com/invalid',
         ]);
         $output = $this->commandTester->getDisplay();
-        $this->assertTrue(
-            strpos($output, 'Provided URL "http://domain.com/invalid" is invalid. Try with a different one.') === 0
+        $this->assertContains(
+            'Provided URL "http://domain.com/invalid" is invalid.',
+            $output
         );
     }
 }

module/CLI/test/Command/ShortUrl/GetVisitsCommandTest.php

@@ -1,14 +1,16 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
+use Cake\Chronos\Chronos;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\GetVisitsCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\GetVisitsCommand;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -57,7 +59,7 @@ class GetVisitsCommandTest extends TestCase
         $shortCode = 'abc123';
         $startDate = '2016-01-01';
         $endDate = '2016-02-01';
-        $this->visitsTracker->info($shortCode, new DateRange(new \DateTime($startDate), new \DateTime($endDate)))
+        $this->visitsTracker->info($shortCode, new DateRange(Chronos::parse($startDate), Chronos::parse($endDate)))
             ->willReturn([])
             ->shouldBeCalledTimes(1);
 
@@ -77,7 +79,7 @@ class GetVisitsCommandTest extends TestCase
         $shortCode = 'abc123';
         $this->visitsTracker->info($shortCode, Argument::any())->willReturn([
             (new Visit())->setReferer('foo')
-                         ->setRemoteAddr('1.2.3.4')
+                         ->setVisitLocation((new VisitLocation())->setCountryName('Spain'))
                          ->setUserAgent('bar'),
         ])->shouldBeCalledTimes(1);
 
@@ -86,8 +88,8 @@ class GetVisitsCommandTest extends TestCase
             'shortCode' => $shortCode,
         ]);
         $output = $this->commandTester->getDisplay();
-        $this->assertTrue(strpos($output, 'foo') > 0);
-        $this->assertTrue(strpos($output, '1.2.3.4') > 0);
-        $this->assertTrue(strpos($output, 'bar') > 0);
+        $this->assertGreaterThan(0, \strpos($output, 'foo'));
+        $this->assertGreaterThan(0, \strpos($output, 'Spain'));
+        $this->assertGreaterThan(0, \strpos($output, 'bar'));
     }
 }

module/CLI/test/Command/ShortUrl/ListShortcodesCommandTest.php

@@ -1,16 +1,15 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\ListShortcodesCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\ListShortUrlsCommand;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Tester\CommandTester;
 use Zend\I18n\Translator\Translator;
 use Zend\Paginator\Adapter\ArrayAdapter;
@@ -22,10 +21,6 @@ class ListShortcodesCommandTest extends TestCase
      * @var CommandTester
      */
     protected $commandTester;
-    /**
-     * @var QuestionHelper
-     */
-    protected $questionHelper;
     /**
      * @var ObjectProphecy
      */
@@ -35,10 +30,8 @@ class ListShortcodesCommandTest extends TestCase
     {
         $this->shortUrlService = $this->prophesize(ShortUrlServiceInterface::class);
         $app = new Application();
-        $command = new ListShortcodesCommand($this->shortUrlService->reveal(), Translator::factory([]));
+        $command = new ListShortUrlsCommand($this->shortUrlService->reveal(), Translator::factory([]), []);
         $app->add($command);
-
-        $this->questionHelper = $command->getHelper('question');
         $this->commandTester = new CommandTester($command);
     }
 
@@ -47,10 +40,10 @@ class ListShortcodesCommandTest extends TestCase
      */
     public function noInputCallsListJustOnce()
     {
-        $this->questionHelper->setInputStream($this->getInputStream('\n'));
         $this->shortUrlService->listShortUrls(1, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
                                                                 ->shouldBeCalledTimes(1);
 
+        $this->commandTester->setInputs(['n']);
         $this->commandTester->execute(['command' => 'shortcode:list']);
     }
 
@@ -61,22 +54,15 @@ class ListShortcodesCommandTest extends TestCase
     {
         // The paginator will return more than one page for the first 3 times
         $data = [];
-        for ($i = 0; $i < 30; $i++) {
-            $data[] = new ShortUrl();
+        for ($i = 0; $i < 50; $i++) {
+            $data[] = (new ShortUrl())->setLongUrl('url_' . $i);
         }
-        $data = array_chunk($data, 11);
 
-        $questionHelper = $this->questionHelper;
-        $that = $this;
-        $this->shortUrlService->listShortUrls(Argument::cetera())->will(function () use (
-            &$data,
-            $questionHelper,
-            $that
-        ) {
-            $questionHelper->setInputStream($that->getInputStream('y'));
-            return new Paginator(new ArrayAdapter(array_shift($data)));
+        $this->shortUrlService->listShortUrls(Argument::cetera())->will(function () use (&$data) {
+            return new Paginator(new ArrayAdapter($data));
         })->shouldBeCalledTimes(3);
 
+        $this->commandTester->setInputs(['y', 'y', 'n']);
         $this->commandTester->execute(['command' => 'shortcode:list']);
     }
 
@@ -88,13 +74,13 @@ class ListShortcodesCommandTest extends TestCase
         // The paginator will return more than one page
         $data = [];
         for ($i = 0; $i < 30; $i++) {
-            $data[] = new ShortUrl();
+            $data[] = (new ShortUrl())->setLongUrl('url_' . $i);
         }
 
-        $this->questionHelper->setInputStream($this->getInputStream('n'));
         $this->shortUrlService->listShortUrls(Argument::cetera())->willReturn(new Paginator(new ArrayAdapter($data)))
                                                                  ->shouldBeCalledTimes(1);
 
+        $this->commandTester->setInputs(['n']);
         $this->commandTester->execute(['command' => 'shortcode:list']);
     }
 
@@ -104,10 +90,10 @@ class ListShortcodesCommandTest extends TestCase
     public function passingPageWillMakeListStartOnThatPage()
     {
         $page = 5;
-        $this->questionHelper->setInputStream($this->getInputStream('\n'));
         $this->shortUrlService->listShortUrls($page, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
                                                                     ->shouldBeCalledTimes(1);
 
+        $this->commandTester->setInputs(['y']);
         $this->commandTester->execute([
             'command' => 'shortcode:list',
             '--page' => $page,
@@ -119,24 +105,15 @@ class ListShortcodesCommandTest extends TestCase
      */
     public function ifTagsFlagIsProvidedTagsColumnIsIncluded()
     {
-        $this->questionHelper->setInputStream($this->getInputStream('\n'));
         $this->shortUrlService->listShortUrls(1, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
                                                                 ->shouldBeCalledTimes(1);
 
+        $this->commandTester->setInputs(['y']);
         $this->commandTester->execute([
             'command' => 'shortcode:list',
             '--showTags' => true,
         ]);
         $output = $this->commandTester->getDisplay();
-        $this->assertTrue(strpos($output, 'Tags') > 0);
-    }
-
-    protected function getInputStream($inputData)
-    {
-        $stream = fopen('php://memory', 'r+', false);
-        fputs($stream, $inputData);
-        rewind($stream);
-
-        return $stream;
+        $this->assertContains('Tags', $output);
     }
 }

module/CLI/test/Command/ShortUrl/ResolveUrlCommandTest.php

@@ -1,11 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
+namespace ShlinkioTest\Shlink\CLI\Command\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\Shortcode\ResolveUrlCommand;
+use Shlinkio\Shlink\CLI\Command\ShortUrl\ResolveUrlCommand;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
@@ -41,7 +42,8 @@ class ResolveUrlCommandTest extends TestCase
     {
         $shortCode = 'abc123';
         $expectedUrl = 'http://domain.com/foo/bar';
-        $this->urlShortener->shortCodeToUrl($shortCode)->willReturn($expectedUrl)
+        $shortUrl = (new ShortUrl())->setLongUrl($expectedUrl);
+        $this->urlShortener->shortCodeToUrl($shortCode)->willReturn($shortUrl)
                                                        ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute([
@@ -66,7 +68,7 @@ class ResolveUrlCommandTest extends TestCase
             'shortCode' => $shortCode,
         ]);
         $output = $this->commandTester->getDisplay();
-        $this->assertEquals('Provided short code "' . $shortCode . '" could not be found.' . PHP_EOL, $output);
+        $this->assertContains('Provided short code "' . $shortCode . '" could not be found.', $output);
     }
 
     /**
@@ -83,6 +85,6 @@ class ResolveUrlCommandTest extends TestCase
             'shortCode' => $shortCode,
         ]);
         $output = $this->commandTester->getDisplay();
-        $this->assertEquals('Provided short code "' . $shortCode . '" has an invalid format.' . PHP_EOL, $output);
+        $this->assertContains('Provided short code "' . $shortCode . '" has an invalid format.', $output);
     }
 }

module/CLI/test/Command/Tag/CreateTagCommandTest.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -14,10 +15,6 @@ use Zend\I18n\Translator\Translator;
 
 class CreateTagCommandTest extends TestCase
 {
-    /**
-     * @var CreateTagCommand
-     */
-    private $command;
     /**
      * @var CommandTester
      */
@@ -56,14 +53,14 @@ class CreateTagCommandTest extends TestCase
     {
         $tagNames = ['foo', 'bar'];
         /** @var MethodProphecy $createTags */
-        $createTags = $this->tagService->createTags($tagNames)->willReturn([]);
+        $createTags = $this->tagService->createTags($tagNames)->willReturn(new ArrayCollection());
 
         $this->commandTester->execute([
             '--name' => $tagNames,
         ]);
         $output = $this->commandTester->getDisplay();
 
-        $this->assertContains(sprintf('Created tags: ["%s"]', implode('", "', $tagNames)), $output);
+        $this->assertContains('Tags properly created', $output);
         $createTags->shouldHaveBeenCalled();
     }
 }

module/CLI/test/Command/Tag/DeleteTagsCommandTest.php

@@ -64,7 +64,7 @@ class DeleteTagsCommandTest extends TestCase
         ]);
         $output = $this->commandTester->getDisplay();
 
-        $this->assertContains(sprintf('Deleted tags: ["%s"]', implode('", "', $tagNames)), $output);
+        $this->assertContains('Tags properly deleted', $output);
         $deleteTags->shouldHaveBeenCalled();
     }
 }

module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php

@@ -7,12 +7,15 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Visit\ProcessVisitsCommand;
-use Shlinkio\Shlink\Common\Service\IpLocationResolver;
+use Shlinkio\Shlink\Common\Service\IpApiLocationResolver;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Service\VisitService;
 use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\CommandTester;
 use Zend\I18n\Translator\Translator;
+use function count;
+use function round;
 
 class ProcessVisitsCommandTest extends TestCase
 {
@@ -32,7 +35,9 @@ class ProcessVisitsCommandTest extends TestCase
     public function setUp()
     {
         $this->visitService = $this->prophesize(VisitService::class);
-        $this->ipResolver = $this->prophesize(IpLocationResolver::class);
+        $this->ipResolver = $this->prophesize(IpApiLocationResolver::class);
+        $this->ipResolver->getApiLimit()->willReturn(10000000000);
+
         $command = new ProcessVisitsCommand(
             $this->visitService->reveal(),
             $this->ipResolver->reveal(),
@@ -65,15 +70,15 @@ class ProcessVisitsCommandTest extends TestCase
             'command' => 'visit:process',
         ]);
         $output = $this->commandTester->getDisplay();
-        $this->assertTrue(strpos($output, 'Processing IP 1.2.3.4') === 0);
-        $this->assertTrue(strpos($output, 'Processing IP 4.3.2.1') > 0);
-        $this->assertTrue(strpos($output, 'Processing IP 12.34.56.78') > 0);
+        $this->assertContains('Processing IP 1.2.3.0', $output);
+        $this->assertContains('Processing IP 4.3.2.0', $output);
+        $this->assertContains('Processing IP 12.34.56.0', $output);
     }
 
     /**
      * @test
      */
-    public function localhostAddressIsIgnored()
+    public function localhostAndEmptyAddressIsIgnored()
     {
         $visits = [
             (new Visit())->setRemoteAddr('1.2.3.4'),
@@ -81,18 +86,58 @@ class ProcessVisitsCommandTest extends TestCase
             (new Visit())->setRemoteAddr('12.34.56.78'),
             (new Visit())->setRemoteAddr('127.0.0.1'),
             (new Visit())->setRemoteAddr('127.0.0.1'),
+            (new Visit())->setRemoteAddr(''),
+            (new Visit())->setRemoteAddr(null),
         ];
         $this->visitService->getUnlocatedVisits()->willReturn($visits)
             ->shouldBeCalledTimes(1);
 
-        $this->visitService->saveVisit(Argument::any())->shouldBeCalledTimes(count($visits) - 2);
+        $this->visitService->saveVisit(Argument::any())->shouldBeCalledTimes(count($visits) - 4);
         $this->ipResolver->resolveIpLocation(Argument::any())->willReturn([])
-                                                             ->shouldBeCalledTimes(count($visits) - 2);
+                                                             ->shouldBeCalledTimes(count($visits) - 4);
+
+        $this->commandTester->execute([
+            'command' => 'visit:process',
+        ], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE]);
+        $output = $this->commandTester->getDisplay();
+        $this->assertContains('Ignored localhost address', $output);
+        $this->assertContains('Ignored visit with no IP address', $output);
+    }
+
+    /**
+     * @test
+     */
+    public function sleepsEveryTimeTheApiLimitIsReached()
+    {
+        $visits = [
+            (new Visit())->setRemoteAddr('1.2.3.4'),
+            (new Visit())->setRemoteAddr('4.3.2.1'),
+            (new Visit())->setRemoteAddr('12.34.56.78'),
+            (new Visit())->setRemoteAddr('1.2.3.4'),
+            (new Visit())->setRemoteAddr('4.3.2.1'),
+            (new Visit())->setRemoteAddr('12.34.56.78'),
+            (new Visit())->setRemoteAddr('1.2.3.4'),
+            (new Visit())->setRemoteAddr('4.3.2.1'),
+            (new Visit())->setRemoteAddr('12.34.56.78'),
+            (new Visit())->setRemoteAddr('4.3.2.1'),
+        ];
+        $apiLimit = 3;
+
+        $this->visitService->getUnlocatedVisits()->willReturn($visits);
+        $this->visitService->saveVisit(Argument::any())->will(function () {
+        });
+
+        $getApiLimit = $this->ipResolver->getApiLimit()->willReturn($apiLimit);
+        $getApiInterval = $this->ipResolver->getApiInterval()->willReturn(0);
+        $resolveIpLocation = $this->ipResolver->resolveIpLocation(Argument::any())->willReturn([])
+            ->shouldBeCalledTimes(count($visits));
 
         $this->commandTester->execute([
             'command' => 'visit:process',
         ]);
-        $output = $this->commandTester->getDisplay();
-        $this->assertTrue(strpos($output, 'Ignored localhost address') > 0);
+
+        $getApiLimit->shouldHaveBeenCalledTimes(count($visits));
+        $getApiInterval->shouldHaveBeenCalledTimes(round(count($visits) / $apiLimit));
+        $resolveIpLocation->shouldHaveBeenCalledTimes(count($visits));
     }
 }

module/CLI/test/Install/Plugin/ApplicationConfigCustomizerPluginTest.php

@@ -1,95 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Install\Plugin\ApplicationConfigCustomizerPlugin;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-
-class ApplicationConfigCustomizerPluginTest extends TestCase
-{
-    /**
-     * @var ApplicationConfigCustomizerPlugin
-     */
-    private $plugin;
-    /**
-     * @var ObjectProphecy
-     */
-    private $questionHelper;
-
-    public function setUp()
-    {
-        $this->questionHelper = $this->prophesize(QuestionHelper::class);
-        $this->plugin = new ApplicationConfigCustomizerPlugin($this->questionHelper->reveal());
-    }
-
-    /**
-     * @test
-     */
-    public function configIsRequestedToTheUser()
-    {
-        /** @var MethodProphecy $askSecret */
-        $askSecret = $this->questionHelper->ask(Argument::cetera())->willReturn('the_secret');
-        $config = new CustomizableAppConfig();
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertTrue($config->hasApp());
-        $this->assertEquals([
-            'SECRET' => 'the_secret',
-        ], $config->getApp());
-        $askSecret->shouldHaveBeenCalledTimes(1);
-    }
-
-    /**
-     * @test
-     */
-    public function overwriteIsRequestedIfValueIsAlreadySet()
-    {
-        /** @var MethodProphecy $ask */
-        $ask = $this->questionHelper->ask(Argument::cetera())->will(function (array $args) {
-            $last = array_pop($args);
-            return $last instanceof ConfirmationQuestion ? false : 'the_new_secret';
-        });
-        $config = new CustomizableAppConfig();
-        $config->setApp([
-            'SECRET' => 'foo',
-        ]);
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertEquals([
-            'SECRET' => 'the_new_secret',
-        ], $config->getApp());
-        $ask->shouldHaveBeenCalledTimes(2);
-    }
-
-    /**
-     * @test
-     */
-    public function existingValueIsKeptIfRequested()
-    {
-        /** @var MethodProphecy $ask */
-        $ask = $this->questionHelper->ask(Argument::cetera())->willReturn(true);
-
-        $config = new CustomizableAppConfig();
-        $config->setApp([
-            'SECRET' => 'foo',
-        ]);
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertEquals([
-            'SECRET' => 'foo',
-        ], $config->getApp());
-        $ask->shouldHaveBeenCalledTimes(1);
-    }
-}

module/CLI/test/Install/Plugin/DatabaseConfigCustomizerPluginTest.php

@@ -1,154 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\Filesystem\Filesystem;
-
-class DatabaseConfigCustomizerPluginTest extends TestCase
-{
-    /**
-     * @var DatabaseConfigCustomizerPlugin
-     */
-    private $plugin;
-    /**
-     * @var ObjectProphecy
-     */
-    private $questionHelper;
-    /**
-     * @var ObjectProphecy
-     */
-    private $filesystem;
-
-    public function setUp()
-    {
-        $this->questionHelper = $this->prophesize(QuestionHelper::class);
-        $this->filesystem = $this->prophesize(Filesystem::class);
-
-        $this->plugin = new DatabaseConfigCustomizerPlugin(
-            $this->questionHelper->reveal(),
-            $this->filesystem->reveal()
-        );
-    }
-
-    /**
-     * @test
-     */
-    public function configIsRequestedToTheUser()
-    {
-        /** @var MethodProphecy $askSecret */
-        $askSecret = $this->questionHelper->ask(Argument::cetera())->willReturn('MySQL');
-        $config = new CustomizableAppConfig();
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertTrue($config->hasDatabase());
-        $this->assertEquals([
-            'DRIVER' => 'pdo_mysql',
-            'NAME' => 'MySQL',
-            'USER' => 'MySQL',
-            'PASSWORD' => 'MySQL',
-            'HOST' => 'MySQL',
-            'PORT' => 'MySQL',
-        ], $config->getDatabase());
-        $askSecret->shouldHaveBeenCalledTimes(6);
-    }
-
-    /**
-     * @test
-     */
-    public function overwriteIsRequestedIfValueIsAlreadySet()
-    {
-        /** @var MethodProphecy $ask */
-        $ask = $this->questionHelper->ask(Argument::cetera())->will(function (array $args) {
-            $last = array_pop($args);
-            return $last instanceof ConfirmationQuestion ? false : 'MySQL';
-        });
-        $config = new CustomizableAppConfig();
-        $config->setDatabase([
-            'DRIVER' => 'pdo_pgsql',
-            'NAME' => 'MySQL',
-            'USER' => 'MySQL',
-            'PASSWORD' => 'MySQL',
-            'HOST' => 'MySQL',
-            'PORT' => 'MySQL',
-        ]);
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertEquals([
-            'DRIVER' => 'pdo_mysql',
-            'NAME' => 'MySQL',
-            'USER' => 'MySQL',
-            'PASSWORD' => 'MySQL',
-            'HOST' => 'MySQL',
-            'PORT' => 'MySQL',
-        ], $config->getDatabase());
-        $ask->shouldHaveBeenCalledTimes(7);
-    }
-
-    /**
-     * @test
-     */
-    public function existingValueIsKeptIfRequested()
-    {
-        /** @var MethodProphecy $ask */
-        $ask = $this->questionHelper->ask(Argument::cetera())->willReturn(true);
-
-        $config = new CustomizableAppConfig();
-        $config->setDatabase([
-            'DRIVER' => 'pdo_pgsql',
-            'NAME' => 'MySQL',
-            'USER' => 'MySQL',
-            'PASSWORD' => 'MySQL',
-            'HOST' => 'MySQL',
-            'PORT' => 'MySQL',
-        ]);
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertEquals([
-            'DRIVER' => 'pdo_pgsql',
-            'NAME' => 'MySQL',
-            'USER' => 'MySQL',
-            'PASSWORD' => 'MySQL',
-            'HOST' => 'MySQL',
-            'PORT' => 'MySQL',
-        ], $config->getDatabase());
-        $ask->shouldHaveBeenCalledTimes(1);
-    }
-
-    /**
-     * @test
-     */
-    public function sqliteDatabaseIsImportedWhenRequested()
-    {
-        /** @var MethodProphecy $ask */
-        $ask = $this->questionHelper->ask(Argument::cetera())->willReturn(true);
-        /** @var MethodProphecy $copy */
-        $copy = $this->filesystem->copy(Argument::cetera())->willReturn(null);
-
-        $config = new CustomizableAppConfig();
-        $config->setDatabase([
-            'DRIVER' => 'pdo_sqlite',
-        ]);
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertEquals([
-            'DRIVER' => 'pdo_sqlite',
-        ], $config->getDatabase());
-        $ask->shouldHaveBeenCalledTimes(1);
-        $copy->shouldHaveBeenCalledTimes(1);
-    }
-}

module/CLI/test/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactoryTest.php

@@ -1,40 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\CLI\Install\Plugin\Factory;
-
-use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\CLI\Install\Plugin\ApplicationConfigCustomizerPlugin;
-use Shlinkio\Shlink\CLI\Install\Plugin\Factory\DefaultConfigCustomizerPluginFactory;
-use Shlinkio\Shlink\CLI\Install\Plugin\LanguageConfigCustomizerPlugin;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Zend\ServiceManager\ServiceManager;
-
-class DefaultConfigCustomizerPluginFactoryTest extends TestCase
-{
-    /**
-     * @var DefaultConfigCustomizerPluginFactory
-     */
-    protected $factory;
-
-    public function setUp()
-    {
-        $this->factory = new DefaultConfigCustomizerPluginFactory();
-    }
-
-    /**
-     * @test
-     */
-    public function createsProperService()
-    {
-        $instance = $this->factory->__invoke(new ServiceManager(['services' => [
-            QuestionHelper::class => $this->prophesize(QuestionHelper::class)->reveal(),
-        ]]), ApplicationConfigCustomizerPlugin::class);
-        $this->assertInstanceOf(ApplicationConfigCustomizerPlugin::class, $instance);
-
-        $instance = $this->factory->__invoke(new ServiceManager(['services' => [
-            QuestionHelper::class => $this->prophesize(QuestionHelper::class)->reveal(),
-        ]]), LanguageConfigCustomizerPlugin::class);
-        $this->assertInstanceOf(LanguageConfigCustomizerPlugin::class, $instance);
-    }
-}

module/CLI/test/Install/Plugin/LanguageConfigCustomizerPluginTest.php

@@ -1,100 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Install\Plugin\LanguageConfigCustomizerPlugin;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-
-class LanguageConfigCustomizerPluginTest extends TestCase
-{
-    /**
-     * @var LanguageConfigCustomizerPlugin
-     */
-    protected $plugin;
-    /**
-     * @var ObjectProphecy
-     */
-    protected $questionHelper;
-
-    public function setUp()
-    {
-        $this->questionHelper = $this->prophesize(QuestionHelper::class);
-        $this->plugin = new LanguageConfigCustomizerPlugin($this->questionHelper->reveal());
-    }
-
-    /**
-     * @test
-     */
-    public function configIsRequestedToTheUser()
-    {
-        /** @var MethodProphecy $askSecret */
-        $askSecret = $this->questionHelper->ask(Argument::cetera())->willReturn('en');
-        $config = new CustomizableAppConfig();
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertTrue($config->hasLanguage());
-        $this->assertEquals([
-            'DEFAULT' => 'en',
-            'CLI' => 'en',
-        ], $config->getLanguage());
-        $askSecret->shouldHaveBeenCalledTimes(2);
-    }
-
-    /**
-     * @test
-     */
-    public function overwriteIsRequestedIfValueIsAlreadySet()
-    {
-        /** @var MethodProphecy $ask */
-        $ask = $this->questionHelper->ask(Argument::cetera())->will(function (array $args) {
-            $last = array_pop($args);
-            return $last instanceof ConfirmationQuestion ? false : 'es';
-        });
-        $config = new CustomizableAppConfig();
-        $config->setLanguage([
-            'DEFAULT' => 'en',
-            'CLI' => 'en',
-        ]);
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertEquals([
-            'DEFAULT' => 'es',
-            'CLI' => 'es',
-        ], $config->getLanguage());
-        $ask->shouldHaveBeenCalledTimes(3);
-    }
-
-    /**
-     * @test
-     */
-    public function existingValueIsKeptIfRequested()
-    {
-        /** @var MethodProphecy $ask */
-        $ask = $this->questionHelper->ask(Argument::cetera())->willReturn(true);
-
-        $config = new CustomizableAppConfig();
-        $config->setLanguage([
-            'DEFAULT' => 'es',
-            'CLI' => 'es',
-        ]);
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertEquals([
-            'DEFAULT' => 'es',
-            'CLI' => 'es',
-        ], $config->getLanguage());
-        $ask->shouldHaveBeenCalledTimes(1);
-    }
-}

module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerPluginTest.php

@@ -1,110 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
-
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Install\Plugin\UrlShortenerConfigCustomizerPlugin;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-
-class UrlShortenerConfigCustomizerPluginTest extends TestCase
-{
-    /**
-     * @var UrlShortenerConfigCustomizerPlugin
-     */
-    private $plugin;
-    /**
-     * @var ObjectProphecy
-     */
-    private $questionHelper;
-
-    public function setUp()
-    {
-        $this->questionHelper = $this->prophesize(QuestionHelper::class);
-        $this->plugin = new UrlShortenerConfigCustomizerPlugin($this->questionHelper->reveal());
-    }
-
-    /**
-     * @test
-     */
-    public function configIsRequestedToTheUser()
-    {
-        /** @var MethodProphecy $askSecret */
-        $askSecret = $this->questionHelper->ask(Argument::cetera())->willReturn('something');
-        $config = new CustomizableAppConfig();
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertTrue($config->hasUrlShortener());
-        $this->assertEquals([
-            'SCHEMA' => 'something',
-            'HOSTNAME' => 'something',
-            'CHARS' => 'something',
-            'VALIDATE_URL' => 'something',
-        ], $config->getUrlShortener());
-        $askSecret->shouldHaveBeenCalledTimes(4);
-    }
-
-    /**
-     * @test
-     */
-    public function overwriteIsRequestedIfValueIsAlreadySet()
-    {
-        /** @var MethodProphecy $ask */
-        $ask = $this->questionHelper->ask(Argument::cetera())->will(function (array $args) {
-            $last = array_pop($args);
-            return $last instanceof ConfirmationQuestion ? false : 'foo';
-        });
-        $config = new CustomizableAppConfig();
-        $config->setUrlShortener([
-            'SCHEMA' => 'bar',
-            'HOSTNAME' => 'bar',
-            'CHARS' => 'bar',
-            'VALIDATE_URL' => 'bar',
-        ]);
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertEquals([
-            'SCHEMA' => 'foo',
-            'HOSTNAME' => 'foo',
-            'CHARS' => 'foo',
-            'VALIDATE_URL' => false,
-        ], $config->getUrlShortener());
-        $ask->shouldHaveBeenCalledTimes(5);
-    }
-
-    /**
-     * @test
-     */
-    public function existingValueIsKeptIfRequested()
-    {
-        /** @var MethodProphecy $ask */
-        $ask = $this->questionHelper->ask(Argument::cetera())->willReturn(true);
-
-        $config = new CustomizableAppConfig();
-        $config->setUrlShortener([
-            'SCHEMA' => 'foo',
-            'HOSTNAME' => 'foo',
-            'CHARS' => 'foo',
-            'VALIDATE_URL' => 'foo',
-        ]);
-
-        $this->plugin->process(new ArrayInput([]), new NullOutput(), $config);
-
-        $this->assertEquals([
-            'SCHEMA' => 'foo',
-            'HOSTNAME' => 'foo',
-            'CHARS' => 'foo',
-            'VALIDATE_URL' => 'foo',
-        ], $config->getUrlShortener());
-        $ask->shouldHaveBeenCalledTimes(1);
-    }
-}

module/Common/config/dependencies.config.php

@@ -1,16 +1,14 @@
 <?php
 declare(strict_types=1);
 
+namespace Shlinkio\Shlink\Common;
+
 use Doctrine\Common\Cache\Cache;
 use Doctrine\ORM\EntityManager;
+use GuzzleHttp\Client as GuzzleClient;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
-use Shlinkio\Shlink\Common\Factory;
-use Shlinkio\Shlink\Common\Image;
-use Shlinkio\Shlink\Common\Image\ImageBuilder;
-use Shlinkio\Shlink\Common\Middleware\LocaleMiddleware;
-use Shlinkio\Shlink\Common\Service;
-use Shlinkio\Shlink\Common\Template\Extension\TranslatorExtension;
+use RKA\Middleware\IpAddress;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\I18n\Translator\Translator;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
@@ -21,23 +19,25 @@ return [
     'dependencies' => [
         'factories' => [
             EntityManager::class => Factory\EntityManagerFactory::class,
-            GuzzleHttp\Client::class => InvokableFactory::class,
+            GuzzleClient::class => InvokableFactory::class,
             Cache::class => Factory\CacheFactory::class,
             'Logger_Shlink' => Factory\LoggerFactory::class,
             Filesystem::class => InvokableFactory::class,
 
             Translator::class => Factory\TranslatorFactory::class,
-            TranslatorExtension::class => ConfigAbstractFactory::class,
-            LocaleMiddleware::class => ConfigAbstractFactory::class,
+            Template\Extension\TranslatorExtension::class => ConfigAbstractFactory::class,
+
+            Middleware\LocaleMiddleware::class => ConfigAbstractFactory::class,
+            IpAddress::class => Middleware\IpAddressMiddlewareFactory::class,
 
             Image\ImageBuilder::class => Image\ImageBuilderFactory::class,
 
-            Service\IpLocationResolver::class => ConfigAbstractFactory::class,
+            Service\IpApiLocationResolver::class => ConfigAbstractFactory::class,
             Service\PreviewGenerator::class => ConfigAbstractFactory::class,
         ],
         'aliases' => [
             'em' => EntityManager::class,
-            'httpClient' => GuzzleHttp\Client::class,
+            'httpClient' => GuzzleClient::class,
             'translator' => Translator::class,
             'logger' => LoggerInterface::class,
             Logger::class => 'Logger_Shlink',
@@ -49,11 +49,11 @@ return [
     ],
 
     ConfigAbstractFactory::class => [
-        TranslatorExtension::class => ['translator'],
-        LocaleMiddleware::class => ['translator'],
-        Service\IpLocationResolver::class => ['httpClient'],
+        Template\Extension\TranslatorExtension::class => ['translator'],
+        Middleware\LocaleMiddleware::class => ['translator'],
+        Service\IpApiLocationResolver::class => ['httpClient'],
         Service\PreviewGenerator::class => [
-            ImageBuilder::class,
+            Image\ImageBuilder::class,
             Filesystem::class,
             'config.preview_generation.files_location',
         ],

module/Common/functions/functions.php

@@ -3,6 +3,17 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Common;
 
+use const JSON_ERROR_NONE;
+use function array_key_exists;
+use function array_shift;
+use function getenv;
+use function in_array;
+use function is_array;
+use function json_last_error;
+use function json_last_error_msg;
+use function strtolower;
+use function trim;
+
 /**
  * Gets the value of an environment variable. Supports boolean, empty and null.
  * This is basically Laravel's env helper
@@ -36,3 +47,54 @@ function env($key, $default = null)
 
     return trim($value);
 }
+
+function contains($needle, array $haystack): bool
+{
+    return in_array($needle, $haystack, true);
+}
+
+function json_decode(string $json, int $depth = 512, int $options = 0): array
+{
+    $data = \json_decode($json, true, $depth, $options);
+    if (JSON_ERROR_NONE !== json_last_error()) {
+        throw new Exception\InvalidArgumentException('Error decoding JSON: ' . json_last_error_msg());
+    }
+
+    return $data;
+}
+
+function array_path_exists(array $path, array $array): bool
+{
+    // As soon as a step is not found, the path does not exist
+    $step = array_shift($path);
+    if (! array_key_exists($step, $array)) {
+        return false;
+    }
+
+    // Once the path is empty, we have found all the parts in the path
+    if (empty($path)) {
+        return true;
+    }
+
+    // If current value is not an array, then we have not found the path
+    $newArray = $array[$step];
+    if (! is_array($newArray)) {
+        return false;
+    }
+
+    return array_path_exists($path, $newArray);
+}
+
+function array_get_path(array $path, array $array)
+{
+    do {
+        $step = array_shift($path);
+        if (! is_array($array) || ! array_key_exists($step, $array)) {
+            return null;
+        }
+
+        $array = $array[$step];
+    } while (! empty($path));
+
+    return $array;
+}

module/Common/src/Entity/AbstractEntity.php

@@ -8,26 +8,19 @@ use Doctrine\ORM\Mapping as ORM;
 abstract class AbstractEntity
 {
     /**
-     * @var int
+     * @var string
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      * @ORM\Column(name="id", type="bigint", options={"unsigned"=true})
      */
     protected $id;
 
-    /**
-     * @return int
-     */
-    public function getId()
+    public function getId(): string
     {
         return $this->id;
     }
 
-    /**
-     * @param int $id
-     * @return $this
-     */
-    public function setId($id)
+    public function setId(string $id): self
     {
         $this->id = $id;
         return $this;

module/Common/src/Exception/ExceptionInterface.php

@@ -3,6 +3,6 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Common\Exception;
 
-interface ExceptionInterface
+interface ExceptionInterface extends \Throwable
 {
 }