Merge pull request #111 from shlinkio/develop

Develop

.gitattributes

@@ -0,0 +1,24 @@
+/data/infra export-ignore
+/docs export-ignore
+/module/CLI/test export-ignore
+/module/CLI/test-resources export-ignore
+/module/Common/test export-ignore
+/module/Common/test-func export-ignore
+/module/Core/test export-ignore
+/module/Core/test-func export-ignore
+/module/Rest/test export-ignore
+.env.dist export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.phpstorm.meta.php export-ignore
+.scrutinizer.yml export-ignore
+.travis.yml export-ignore
+build.sh export-ignore
+CHANGELOG.md export-ignore
+docker-compose.override.yml.dist export-ignore
+docker-compose.yml export-ignore
+func_tests_bootstrap.php export-ignore
+indocker export-ignore
+phpcs.xml export-ignore
+phpunit.xml.dist export-ignore
+phpunit-func.xml export-ignore

.gitignore

@@ -4,3 +4,5 @@ composer.lock
 vendor/
 .env
 data/database.sqlite
+docs/swagger-ui
+docker-compose.override.yml

.phpstorm.meta.php

@@ -1,7 +1,8 @@
 <?php
 namespace PHPSTORM_META;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
+use Zend\ServiceManager\ServiceManager;
 
 /**
  * PhpStorm Container Interop code completion
@@ -16,4 +17,7 @@ $STATIC_METHOD_TYPES = [
     ContainerInterface::get('') => [
         '' == '@',
     ],
+    ServiceManager::build('') => [
+        '' == '@',
+    ],
 ];

.travis-php.ini

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

.travis.yml

@@ -6,11 +6,13 @@ branches:
     - develop
 
 php:
-  - 5.6
   - 7
   - 7.1
+  - 7.2
 
-before_install: phpenv config-add .travis-php.ini
+before_install:
+  - phpenv config-add data/infra/travis-php/memcached.ini
+  - phpenv config-add data/infra/travis-php/apcu.ini
 
 before_script:
   - composer self-update
@@ -21,6 +23,7 @@ script:
   - composer check
 
 after_script:
+  - 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
 

CHANGELOG.md

@@ -1,88 +1,193 @@
 ## CHANGELOG
 
+### 1.6.2
+
+**Bugs**
+
+* [109: Fix installation error due to typo in latest migration](https://github.com/shlinkio/shlink/issues/109)
+
+### 1.6.1
+
+**Tasks**
+
+* [110: Create gitattributes file to define files to be excluded from distributable package](https://github.com/shlinkio/shlink/issues/110)
+
+### 1.6.0
+
+**Features**
+
+* [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)
+
+**Enhancements:**
+
+* [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)
+
+**Tasks**
+
+* [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)
+
+**Bugs**
+
+* [103: Make NotFoundDelegate return proper content types based on accepted content](https://github.com/shlinkio/shlink/issues/103)
+
+### 1.5.0
+
+**Enhancements:**
+
+* [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)
+
+**Tasks**
+
+* [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**
+
+* [92: Fix formatted dates, using an ISO compliant format](https://github.com/shlinkio/shlink/issues/92)
+
+### 1.4.0
+
+**Enhancements:**
+
+* [89: Update to expressive 2](https://github.com/shlinkio/shlink/issues/89)
+
+### 1.3.1
+
+**Tasks**
+
+* [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)
+
+**Bugs**
+
+* [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)
+
+### 1.3.0
+
+**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)
+
+**Tasks**
+
+* [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)
+
+### 1.2.2
+
+**Bugs**
+
+* Fixed minor bugs on CORS requests
+
+### 1.2.1
+
+**Bugs**
+
+* [62: Fix cross-domain requests in REST API](https://github.com/shlinkio/shlink/issues/62)
+
 ### 1.2.0
 
 **Features**
 
-* [45: Allow to define tags on short codes, to improve filtering and classification](https://github.com/acelaya/url-shortener/issues/45)
+* [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/acelaya/url-shortener/issues/7)
+* [7: Add website previews while listing available URLs](https://github.com/shlinkio/shlink/issues/7)
 
 **Enhancements:**
 
-* [57: Add database migrations system to improve updating between versions](https://github.com/acelaya/url-shortener/issues/57)
+* [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/acelaya/url-shortener/issues/31)
+* [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/acelaya/url-shortener/issues/51)
+* [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/acelaya/url-shortener/issues/38)
+* [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)
 
 **Tasks**
 
-* [55: Create update script which does not try to create a new database](https://github.com/acelaya/url-shortener/issues/55)
+* [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/acelaya/url-shortener/issues/54)
+* [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/acelaya/url-shortener/issues/29)
+* [29: Use the acelaya/ze-content-based-error-handler package instead of custom error handler implementation](https://github.com/shlinkio/shlink/issues/29)
 
 **Bugs**
 
-* [53: Fix entities database interoperability](https://github.com/acelaya/url-shortener/issues/53)
+* [53: Fix entities database interoperability](https://github.com/shlinkio/shlink/issues/53)
-* [52: Add missing htaccess file for apache environments](https://github.com/acelaya/url-shortener/issues/52)
+* [52: Add missing htaccess file for apache environments](https://github.com/shlinkio/shlink/issues/52)
 
 ### 1.1.0
 
 **Features**
 
-* [46: Define a route that returns a QR code representing the shortened URL](https://github.com/acelaya/url-shortener/issues/46)
+* [46: Define a route that returns a QR code representing the shortened URL](https://github.com/shlinkio/shlink/issues/46)
 
 **Enhancements:**
 
-* [32: Add support for other cache adapters by improving the Cache factory](https://github.com/acelaya/url-shortener/issues/32)
+* [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/acelaya/url-shortener/issues/14)
+* [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/acelaya/url-shortener/issues/41)
+* [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/acelaya/url-shortener/issues/13)
+* [13: Improve REST authentication](https://github.com/shlinkio/shlink/issues/13)
 
 **Tasks**
 
-* [39: Change copyright from "Alejandro Celaya" to "Shlink" in error pages](https://github.com/acelaya/url-shortener/issues/39)
+* [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/acelaya/url-shortener/issues/42)
+* [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/acelaya/url-shortener/issues/35)
+* [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)
 
 **Bugs**
 
-* [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/acelaya/url-shortener/issues/40)
+* [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)
 
 ### 1.0.0
 
 **Enhancements:**
 
-* [33: Create a command to generate a short code charset by randomizing the default one](https://github.com/acelaya/url-shortener/issues/33)
+* [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/acelaya/url-shortener/issues/15)
+* [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/acelaya/url-shortener/issues/23)
+* [23: Translate application literals](https://github.com/shlinkio/shlink/issues/23)
-* [21: Allow to filter visits by date range](https://github.com/acelaya/url-shortener/issues/21)
+* [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/acelaya/url-shortener/issues/22)
+* [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/acelaya/url-shortener/issues/20)
+* [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/acelaya/url-shortener/issues/11)
+* [11: Separate code into multiple modules](https://github.com/shlinkio/shlink/issues/11)
-* [18: Group routable middleware in an Action namespace](https://github.com/acelaya/url-shortener/issues/18)
+* [18: Group routable middleware in an Action namespace](https://github.com/shlinkio/shlink/issues/18)
 
 **Tasks**
 
-* [36: Remove hhvm from the CI matrix since it doesn't support array constants and will fail](https://github.com/acelaya/url-shortener/issues/36)
+* [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/acelaya/url-shortener/issues/4)
+* [4: Installation steps](https://github.com/shlinkio/shlink/issues/4)
-* [6: Remove dependency on expressive helpers package](https://github.com/acelaya/url-shortener/issues/6)
+* [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/acelaya/url-shortener/issues/30)
+* [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/acelaya/url-shortener/issues/12)
+* [12: Improve code coverage](https://github.com/shlinkio/shlink/issues/12)
-* [25: Replace "Middleware" suffix on routable middlewares by "Action"](https://github.com/acelaya/url-shortener/issues/25)
+* [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/acelaya/url-shortener/issues/19)
+* [19: Update the vendor and app namespace from Acelaya\UrlShortener to Shlinkio\Shlink](https://github.com/shlinkio/shlink/issues/19)
 
 **Bugs**
 
-* [24: Prevent duplicated shortcodes errors because of the case insensitive behavior on MySQL](https://github.com/acelaya/url-shortener/issues/24)
+* [24: Prevent duplicated shortcodes errors because of the case insensitive behavior on MySQL](https://github.com/shlinkio/shlink/issues/24)
 
 ### 0.2.0
 
 **Enhancements:**
 
-* [9: Use symfony/console to dispatch console requests, instead of trying to integrate the process with expressive](https://github.com/acelaya/url-shortener/issues/9)
+* [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/acelaya/url-shortener/issues/8)
+* [8: Create a REST API](https://github.com/shlinkio/shlink/issues/8)
-* [10: Add more CLI functionality](https://github.com/acelaya/url-shortener/issues/10)
+* [10: Add more CLI functionality](https://github.com/shlinkio/shlink/issues/10)
 
 **Tasks**
 
-* [5: Create CHANGELOG file](https://github.com/acelaya/url-shortener/issues/5)
+* [5: Create CHANGELOG file](https://github.com/shlinkio/shlink/issues/5)

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Alejandro Celaya
+Copyright (c) 2017 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

bin/cli

@@ -5,7 +5,4 @@ use Symfony\Component\Console\Application as CliApp;
 
 /** @var ContainerInterface $container */
 $container = include __DIR__ . '/../config/container.php';
-
+$container->get(CliApp::class)->run();
-/** @var CliApp $app */
-$app = $container->get(CliApp::class);
-$app->run();

bin/install

@@ -1,14 +1,30 @@
 #!/usr/bin/env php
 <?php
-use Shlinkio\Shlink\CLI\Command\Install\InstallCommand;
+use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
+use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
 use Symfony\Component\Console\Application;
-use Zend\Config\Writer\PhpArray;
+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;
 
 chdir(dirname(__DIR__));
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$app = new Application();
+$container = new ServiceManager([
-$app->add(new InstallCommand(new PhpArray()));
+    'factories' => [
-$app->setDefaultCommand('shlink:install');
+        Application::class => InstallApplicationFactory::class,
-$app->run();
+        Filesystem::class => InvokableFactory::class,
+        QuestionHelper::class => InvokableFactory::class,
+    ],
+    'services' => [
+        'config' => [
+            ConfigAbstractFactory::class => [
+                DatabaseConfigCustomizerPlugin::class => [QuestionHelper::class, Filesystem::class]
+            ],
+        ],
+    ],
+]);
+$container->build(Application::class)->run();

bin/update

@@ -1,14 +1,30 @@
 #!/usr/bin/env php
 <?php
-use Shlinkio\Shlink\CLI\Command\Install\UpdateCommand;
+use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
+use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
 use Symfony\Component\Console\Application;
-use Zend\Config\Writer\PhpArray;
+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;
 
 chdir(dirname(__DIR__));
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$app = new Application();
+$container = new ServiceManager([
-$app->add(new UpdateCommand(new PhpArray()));
+    'factories' => [
-$app->setDefaultCommand('shlink:install');
+        Application::class => InstallApplicationFactory::class,
-$app->run();
+        Filesystem::class => InvokableFactory::class,
+        QuestionHelper::class => InvokableFactory::class,
+    ],
+    'services' => [
+        'config' => [
+            ConfigAbstractFactory::class => [
+                DatabaseConfigCustomizerPlugin::class => [QuestionHelper::class, Filesystem::class]
+            ],
+        ],
+    ],
+]);
+$container->build(Application::class, ['isUpdate' => true])->run();

build.sh

@@ -8,21 +8,22 @@ if [ "$#" -ne 1 ]; then
 fi
 
 version=$1
-builtcontent=$(readlink -f '../shlink_build_tmp')
+builtcontent=$(readlink -f "../shlink_${version}_dist")
 projectdir=$(pwd)
 
 # 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}"
 cd "${builtcontent}"
 
 # Install dependencies
-rm -r vendor
+rm -rf vendor
-rm composer.lock
+rm -f composer.lock
 composer self-update
-composer install --no-dev --optimize-autoloader
+composer install --no-dev --optimize-autoloader --no-progress --no-interaction
 
 # Delete development files
 echo 'Deleting dev files...'
@@ -30,15 +31,18 @@ rm build.sh
 rm CHANGELOG.md
 rm composer.*
 rm LICENSE
+rm indocker
+rm docker-compose.yml
 rm php*
 rm README.md
-rm -r build
+rm -rf build
-rm -f data/database.sqlite
+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}
 
 # Compressing file
 rm -f "${projectdir}"/build/shlink_${version}_dist.zip
-zip -r "${projectdir}"/build/shlink_${version}_dist.zip .
+zip -ry "${projectdir}"/build/shlink_${version}_dist.zip "../shlink_${version}_dist"
 rm -rf "${builtcontent}"

composer.json

@@ -1,48 +1,59 @@
 {
     "name": "shlinkio/shlink",
     "type": "project",
-    "homepage": "http://shlink.io",
+    "homepage": "https://shlink.io",
     "description": "A self-hosted and PHP-based URL shortener application with CLI and REST interfaces",
     "license": "MIT",
     "authors": [
         {
             "name": "Alejandro Celaya Alastrué",
-            "homepage": "http://www.alejandrocelaya.com",
+            "homepage": "https://www.alejandrocelaya.com",
             "email": "alejandro@alejandrocelaya.com"
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.0",
-        "zendframework/zend-expressive": "^1.0",
+        "acelaya/ze-content-based-error-handler": "^2.0",
-        "zendframework/zend-expressive-fastroute": "^1.1",
+        "cocur/slugify": "^3.0",
-        "zendframework/zend-expressive-twigrenderer": "^1.0",
+        "doctrine/annotations": "^1.4 <1.5",
-        "zendframework/zend-stdlib": "^2.7",
+        "doctrine/cache": "^1.6 <1.7",
-        "zendframework/zend-servicemanager": "^3.0",
+        "doctrine/collections": "^1.4 <1.5",
-        "zendframework/zend-paginator": "^2.6",
+        "doctrine/common": "^2.7 <2.8",
-        "zendframework/zend-config": "^2.6",
+        "doctrine/dbal": "^2.5 <2.6",
-        "zendframework/zend-i18n": "^2.7",
+        "doctrine/migrations": "^1.4",
-        "mtymek/expressive-config-manager": "^0.4",
+        "doctrine/orm": "^2.5 <2.6",
-        "acelaya/zsm-annotated-services": "^0.2.0",
-        "acelaya/ze-content-based-error-handler": "^1.0",
-        "doctrine/orm": "^2.5",
-        "guzzlehttp/guzzle": "^6.2",
-        "symfony/console": "^3.0",
-        "symfony/process": "^3.0",
-        "symfony/filesystem": "^3.0",
-        "firebase/php-jwt": "^4.0",
-        "monolog/monolog": "^1.21",
-        "theorchard/monolog-cascade": "^0.4",
         "endroid/qrcode": "^1.7",
+        "firebase/php-jwt": "^4.0",
+        "guzzlehttp/guzzle": "^6.2",
+        "http-interop/http-middleware": "^0.4.1",
         "mikehaertl/phpwkhtmltopdf": "^2.2",
-        "doctrine/migrations": "^1.4"
+        "monolog/monolog": "^1.21",
+        "roave/security-advisories": "dev-master",
+        "symfony/console": "^3.0",
+        "symfony/filesystem": "^3.0",
+        "symfony/process": "^3.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-i18n": "^2.7",
+        "zendframework/zend-paginator": "^2.6",
+        "zendframework/zend-servicemanager": "^3.0",
+        "zendframework/zend-stdlib": "^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0",
-        "squizlabs/php_codesniffer": "^2.3",
-        "roave/security-advisories": "dev-master",
         "filp/whoops": "^2.0",
+        "phpunit/dbunit": "^3.0",
+        "phpunit/phpcov": "^4.0",
+        "phpunit/phpunit": "^6.0",
+        "slevomat/coding-standard": "^4.0",
+        "squizlabs/php_codesniffer": "^3.1",
         "symfony/var-dumper": "^3.0",
-        "vlucas/phpdotenv": "^2.2"
+        "vlucas/phpdotenv": "^2.2",
+        "zendframework/zend-expressive-tooling": "^0.4"
     },
     "autoload": {
         "psr-4": {
@@ -59,19 +70,39 @@
         "psr-4": {
             "ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
             "ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
-            "ShlinkioTest\\Shlink\\Core\\": "module/Core/test",
+            "ShlinkioTest\\Shlink\\Core\\": [
-            "ShlinkioTest\\Shlink\\Common\\": "module/Common/test"
+                "module/Core/test",
+                "module/Core/test-func"
+            ],
+            "ShlinkioTest\\Shlink\\Common\\": [
+                "module/Common/test",
+                "module/Common/test-func"
+            ]
         }
     },
     "scripts": {
         "check": [
             "@cs",
-            "@test"
+            "@test",
+            "@func-test"
         ],
         "cs": "phpcs",
         "cs-fix": "phpcbf",
         "serve": "php -S 0.0.0.0:8000 -t public/",
-        "test": "phpunit --coverage-clover build/clover.xml",
+        "test": "phpunit --coverage-php build/coverage-unit.cov",
-        "pretty-test": "phpunit --coverage-html build/coverage"
+        "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",
+            "phpcov merge build --html build/html"
+        ]
+    },
+    "config": {
+        "process-timeout": 0,
+        "sort-packages": true,
+        "platform": {
+            "php": "7.0"
+        }
     }
 }

config/autoload/app_options.global.php

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

config/autoload/dependencies.global.php

@@ -1,21 +1,29 @@
 <?php
+declare(strict_types=1);
+
+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\Twig;
 use Zend\ServiceManager\Factory\InvokableFactory;
+use Zend\Stratigility\Middleware\ErrorHandler;
 
 return [
 
     'dependencies' => [
         'factories' => [
             Expressive\Application::class => Container\ApplicationFactory::class,
-            Router\FastRouteRouter::class => InvokableFactory::class,
+            Template\TemplateRendererInterface::class => Plates\PlatesRendererFactory::class,
-            Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class,
+            Router\RouterInterface::class => Router\FastRouteRouterFactory::class,
-        ],
+            ErrorHandler::class => Container\ErrorHandlerFactory::class,
-        'aliases' => [
+            Middleware\ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,
-            Router\RouterInterface::class => Router\FastRouteRouter::class,
+
+            Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
+            Helper\ServerUrlHelper::class => InvokableFactory::class,
         ],
     ],
 

config/autoload/entity-manager.global.php

@@ -1,4 +1,8 @@
 <?php
+declare(strict_types=1);
+
+use Shlinkio\Shlink\Common;
+
 return [
 
     'entity_manager' => [
@@ -6,14 +10,10 @@ return [
             'proxies_dir' => 'data/proxies',
         ],
         'connection' => [
-            'driver' => 'pdo_mysql',
+            'user' => Common\env('DB_USER'),
-            'user' => env('DB_USER'),
+            'password' => Common\env('DB_PASSWORD'),
-            'password' => env('DB_PASSWORD'),
+            'dbname' => Common\env('DB_NAME', 'shlink'),
-            'dbname' => env('DB_NAME', 'shlink'),
             'charset' => 'utf8',
-            'driverOptions' => [
-                PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
-            ],
         ],
     ],
 

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

@@ -0,0 +1,14 @@
+<?php
+return [
+
+    'entity_manager' => [
+        'connection' => [
+            'driver' => 'pdo_mysql',
+            'host' => 'shlink_db',
+            'driverOptions' => [
+                PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8',
+            ],
+        ],
+    ],
+
+];

config/autoload/errorhandler.local.php.dist

@@ -1,6 +1,5 @@
 <?php
-use Acelaya\ExpressiveErrorHandler\ErrorHandler\ContentBasedErrorHandler;
+use Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory;
-use Zend\Expressive\Container\WhoopsErrorHandlerFactory;
 
 return [
     'dependencies' => [
@@ -21,7 +20,7 @@ return [
     'error_handler' => [
         'plugins' => [
             'factories' => [
-                ContentBasedErrorHandler::DEFAULT_CONTENT => WhoopsErrorHandlerFactory::class,
+                'text/html' => WhoopsErrorResponseGeneratorFactory::class,
             ],
         ],
     ],

config/autoload/logger.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;
 

config/autoload/middleware-pipeline.global.php

@@ -1,19 +1,53 @@
 <?php
-use Zend\Expressive\Container\ApplicationFactory;
+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;
+use Zend\Expressive;
+use Zend\Stratigility\Middleware\ErrorHandler;
 
 return [
 
     'middleware_pipeline' => [
+        'pre-routing' => [
+            'middleware' => [
+                ErrorHandler::class,
+                LocaleMiddleware::class,
+            ],
+            'priority' => 11,
+        ],
+        'pre-routing-rest' => [
+            'path' => '/rest',
+            'middleware' => [
+                PathVersionMiddleware::class,
+            ],
+            'priority' => 11,
+        ],
+
         'routing' => [
             'middleware' => [
-                ApplicationFactory::ROUTING_MIDDLEWARE,
+                Expressive\Application::ROUTING_MIDDLEWARE,
             ],
             'priority' => 10,
         ],
 
+        'rest' => [
+            'path' => '/rest',
+            'middleware' => [
+                CrossDomainMiddleware::class,
+                Expressive\Middleware\ImplicitOptionsMiddleware::class,
+                BodyParserMiddleware::class,
+                CheckAuthenticationMiddleware::class,
+            ],
+            'priority' => 5,
+        ],
+
         'post-routing' => [
             'middleware' => [
-                ApplicationFactory::DISPATCH_MIDDLEWARE,
+                Expressive\Application::DISPATCH_MIDDLEWARE,
             ],
             'priority' => 1,
         ],

config/autoload/phpwkhtmltopdf.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [
 
     'phpwkhtmltopdf' => [

config/autoload/preview-generation.global.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [
 
     'preview_generation' => [

config/autoload/router.global.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+use Zend\Expressive\Router\FastRouteRouter;
+
+return [
+
+    'router' => [
+        'fastroute' => [
+            FastRouteRouter::CONFIG_CACHE_ENABLED => true,
+            FastRouteRouter::CONFIG_CACHE_FILE => 'data/cache/fastroute_cached_routes.php',
+        ],
+    ],
+
+];

config/autoload/router.local.php.dist

@@ -0,0 +1,12 @@
+<?php
+use Zend\Expressive\Router\FastRouteRouter;
+
+return [
+
+    'router' => [
+        'fastroute' => [
+            FastRouteRouter::CONFIG_CACHE_ENABLED => false,
+        ],
+    ],
+
+];

config/autoload/templates.global.php

@@ -1,9 +1,13 @@
 <?php
+declare(strict_types=1);
 
 return [
 
-    'twig' => [
+    'templates' => [
-        'cache_dir'  => 'data/cache/twig',
+        'extension' => 'phtml',
+    ],
+
+    'plates' => [
         'extensions' => [
             // extension service names or instances
         ],

config/autoload/translator.global.php

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

config/autoload/url-shortener.global.php

@@ -1,5 +1,8 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Core\Service\UrlShortener;
+use function Shlinkio\Shlink\Common\env;
 
 return [
 
@@ -9,6 +12,7 @@ return [
             'hostname' => env('SHORTENED_URL_HOSTNAME'),
         ],
         'shortcode_chars' => env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
+        'validate_url' => true,
     ],
 
 ];

config/autoload/zend-expressive.global.php

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

config/cli-config.php

@@ -1,10 +1,34 @@
 <?php
+declare(strict_types=1);
+
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\ServiceManager;
 
-/** @var ContainerInterface $container */
+$isTest = false;
+foreach ($_SERVER['argv'] as $i => $arg) {
+    if ($arg === '--test') {
+        unset($_SERVER['argv'][$i]);
+        $isTest = true;
+        break;
+    }
+}
+
+/** @var ContainerInterface|ServiceManager $container */
 $container = include __DIR__ . '/container.php';
+
+// If in testing env, override DB connection to use an in-memory sqlite database
+if ($isTest) {
+    $container->setAllowOverride(true);
+    $config = $container->get('config');
+    $config['entity_manager']['connection'] = [
+        'driver' => 'pdo_sqlite',
+        'path' => realpath(sys_get_temp_dir()) . '/shlink-tests.db',
+    ];
+    $container->setService('config', $config);
+}
+
 /** @var EntityManager $em */
 $em = $container->get(EntityManager::class);
 

config/config.php

@@ -1,10 +1,12 @@
 <?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\Expressive\ConfigManager;
+use Zend\ConfigAggregator;
 
 /**
  * Configuration files are loaded in a specific order. First ``global.php``, then ``*.global.php``.
@@ -15,11 +17,11 @@ use Zend\Expressive\ConfigManager;
  * Obviously, if you use closures in your config you can't cache it.
  */
 
-return (new ConfigManager\ConfigManager([
+return (new ConfigAggregator\ConfigAggregator([
     ExpressiveErrorHandler\ConfigProvider::class,
     Common\ConfigProvider::class,
     Core\ConfigProvider::class,
     CLI\ConfigProvider::class,
     Rest\ConfigProvider::class,
-    new ConfigManager\ZendConfigProvider('config/{autoload/{{,*.}global,{,*.}local},params/generated_config}.php'),
+    new ConfigAggregator\ZendConfigProvider('config/{autoload/{{,*.}global,{,*.}local},params/generated_config}.php'),
 ], 'data/cache/app_config.php'))->getMergedConfig();

config/container.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Dotenv\Dotenv;
 use Zend\ServiceManager\ServiceManager;
 
@@ -9,7 +11,7 @@ require 'vendor/autoload.php';
 // If the Dotenv class exists, load env vars and enable errors
 if (class_exists(Dotenv::class)) {
     error_reporting(E_ALL);
-    ini_set('display_errors', 1);
+    ini_set('display_errors', '1');
     $dotenv = new Dotenv(__DIR__ . '/..');
     $dotenv->load();
 }

data/infra/database/.gitignore

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

data/infra/db.Dockerfile

@@ -0,0 +1,6 @@
+FROM mysql:5.7
+MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
+
+# Enable remote access (default is localhost only, we change this
+# otherwise our database would not be reachable from outside the container)
+RUN sed -i -e"s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/my.cnf

data/infra/nginx.Dockerfile

@@ -0,0 +1,5 @@
+FROM nginx:1.11.6-alpine
+MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
+
+# Delete default nginx vhost
+RUN rm /etc/nginx/conf.d/default.conf

data/infra/nginx/.gitignore

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

data/infra/php.Dockerfile

@@ -0,0 +1,90 @@
+FROM php:7.1-fpm-alpine
+MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com>
+
+RUN apk update
+
+# Install common php extensions
+RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install iconv
+RUN docker-php-ext-install mbstring
+RUN docker-php-ext-install calendar
+
+RUN apk add --no-cache --virtual sqlite-libs
+RUN apk add --no-cache --virtual sqlite-dev
+RUN docker-php-ext-install pdo_sqlite
+
+RUN apk add --no-cache --virtual icu-dev
+RUN docker-php-ext-install intl
+
+RUN apk add --no-cache --virtual zlib-dev
+RUN docker-php-ext-install zip
+
+RUN apk add --no-cache --virtual libmcrypt-dev
+RUN docker-php-ext-install mcrypt
+
+RUN apk add --no-cache --virtual libpng-dev
+RUN docker-php-ext-install gd
+
+# Install redis extension
+ADD https://github.com/phpredis/phpredis/archive/3.1.4.tar.gz /tmp/phpredis.tar.gz
+RUN mkdir -p /usr/src/php/ext/redis\
+  && tar xf /tmp/phpredis.tar.gz -C /usr/src/php/ext/redis --strip-components=1
+# configure and install
+RUN docker-php-ext-configure redis\
+  && docker-php-ext-install redis
+# cleanup
+RUN rm /tmp/phpredis.tar.gz
+
+# Install memcached extension
+RUN apk add --no-cache --virtual cyrus-sasl-dev
+RUN apk add --no-cache --virtual libmemcached-dev
+ADD https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz /tmp/memcached.tar.gz
+RUN mkdir -p /usr/src/php/ext/memcached\
+  && tar xf /tmp/memcached.tar.gz -C /usr/src/php/ext/memcached --strip-components=1
+# configure and install
+RUN docker-php-ext-configure memcached\
+  && docker-php-ext-install memcached
+# cleanup
+RUN rm /tmp/memcached.tar.gz
+
+# Install APCu extension
+ADD https://pecl.php.net/get/apcu-5.1.3.tgz /tmp/apcu.tar.gz
+RUN mkdir -p /usr/src/php/ext/apcu\
+  && tar xf /tmp/apcu.tar.gz -C /usr/src/php/ext/apcu --strip-components=1
+# configure and install
+RUN docker-php-ext-configure apcu\
+  && docker-php-ext-install apcu
+# cleanup
+RUN rm /tmp/apcu.tar.gz
+
+# Install APCu-BC extension
+ADD https://pecl.php.net/get/apcu_bc-1.0.3.tgz /tmp/apcu_bc.tar.gz
+RUN mkdir -p /usr/src/php/ext/apcu-bc\
+  && tar xf /tmp/apcu_bc.tar.gz -C /usr/src/php/ext/apcu-bc --strip-components=1
+# configure and install
+RUN docker-php-ext-configure apcu-bc\
+  && docker-php-ext-install apcu-bc
+# cleanup
+RUN rm /tmp/apcu_bc.tar.gz
+
+# Load APCU.ini before APC.ini
+RUN rm /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
+RUN echo extension=apcu.so > /usr/local/etc/php/conf.d/20-php-ext-apcu.ini
+
+# Install xdebug
+ADD https://pecl.php.net/get/xdebug-2.5.0 /tmp/xdebug.tar.gz
+RUN mkdir -p /usr/src/php/ext/xdebug\
+  && tar xf /tmp/xdebug.tar.gz -C /usr/src/php/ext/xdebug --strip-components=1
+# configure and install
+RUN docker-php-ext-configure xdebug\
+  && docker-php-ext-install xdebug
+# cleanup
+RUN rm /tmp/xdebug.tar.gz
+
+# Install composer
+RUN php -r "readfile('https://getcomposer.org/installer');" | php
+RUN chmod +x composer.phar
+RUN mv composer.phar /usr/local/bin/composer
+
+# Make home directory writable by anyone
+RUN chmod 777 /home

data/infra/php.ini

@@ -0,0 +1 @@
+date.timezone = Europe/Madrid

data/infra/travis-php/apcu.ini

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

data/infra/travis-php/memcached.ini

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

data/infra/vhost.conf

@@ -0,0 +1,21 @@
+server {
+    listen 80 default_server;
+    server_name shlink.local;
+    root /home/shlink/www/public;
+    index index.php;
+
+    charset utf-8;
+    error_log /home/shlink/www/data/infra/nginx/shlink.error.log;
+
+    location / {
+        try_files $uri $uri/ /index.php$is_args$args;
+    }
+
+    location ~ \.php$ {
+        root /home/shlink/www/public;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass shlink_php:9000;
+        fastcgi_index index.php;
+        include fastcgi.conf;
+    }
+}

data/migrations/Version20160819142757.php

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

data/migrations/Version20160820191203.php

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

data/migrations/Version20171021093246.php

@@ -0,0 +1,49 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171021093246 extends AbstractMigration
+{
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function up(Schema $schema)
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if ($shortUrls->hasColumn('valid_since')) {
+            return;
+        }
+
+        $shortUrls->addColumn('valid_since', Type::DATETIME, [
+            'notnull' => false,
+        ]);
+        $shortUrls->addColumn('valid_until', Type::DATETIME, [
+            'notnull' => false,
+        ]);
+    }
+
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function down(Schema $schema)
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if (! $shortUrls->hasColumn('valid_since')) {
+            return;
+        }
+
+        $shortUrls->dropColumn('valid_since');
+        $shortUrls->dropColumn('valid_until');
+    }
+}

data/migrations/Version20171022064541.php

@@ -0,0 +1,46 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171022064541 extends AbstractMigration
+{
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function up(Schema $schema)
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if ($shortUrls->hasColumn('max_visits')) {
+            return;
+        }
+
+        $shortUrls->addColumn('max_visits', Type::INTEGER, [
+            'unsigned' => true,
+            'notnull' => false,
+        ]);
+    }
+
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function down(Schema $schema)
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if (! $shortUrls->hasColumn('max_visits')) {
+            return;
+        }
+
+        $shortUrls->dropColumn('max_visits');
+    }
+}

docker-compose.override.yml.dist

@@ -0,0 +1,8 @@
+version: '2'
+
+services:
+    shlink_php:
+        user: 1000:1000
+        volumes:
+            - /etc/passwd:/etc/passwd:ro
+            - /etc/group:/etc/group:ro

docker-compose.yml

@@ -0,0 +1,41 @@
+version: '2'
+
+services:
+    shlink_nginx:
+        container_name: shlink_nginx
+        build:
+            context: .
+            dockerfile: ./data/infra/nginx.Dockerfile
+        ports:
+            - "8000:80"
+        volumes:
+            - ./:/home/shlink/www
+            - ./docs:/home/shlink/www/public/docs
+            - ./data/infra/vhost.conf:/etc/nginx/conf.d/shlink-vhost.conf
+        links:
+            - shlink_php
+
+    shlink_php:
+        container_name: shlink_php
+        build:
+            context: .
+            dockerfile: ./data/infra/php.Dockerfile
+        volumes:
+            - ./:/home/shlink/www
+            - ./data/infra/php.ini:/usr/local/etc/php/php.ini
+        links:
+            - shlink_db
+
+    shlink_db:
+        container_name: shlink_db
+        build:
+            context: .
+            dockerfile: ./data/infra/db.Dockerfile
+        ports:
+            - "3307:3306"
+        volumes:
+            - ./:/home/shlink/www
+            - ./data/infra/database:/var/lib/mysql
+        environment:
+            MYSQL_ROOT_PASSWORD: root
+            MYSQL_DATABASE: shlink

docs/swagger/definitions/Error.json

@@ -0,0 +1,13 @@
+{
+    "type": "object",
+    "properties": {
+        "code": {
+            "type": "string",
+            "description": "A machine unique code"
+        },
+        "message": {
+            "type": "string",
+            "description": "A human-friendly error message"
+        }
+    }
+}

docs/swagger/definitions/Pagination.json

@@ -0,0 +1,13 @@
+{
+    "type": "object",
+    "properties": {
+        "currentPage": {
+            "type": "integer",
+            "description": "The number of current page being displayed."
+        },
+        "pagesCount": {
+            "type": "integer",
+            "description": "The total number of pages that can be displayed."
+        }
+    }
+}

docs/swagger/definitions/ShortUrl.json

@@ -0,0 +1,29 @@
+{
+    "type": "object",
+    "properties": {
+        "shortCode": {
+            "type": "string",
+            "description": "The short code for this short URL."
+        },
+        "originalUrl": {
+            "type": "string",
+            "description": "The original long URL."
+        },
+        "dateCreated": {
+            "type": "string",
+            "format": "date-time",
+            "description": "The date in which the short URL was created in ISO format."
+        },
+        "visitsCount": {
+            "type": "integer",
+            "description": "The number of visits that this short URL has recieved."
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            },
+            "description": "A list of tags applied to this short URL"
+        }
+    }
+}

docs/swagger/definitions/Visit.json

@@ -0,0 +1,18 @@
+{
+    "type": "object",
+    "properties": {
+        "referer": {
+            "type": "string"
+        },
+        "date": {
+            "type": "string",
+            "format": "date-time"
+        },
+        "remoteAddr": {
+            "type": "string"
+        },
+        "userAgent": {
+            "type": "string"
+        }
+    }
+}

docs/swagger/parameters/Authorization.json

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

docs/swagger/paths/v1_authenticate.json

@@ -0,0 +1,55 @@
+{
+    "post": {
+        "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"
+            }
+        ],
+        "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"
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ"
+                    }
+                }
+            },
+            "400": {
+                "description": "An API key was not provided.",
+                "schema": {
+                    "$ref": "../definitions/Error.json"
+                }
+            },
+            "401": {
+                "description": "The API key is incorrect, is disabled or has expired.",
+                "schema": {
+                    "$ref": "../definitions/Error.json"
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "schema": {
+                    "$ref": "../definitions/Error.json"
+                }
+            }
+        }
+    }
+}

docs/swagger/paths/v1_short-codes.json

@@ -0,0 +1,182 @@
+{
+    "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

@@ -0,0 +1,58 @@
+{
+    "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

@@ -0,0 +1,74 @@
+{
+    "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

@@ -0,0 +1,81 @@
+{
+    "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_tags.json

@@ -0,0 +1,193 @@
+{
+    "get": {
+        "tags": [
+            "Tags"
+        ],
+        "summary": "List existing tags",
+        "description": "Returns the list of all tags used in any short URL, ordered by name",
+        "parameters": [
+            {
+                "$ref": "../parameters/Authorization.json"
+            }
+        ],
+        "responses": {
+            "200": {
+                "description": "The list of tags",
+                "schema": {
+                    "type": "object",
+                    "properties": {
+                        "tags": {
+                            "type": "object",
+                            "properties": {
+                                "data": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "tags": {
+                            "data": [
+                                "games",
+                                "php",
+                                "shlink",
+                                "tech"
+                            ]
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "schema": {
+                    "$ref": "../definitions/Error.json"
+                }
+            }
+        }
+    },
+
+    "post": {
+        "tags": [
+            "Tags"
+        ],
+        "summary": "Create tags",
+        "description": "Provided a list of tags, creates all that do not yet exist",
+        "parameters": [
+            {
+                "$ref": "../parameters/Authorization.json"
+            },
+            {
+                "name": "tags[]",
+                "in": "formData",
+                "description": "The list of tag names to create",
+                "required": true,
+                "type": "array"
+            }
+        ],
+        "responses": {
+            "200": {
+                "description": "The list of tags",
+                "schema": {
+                    "type": "object",
+                    "properties": {
+                        "tags": {
+                            "type": "object",
+                            "properties": {
+                                "data": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "examples": {
+                    "application/json": {
+                        "tags": {
+                            "data": [
+                                "games",
+                                "php",
+                                "shlink",
+                                "tech"
+                            ]
+                        }
+                    }
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "schema": {
+                    "$ref": "../definitions/Error.json"
+                }
+            }
+        }
+    },
+
+    "put": {
+        "tags": [
+            "Tags"
+        ],
+        "summary": "Rename tag",
+        "description": "Renames one existing tag",
+        "parameters": [
+            {
+                "$ref": "../parameters/Authorization.json"
+            },
+            {
+                "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"
+            }
+        ],
+        "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"
+                }
+            },
+            "404": {
+                "description": "There's no tag found with the name provided in oldName param.",
+                "schema": {
+                    "$ref": "../definitions/Error.json"
+                }
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "schema": {
+                    "$ref": "../definitions/Error.json"
+                }
+            }
+        }
+    },
+
+    "delete": {
+        "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"
+            }
+        ],
+        "responses": {
+            "204": {
+                "description": "Tags properly deleted"
+            },
+            "500": {
+                "description": "Unexpected error.",
+                "schema": {
+                    "$ref": "../definitions/Error.json"
+                }
+            }
+        }
+    }
+}

docs/swagger/swagger.json

@@ -0,0 +1,44 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "title": "Shlink",
+        "description": "Shlink, the self-hosted URL shortener",
+        "version": "1.0"
+    },
+    "schemes": [
+        "http",
+        "https"
+    ],
+    "basePath": "/rest",
+    "produces": [
+        "application/json"
+    ],
+    "consumes": [
+        "application/x-www-form-urlencoded",
+        "application/json"
+    ],
+
+    "paths": {
+        "/v1/authenticate": {
+            "$ref": "paths/v1_authenticate.json"
+        },
+
+        "/v1/short-codes": {
+            "$ref": "paths/v1_short-codes.json"
+        },
+        "/v1/short-codes/{shortCode}": {
+            "$ref": "paths/v1_short-codes_{shortCode}.json"
+        },
+        "/v1/short-codes/{shortCode}/tags": {
+            "$ref": "paths/v1_short-codes_{shortCode}_tags.json"
+        },
+
+        "/v1/tags": {
+            "$ref": "paths/v1_tags.json"
+        },
+
+        "/v1/short-codes/{shortCode}/visits": {
+            "$ref": "paths/v1_short-codes_{shortCode}_visits.json"
+        }
+    }
+}

func_tests_bootstrap.php

@@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+use ShlinkioTest\Shlink\Common\DbUnit\DatabaseTestCase;
+use Symfony\Component\Process\Process;
+use Zend\ServiceManager\ServiceManager;
+
+// Create an empty .env file
+if (! file_exists('.env')) {
+    touch('.env');
+}
+
+$shlinkDbPath = realpath(sys_get_temp_dir()) . '/shlink-tests.db';
+if (file_exists($shlinkDbPath)) {
+    unlink($shlinkDbPath);
+}
+
+/** @var ServiceManager $sm */
+$sm = require __DIR__ . '/config/container.php';
+$sm->setAllowOverride(true);
+$config = $sm->get('config');
+$config['entity_manager']['connection'] = [
+    'driver' => 'pdo_sqlite',
+    'path' => $shlinkDbPath,
+];
+$sm->setService('config', $config);
+
+// Create database
+$process = new Process('vendor/bin/doctrine orm:schema-tool:create --no-interaction -q --test', __DIR__);
+$process->inheritEnvironmentVariables()
+        ->mustRun();
+
+DatabaseTestCase::$em = $sm->get('em');

indocker

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker exec -it shlink_php /bin/sh -c "cd /home/shlink/www && $*"

module/CLI/config/cli.config.php

@@ -1,10 +1,13 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\CLI\Command;
+use Shlinkio\Shlink\Common;
 
 return [
 
     'cli' => [
-        'locale' => env('CLI_LOCALE', 'en'),
+        'locale' => Common\env('CLI_LOCALE', 'en'),
         'commands' => [
             Command\Shortcode\GenerateShortcodeCommand::class,
             Command\Shortcode\ResolveUrlCommand::class,
@@ -17,7 +20,11 @@ return [
             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,
+        ],
     ],
 
 ];

module/CLI/config/dependencies.config.php

@@ -1,8 +1,15 @@
 <?php
-use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
+declare(strict_types=1);
+
 use Shlinkio\Shlink\CLI\Command;
 use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
+use Shlinkio\Shlink\Common\Service\IpLocationResolver;
+use Shlinkio\Shlink\Common\Service\PreviewGenerator;
+use Shlinkio\Shlink\Core\Service;
+use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Symfony\Component\Console\Application;
+use Zend\I18n\Translator\Translator;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 
 return [
 
@@ -10,18 +17,52 @@ return [
         'factories' => [
             Application::class => ApplicationFactory::class,
 
-            Command\Shortcode\GenerateShortcodeCommand::class => AnnotatedFactory::class,
+            Command\Shortcode\GenerateShortcodeCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\ResolveUrlCommand::class => AnnotatedFactory::class,
+            Command\Shortcode\ResolveUrlCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\ListShortcodesCommand::class => AnnotatedFactory::class,
+            Command\Shortcode\ListShortcodesCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\GetVisitsCommand::class => AnnotatedFactory::class,
+            Command\Shortcode\GetVisitsCommand::class => ConfigAbstractFactory::class,
-            Command\Shortcode\GeneratePreviewCommand::class => AnnotatedFactory::class,
+            Command\Shortcode\GeneratePreviewCommand::class => ConfigAbstractFactory::class,
-            Command\Visit\ProcessVisitsCommand::class => AnnotatedFactory::class,
+            Command\Visit\ProcessVisitsCommand::class => ConfigAbstractFactory::class,
-            Command\Config\GenerateCharsetCommand::class => AnnotatedFactory::class,
+            Command\Config\GenerateCharsetCommand::class => ConfigAbstractFactory::class,
-            Command\Config\GenerateSecretCommand::class => AnnotatedFactory::class,
+            Command\Config\GenerateSecretCommand::class => ConfigAbstractFactory::class,
-            Command\Api\GenerateKeyCommand::class => AnnotatedFactory::class,
+            Command\Api\GenerateKeyCommand::class => ConfigAbstractFactory::class,
-            Command\Api\DisableKeyCommand::class => AnnotatedFactory::class,
+            Command\Api\DisableKeyCommand::class => ConfigAbstractFactory::class,
-            Command\Api\ListKeysCommand::class => AnnotatedFactory::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,
+            Command\Tag\DeleteTagsCommand::class => ConfigAbstractFactory::class,
         ],
     ],
 
+    ConfigAbstractFactory::class => [
+        Command\Shortcode\GenerateShortcodeCommand::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 => [
+            Service\ShortUrlService::class,
+            PreviewGenerator::class,
+            'translator',
+        ],
+        Command\Visit\ProcessVisitsCommand::class => [
+            Service\VisitService::class,
+            IpLocationResolver::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],
+        Command\Tag\DeleteTagsCommand::class => [Service\Tag\TagService::class, Translator::class],
+    ],
+
 ];

module/CLI/config/translator.config.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [
 
     'translator' => [

module/CLI/lang/es.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Shlink 1.0\n"
-"POT-Creation-Date: 2016-08-21 18:16+0200\n"
+"POT-Creation-Date: 2017-10-21 20:17+0200\n"
-"PO-Revision-Date: 2016-08-21 18:16+0200\n"
+"PO-Revision-Date: 2017-10-21 20:19+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 1.8.7.1\n"
+"X-Generator: Poedit 2.0.1\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -92,7 +92,7 @@ msgid "Processing URL %s..."
 msgstr "Procesando URL %s..."
 
 msgid " <info>Success!</info>"
-msgstr "<info>¡Correcto!</info>"
+msgstr " <info>¡Correcto!</info>"
 
 msgid "Error"
 msgstr "Error"
@@ -107,6 +107,24 @@ msgstr "La URL larga a procesar"
 msgid "Tags to apply to the new short URL"
 msgstr "Etiquetas a aplicar a la nueva URL acortada"
 
+msgid ""
+"The date from which this short URL will be valid. If someone tries to access "
+"it before this date, it will not be found."
+msgstr ""
+"La fecha desde la cual será válida esta URL acortada. Si alguien intenta "
+"acceder a ella antes de esta fecha, no será encontrada."
+
+msgid ""
+"The date until which this short URL will be valid. If someone tries to "
+"access it after this date, it will not be found."
+msgstr ""
+"La fecha hasta la cual será válida está URL acortada. Si alguien intenta "
+"acceder a ella después de esta fecha, no será encontrada."
+
+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?:"
 msgstr "No se ha proporcionado una URL larga. ¿Qué URL deseas acortar?"
 
@@ -123,6 +141,14 @@ msgstr "URL generada:"
 msgid "Provided URL \"%s\" is invalid. Try with a different one."
 msgstr "La URL proporcionada \"%s\" e inválida. Prueba con una diferente."
 
+#, php-format
+msgid ""
+"Provided slug \"%s\" is already in use by another URL. Try with a different "
+"one."
+msgstr ""
+"El slug proporcionado \"%s\" ya está siendo usado para otra URL. Prueba con "
+"uno diferente."
+
 msgid "Returns the detailed visits information for provided short code"
 msgstr ""
 "Devuelve la información detallada de visitas para el código corto "
@@ -141,7 +167,7 @@ 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?"
+msgstr "No se prporcionó un código corto. ¿Qué código corto deseas usar?:"
 
 msgid "Referer"
 msgstr "Origen"
@@ -162,6 +188,22 @@ msgstr "Listar todas las URLs cortas"
 msgid "The first page to list (%s items per page)"
 msgstr "La primera página a listar (%s elementos por página)"
 
+msgid ""
+"A query used to filter results by searching for it on the longUrl and "
+"shortCode fields"
+msgstr ""
+"Una consulta usada para filtrar el resultado buscándola en los campos "
+"longUrl y shortCode"
+
+msgid "A comma-separated list of tags to filter results"
+msgstr "Una lista de etiquetas separadas por coma para filtrar el resultado"
+
+msgid ""
+"The field from which we want to order by. Pass ASC or DESC separated by a "
+"comma"
+msgstr ""
+"El campo por el cual queremos ordernar. Pasa ASC o DESC separado por una coma"
+
 msgid "Whether to display the tags or not"
 msgstr "Si se desea mostrar las etiquetas o no"
 
@@ -194,7 +236,7 @@ msgstr "El código corto a convertir"
 
 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?"
+"No se proporcionó un código corto. ¿Qué código corto quieres convertir?:"
 
 #, php-format
 msgid "No URL found for short code \"%s\""
@@ -207,6 +249,57 @@ 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."
+
+msgid "The name of the tags to create"
+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 "Deletes one or more tags."
+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 "Lists existing tags."
+msgstr "Lista las etiquetas existentes."
+
+#, fuzzy
+msgid "Name"
+msgstr "Nombre"
+
+msgid "No tags yet"
+msgstr "Aún no hay etiquetas"
+
+msgid "Renames one existing tag."
+msgstr "Renombra una etiqueta existente."
+
+msgid "Current name of the tag."
+msgstr "Nombre actual de la etiqueta."
+
+msgid "New name of the tag."
+msgstr "Nuevo nombre de la etiqueta."
+
+msgid "Tag properly renamed."
+msgstr "Etiqueta correctamente renombrada."
+
+#, php-format
+msgid "A tag with name \"%s\" was not found"
+msgstr "Una etiqueta con nombre \"%s\" no ha sido encontrada"
+
 msgid "Processes visits where location is not set yet"
 msgstr "Procesa las visitas donde la localización no ha sido establecida aún"
 

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

@@ -1,8 +1,8 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
-use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -21,18 +21,11 @@ class DisableKeyCommand extends Command
      */
     private $translator;
 
-    /**
-     * DisableKeyCommand constructor.
-     * @param ApiKeyServiceInterface|ApiKeyService $apiKeyService
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ApiKeyService::class, "translator"})
-     */
     public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
     {
         $this->apiKeyService = $apiKeyService;
         $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
     }
 
     public function configure()

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

@@ -1,8 +1,8 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
-use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -21,18 +21,11 @@ class GenerateKeyCommand extends Command
      */
     private $translator;
 
-    /**
-     * GenerateKeyCommand constructor.
-     * @param ApiKeyServiceInterface|ApiKeyService $apiKeyService
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ApiKeyService::class, "translator"})
-     */
     public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
     {
         $this->apiKeyService = $apiKeyService;
         $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
     }
 
     public function configure()

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

@@ -1,9 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Api;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
-use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
@@ -23,18 +23,11 @@ class ListKeysCommand extends Command
      */
     private $translator;
 
-    /**
-     * ListKeysCommand constructor.
-     * @param ApiKeyServiceInterface|ApiKeyService $apiKeyService
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ApiKeyService::class, "translator"})
-     */
     public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
     {
         $this->apiKeyService = $apiKeyService;
         $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
     }
 
     public function configure()
@@ -73,15 +66,18 @@ class ListKeysCommand extends Command
             $key = $row->getKey();
             $expiration = $row->getExpirationDate();
             $rowData = [];
+            $formatMethod = ! $row->isEnabled()
+                ? 'getErrorString'
+                : ($row->isExpired() ? 'getWarningString' : 'getSuccessString');
 
             if ($enabledOnly) {
-                $rowData[] = $key;
+                $rowData[] = $this->{$formatMethod}($key);
             } else {
-                $rowData[] = $row->isEnabled() ? $this->getSuccessString($key) : $this->getErrorString($key);
+                $rowData[] = $this->{$formatMethod}($key);
-                $rowData[] = $row->isEnabled() ? $this->getSuccessString('+++') : $this->getErrorString('---');
+                $rowData[] = $this->{$formatMethod}($this->getEnabledSymbol($row));
             }
 
-            $rowData[] = isset($expiration) ? $expiration->format(\DateTime::ISO8601) : '-';
+            $rowData[] = isset($expiration) ? $expiration->format(\DateTime::ATOM) : '-';
             $table->addRow($rowData);
         }
 
@@ -105,4 +101,22 @@ class ListKeysCommand extends Command
     {
         return sprintf('<info>%s</info>', $string);
     }
+
+    /**
+     * @param $string
+     * @return string
+     */
+    protected function getWarningString($string)
+    {
+        return sprintf('<comment>%s</comment>', $string);
+    }
+
+    /**
+     * @param ApiKey $apiKey
+     * @return string
+     */
+    protected function getEnabledSymbol(ApiKey $apiKey)
+    {
+        return ! $apiKey->isEnabled() || $apiKey->isExpired() ? '---' : '+++';
+    }
 }

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

@@ -1,7 +1,8 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Config;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -15,16 +16,10 @@ class GenerateCharsetCommand extends Command
      */
     private $translator;
 
-    /**
-     * GenerateCharsetCommand constructor.
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({"translator"})
-     */
     public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
     }
 
     public function configure()

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

@@ -1,7 +1,8 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Config;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -17,16 +18,10 @@ class GenerateSecretCommand extends Command
      */
     private $translator;
 
-    /**
-     * GenerateCharsetCommand constructor.
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({"translator"})
-     */
     public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
     }
 
     public function configure()

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

@@ -1,27 +1,27 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Install;
 
-use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
+use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManagerInterface;
-use Shlinkio\Shlink\Core\Service\UrlShortener;
+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\ChoiceQuestion;
+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
 {
-    use StringUtilsTrait;
+    const GENERATED_CONFIG_PATH = 'config/params/generated_config.php';
-
-    const DATABASE_DRIVERS = [
-        'MySQL' => 'pdo_mysql',
-        'PostgreSQL' => 'pdo_pgsql',
-        'SQLite' => 'pdo_sqlite',
-    ];
-    const SUPPORTED_LANGUAGES = ['en', 'es'];
 
     /**
      * @var InputInterface
@@ -43,22 +43,44 @@ class InstallCommand extends Command
      * @var WriterInterface
      */
     private $configWriter;
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+    /**
+     * @var ConfigCustomizerPluginManagerInterface
+     */
+    private $configCustomizers;
+    /**
+     * @var bool
+     */
+    private $isUpdate;
 
     /**
      * InstallCommand constructor.
      * @param WriterInterface $configWriter
-     * @param callable|null $databaseCreationLogic
+     * @param Filesystem $filesystem
+     * @param bool $isUpdate
+     * @throws LogicException
      */
-    public function __construct(WriterInterface $configWriter)
+    public function __construct(
-    {
+        WriterInterface $configWriter,
-        parent::__construct(null);
+        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')
+        $this
-             ->setDescription('Installs Shlink');
+            ->setName('shlink:install')
+            ->setDescription('Installs or updates Shlink');
     }
 
     public function execute(InputInterface $input, OutputInterface $output)
@@ -67,40 +89,58 @@ class InstallCommand extends Command
         $this->output = $output;
         $this->questionHelper = $this->getHelper('question');
         $this->processHelper = $this->getHelper('process');
-        $params = [];
 
         $output->writeln([
             '<info>Welcome to Shlink!!</info>',
-            'This process will guide you through the installation.',
+            'This will guide you through the installation process.',
         ]);
 
         // Check if a cached config file exists and drop it if so
-        if (file_exists('data/cache/app_config.php')) {
+        if ($this->filesystem->exists('data/cache/app_config.php')) {
             $output->write('Deleting old cached config...');
-            if (unlink('data/cache/app_config.php')) {
+            try {
+                $this->filesystem->remove('data/cache/app_config.php');
                 $output->writeln(' <info>Success</info>');
-            } else {
+            } 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
-        $params['DATABASE'] = $this->askDatabase();
+        foreach ([
-        $params['URL_SHORTENER'] = $this->askUrlShortener();
+            Plugin\DatabaseConfigCustomizerPlugin::class,
-        $params['LANGUAGE'] = $this->askLanguage();
+            Plugin\UrlShortenerConfigCustomizerPlugin::class,
-        $params['APP'] = $this->askApplication();
+            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
-        $config = $this->buildAppConfig($params);
+        $this->configWriter->toFile(self::GENERATED_CONFIG_PATH, $config->getArrayCopy(), false);
-        $this->configWriter->toFile('config/params/generated_config.php', $config, false);
         $output->writeln(['<info>Custom configuration properly generated!</info>', '']);
 
-        // Generate database
+        // If current command is not update, generate database
-        if (! $this->createDatabase()) {
+        if (!  $this->isUpdate) {
-            return;
+            $this->output->writeln('Initializing database...');
+            if (! $this->runCommand(
+                'php vendor/bin/doctrine.php orm:schema-tool:create',
+                'Error generating database.'
+            )) {
+                return;
+            }
         }
 
         // Run database migrations
@@ -116,98 +156,47 @@ class InstallCommand extends Command
         }
     }
 
-    protected function askDatabase()
+    /**
+     * @return CustomizableAppConfig
+     * @throws RuntimeException
+     */
+    private function importConfig()
     {
-        $params = [];
+        $config = new CustomizableAppConfig();
-        $this->printTitle('DATABASE');
 
-        // Select database type
+        // Ask the user if he/she wants to import an older configuration
-        $databases = array_keys(self::DATABASE_DRIVERS);
+        $importConfig = $this->questionHelper->ask($this->input, $this->output, new ConfirmationQuestion(
-        $dbType = $this->questionHelper->ask($this->input, $this->output, new ChoiceQuestion(
+            '<question>Do you want to import previous configuration? (Y/n):</question> '
-            '<question>Select database type (defaults to ' . $databases[0] . '):</question>',
-            $databases,
-            0
         ));
-        $params['DRIVER'] = self::DATABASE_DRIVERS[$dbType];
+        if (! $importConfig) {
-
+            return $config;
-        // Ask for connection params if database is not SQLite
-        if ($params['DRIVER'] !== self::DATABASE_DRIVERS['SQLite']) {
-            $params['NAME'] = $this->ask('Database name', 'shlink');
-            $params['USER'] = $this->ask('Database username');
-            $params['PASSWORD'] = $this->ask('Database password');
         }
 
-        return $params;
+        // 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);
 
-    protected function askUrlShortener()
+            if (! $configExists) {
-    {
+                $keepAsking = $this->questionHelper->ask($this->input, $this->output, new ConfirmationQuestion(
-        $this->printTitle('URL SHORTENER');
+                    '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);
 
-        // Ask for URL shortener params
+        // If after some retries the user has chosen not to test another path, return
-        return [
+        if (! $configExists) {
-            'SCHEMA' => $this->questionHelper->ask($this->input, $this->output, new ChoiceQuestion(
+            return $config;
-                '<question>Select schema for generated short URLs (defaults to http):</question>',
+        }
-                ['http', 'https'],
-                0
-            )),
-            'HOSTNAME' => $this->ask('Hostname for generated URLs'),
-            'CHARS' => $this->ask(
-                'Character set for generated short codes (leave empty to autogenerate one)',
-                null,
-                true
-            ) ?: str_shuffle(UrlShortener::DEFAULT_CHARS)
-        ];
-    }
 
-    protected function askLanguage()
+        // Read the config file
-    {
+        $config->exchangeArray(include $configFile);
-        $this->printTitle('LANGUAGE');
+        return $config;
-
-        return [
-            'DEFAULT' => $this->questionHelper->ask($this->input, $this->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($this->input, $this->output, new ChoiceQuestion(
-                '<question>Select default language for CLI executions (defaults to '
-                . self::SUPPORTED_LANGUAGES[0] . '):</question>',
-                self::SUPPORTED_LANGUAGES,
-                0
-            )),
-        ];
-    }
-
-    protected function askApplication()
-    {
-        $this->printTitle('APPLICATION');
-
-        return [
-            'SECRET' => $this->ask(
-                'Define a secret string that will be used to sign API tokens (leave empty to autogenerate one)',
-                null,
-                true
-            ) ?: $this->generateRandomString(32),
-        ];
-    }
-
-    /**
-     * @param string $text
-     */
-    protected function printTitle($text)
-    {
-        $text = trim($text);
-        $length = strlen($text) + 4;
-        $header = str_repeat('*', $length);
-
-        $this->output->writeln([
-            '',
-            '<info>' . $header . '</info>',
-            '<info>* ' . strtoupper($text) . ' *</info>',
-            '<info>' . $header . '</info>',
-        ]);
     }
 
     /**
@@ -215,10 +204,11 @@ class InstallCommand extends Command
      * @param string|null $default
      * @param bool $allowEmpty
      * @return string
+     * @throws RuntimeException
      */
-    protected function ask($text, $default = null, $allowEmpty = false)
+    private function ask($text, $default = null, $allowEmpty = false)
     {
-        if (isset($default)) {
+        if ($default !== null) {
             $text .= ' (defaults to ' . $default . ')';
         }
         do {
@@ -229,79 +219,31 @@ class InstallCommand extends Command
             if (empty($value) && ! $allowEmpty) {
                 $this->output->writeln('<error>Value can\'t be empty</error>');
             }
-        } while (empty($value) && empty($default) && ! $allowEmpty);
+        } while (empty($value) && $default === null && ! $allowEmpty);
 
         return $value;
     }
 
-    /**
-     * @param array $params
-     * @return array
-     */
-    protected function buildAppConfig(array $params)
-    {
-        // Build simple config
-        $config = [
-            'app_options' => [
-                'secret_key' => $params['APP']['SECRET'],
-            ],
-            'entity_manager' => [
-                'connection' => [
-                    'driver' => $params['DATABASE']['DRIVER'],
-                ],
-            ],
-            'translator' => [
-                'locale' => $params['LANGUAGE']['DEFAULT'],
-            ],
-            'cli' => [
-                'locale' => $params['LANGUAGE']['CLI'],
-            ],
-            'url_shortener' => [
-                'domain' => [
-                    'schema' => $params['URL_SHORTENER']['SCHEMA'],
-                    'hostname' => $params['URL_SHORTENER']['HOSTNAME'],
-                ],
-                'shortcode_chars' => $params['URL_SHORTENER']['CHARS'],
-            ],
-        ];
-
-        // Build dynamic database config
-        if ($params['DATABASE']['DRIVER'] === 'pdo_sqlite') {
-            $config['entity_manager']['connection']['path'] = 'data/database.sqlite';
-        } else {
-            $config['entity_manager']['connection']['user'] = $params['DATABASE']['USER'];
-            $config['entity_manager']['connection']['password'] = $params['DATABASE']['PASSWORD'];
-            $config['entity_manager']['connection']['dbname'] = $params['DATABASE']['NAME'];
-        }
-
-        return $config;
-    }
-
-    protected function createDatabase()
-    {
-        $this->output->writeln('Initializing database...');
-        return $this->runCommand('php vendor/bin/doctrine.php orm:schema-tool:create', 'Error generating database.');
-    }
-
     /**
      * @param string $command
      * @param string $errorMessage
      * @return bool
      */
-    protected function runCommand($command, $errorMessage)
+    private function runCommand($command, $errorMessage)
     {
         $process = $this->processHelper->run($this->output, $command);
         if ($process->isSuccessful()) {
             $this->output->writeln('    <info>Success!</info>');
             return true;
-        } else {
+        }
-            if ($this->output->isVerbose()) {
+
-                return false;
+        if ($this->output->isVerbose()) {
-            }
-            $this->output->writeln(
-                '    <error>' . $errorMessage . '</error>  Run this command with -vvv to see specific error info.'
-            );
             return false;
         }
+
+        $this->output->writeln(
+            '    <error>' . $errorMessage . '</error>  Run this command with -vvv to see specific error info.'
+        );
+        return false;
     }
 }

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

@@ -1,12 +0,0 @@
-<?php
-namespace Shlinkio\Shlink\CLI\Command\Install;
-
-use Zend\Config\Writer\WriterInterface;
-
-class UpdateCommand extends InstallCommand
-{
-    public function createDatabase()
-    {
-        return true;
-    }
-}

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

@@ -1,11 +1,10 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
-use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
-use Shlinkio\Shlink\Core\Service\ShortUrlService;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -27,14 +26,6 @@ class GeneratePreviewCommand extends Command
      */
     private $shortUrlService;
 
-    /**
-     * GeneratePreviewCommand constructor.
-     * @param ShortUrlServiceInterface $shortUrlService
-     * @param PreviewGeneratorInterface $previewGenerator
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ShortUrlService::class, PreviewGenerator::class, "translator"})
-     */
     public function __construct(
         ShortUrlServiceInterface $shortUrlService,
         PreviewGeneratorInterface $previewGenerator,

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

@@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
-use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
@@ -30,14 +31,6 @@ class GenerateShortcodeCommand extends Command
      */
     private $translator;
 
-    /**
-     * GenerateShortcodeCommand constructor.
-     * @param UrlShortenerInterface $urlShortener
-     * @param TranslatorInterface $translator
-     * @param array $domainConfig
-     *
-     * @Inject({UrlShortener::class, "translator", "config.url_shortener.domain"})
-     */
     public function __construct(
         UrlShortenerInterface $urlShortener,
         TranslatorInterface $translator,
@@ -59,9 +52,23 @@ class GenerateShortcodeCommand extends Command
              ->addOption(
                  'tags',
                  't',
-                 InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL,
+                 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)
@@ -94,6 +101,8 @@ class GenerateShortcodeCommand extends Command
             $processedTags = array_merge($processedTags, $explodedTags);
         }
         $tags = $processedTags;
+        $customSlug = $input->getOption('customSlug');
+        $maxVisits = $input->getOption('maxVisits');
 
         try {
             if (! isset($longUrl)) {
@@ -101,7 +110,14 @@ class GenerateShortcodeCommand extends Command
                 return;
             }
 
-            $shortCode = $this->urlShortener->urlToShortCode(new Uri($longUrl), $tags);
+            $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']);
@@ -117,6 +133,19 @@ class GenerateShortcodeCommand extends Command
                 ) . '</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/GetVisitsCommand.php

@@ -1,9 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Util\DateRange;
-use Shlinkio\Shlink\Core\Service\VisitsTracker;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
@@ -26,13 +26,6 @@ class GetVisitsCommand extends Command
      */
     private $translator;
 
-    /**
-     * GetVisitsCommand constructor.
-     * @param VisitsTrackerInterface $visitsTracker
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({VisitsTracker::class, "translator"})
-     */
     public function __construct(VisitsTrackerInterface $visitsTracker, TranslatorInterface $translator)
     {
         $this->visitsTracker = $visitsTracker;

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

@@ -1,10 +1,10 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
 use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
-use Shlinkio\Shlink\Core\Service\ShortUrlService;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
@@ -28,13 +28,6 @@ class ListShortcodesCommand extends Command
      */
     private $translator;
 
-    /**
-     * ListShortcodesCommand constructor.
-     * @param ShortUrlServiceInterface $shortUrlService
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ShortUrlService::class, "translator"})
-     */
     public function __construct(ShortUrlServiceInterface $shortUrlService, TranslatorInterface $translator)
     {
         $this->shortUrlService = $shortUrlService;
@@ -56,9 +49,31 @@ class ListShortcodesCommand extends Command
                  ),
                  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')
              );
@@ -66,14 +81,17 @@ class ListShortcodesCommand extends Command
 
     public function execute(InputInterface $input, OutputInterface $output)
     {
-        $page = intval($input->getOption('page'));
+        $page = (int) $input->getOption('page');
-        $showTags = $input->getOption('tags');
+        $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);
+            $result = $this->shortUrlService->listShortUrls($page, $searchTerm, $tags, $this->processOrderBy($input));
             $page++;
             $table = new Table($output);
 
@@ -119,4 +137,15 @@ class ListShortcodesCommand extends Command
             }
         } 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,9 +1,10 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
+use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
-use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
@@ -24,13 +25,6 @@ class ResolveUrlCommand extends Command
      */
     private $translator;
 
-    /**
-     * ResolveUrlCommand constructor.
-     * @param UrlShortenerInterface $urlShortener
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({UrlShortener::class, "translator"})
-     */
     public function __construct(UrlShortenerInterface $urlShortener, TranslatorInterface $translator)
     {
         $this->urlShortener = $urlShortener;
@@ -88,6 +82,10 @@ class ResolveUrlCommand extends Command
             $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

@@ -0,0 +1,61 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Tag;
+
+use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Zend\I18n\Translator\TranslatorInterface;
+
+class CreateTagCommand extends Command
+{
+    /**
+     * @var TagServiceInterface
+     */
+    private $tagService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    public function __construct(TagServiceInterface $tagService, TranslatorInterface $translator)
+    {
+        $this->tagService = $tagService;
+        $this->translator = $translator;
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $this
+            ->setName('tag:create')
+            ->setDescription($this->translator->translate('Creates one or more tags.'))
+            ->addOption(
+                'name',
+                't',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                $this->translator->translate('The name of the tags to create')
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $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')
+            ));
+            return;
+        }
+
+        $this->tagService->createTags($tagNames);
+        $output->writeln($this->translator->translate('Created tags') . sprintf(': ["<info>%s</info>"]', implode(
+            '</info>", "<info>',
+            $tagNames
+        )));
+    }
+}

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

@@ -0,0 +1,61 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Tag;
+
+use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Zend\I18n\Translator\TranslatorInterface;
+
+class DeleteTagsCommand extends Command
+{
+    /**
+     * @var TagServiceInterface
+     */
+    private $tagService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    public function __construct(TagServiceInterface $tagService, TranslatorInterface $translator)
+    {
+        $this->tagService = $tagService;
+        $this->translator = $translator;
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $this
+            ->setName('tag:delete')
+            ->setDescription($this->translator->translate('Deletes one or more tags.'))
+            ->addOption(
+                'name',
+                't',
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                $this->translator->translate('The name of the tags to delete')
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $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')
+            ));
+            return;
+        }
+
+        $this->tagService->deleteTags($tagNames);
+        $output->writeln($this->translator->translate('Deleted tags') . sprintf(': ["<info>%s</info>"]', implode(
+            '</info>", "<info>',
+            $tagNames
+        )));
+    }
+}

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

@@ -0,0 +1,59 @@
+<?php
+declare(strict_types=1);
+
+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 Zend\I18n\Translator\TranslatorInterface;
+
+class ListTagsCommand extends Command
+{
+    /**
+     * @var TagServiceInterface
+     */
+    private $tagService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    public function __construct(TagServiceInterface $tagService, TranslatorInterface $translator)
+    {
+        $this->tagService = $tagService;
+        $this->translator = $translator;
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $this
+            ->setName('tag:list')
+            ->setDescription($this->translator->translate('Lists existing tags.'));
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $table = new Table($output);
+        $table->setHeaders([$this->translator->translate('Name')])
+              ->setRows($this->getTagsRows());
+
+        $table->render();
+    }
+
+    private function getTagsRows()
+    {
+        $tags = $this->tagService->listTags();
+        if (empty($tags)) {
+            return [[$this->translator->translate('No tags yet')]];
+        }
+
+        return array_map(function (Tag $tag) {
+            return [$tag->getName()];
+        }, $tags);
+    }
+}

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

@@ -0,0 +1,55 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Command\Tag;
+
+use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
+use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
+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 Zend\I18n\Translator\TranslatorInterface;
+
+class RenameTagCommand extends Command
+{
+    /**
+     * @var TagServiceInterface
+     */
+    private $tagService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    public function __construct(TagServiceInterface $tagService, TranslatorInterface $translator)
+    {
+        $this->tagService = $tagService;
+        $this->translator = $translator;
+        parent::__construct();
+    }
+
+    protected function configure()
+    {
+        $this
+            ->setName('tag:rename')
+            ->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)
+    {
+        $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.')));
+        } catch (EntityDoesNotExistException $e) {
+            $output->writeln('<error>' . sprintf($this->translator->translate(
+                'A tag with name "%s" was not found'
+            ), $oldName) . '</error>');
+        }
+    }
+}

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

@@ -1,12 +1,11 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Visit;
 
-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\Service\IpLocationResolver;
 use Shlinkio\Shlink\Common\Service\IpLocationResolverInterface;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
-use Shlinkio\Shlink\Core\Service\VisitService;
 use Shlinkio\Shlink\Core\Service\VisitServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -30,14 +29,6 @@ class ProcessVisitsCommand extends Command
      */
     private $translator;
 
-    /**
-     * ProcessVisitsCommand constructor.
-     * @param VisitServiceInterface $visitService
-     * @param IpLocationResolverInterface $ipLocationResolver
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({VisitService::class, IpLocationResolver::class, "translator"})
-     */
     public function __construct(
         VisitServiceInterface $visitService,
         IpLocationResolverInterface $ipLocationResolver,

module/CLI/src/ConfigProvider.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI;
 
 use Zend\Config\Factory;

module/CLI/src/Factory/ApplicationFactory.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Factory;
 
 use Interop\Container\ContainerInterface;

module/CLI/src/Factory/InstallApplicationFactory.php

@@ -0,0 +1,57 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Factory;
+
+use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
+use Shlinkio\Shlink\CLI\Command\Install\InstallCommand;
+use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManager;
+use Shlinkio\Shlink\CLI\Install\Plugin;
+use Shlinkio\Shlink\CLI\Install\Plugin\Factory\DefaultConfigCustomizerPluginFactory;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Exception\LogicException;
+use Symfony\Component\Filesystem\Filesystem;
+use Zend\Config\Writer\PhpArray;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+class InstallApplicationFactory implements FactoryInterface
+{
+    /**
+     * Create an object
+     *
+     * @param  ContainerInterface $container
+     * @param  string $requestedName
+     * @param  null|array $options
+     * @return object
+     * @throws LogicException
+     * @throws ServiceNotFoundException if unable to resolve the 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)
+    {
+        $isUpdate = $options !== null && isset($options['isUpdate']) ? (bool) $options['isUpdate'] : false;
+
+        $app = new Application();
+        $command = new InstallCommand(
+            new PhpArray(),
+            $container->get(Filesystem::class),
+            new ConfigCustomizerPluginManager($container, ['factories' => [
+                Plugin\DatabaseConfigCustomizerPlugin::class => ConfigAbstractFactory::class,
+                Plugin\UrlShortenerConfigCustomizerPlugin::class => DefaultConfigCustomizerPluginFactory::class,
+                Plugin\LanguageConfigCustomizerPlugin::class => DefaultConfigCustomizerPluginFactory::class,
+                Plugin\ApplicationConfigCustomizerPlugin::class => DefaultConfigCustomizerPluginFactory::class,
+            ]]),
+            $isUpdate
+        );
+        $app->add($command);
+        $app->setDefaultCommand($command->getName());
+
+        return $app;
+    }
+}

module/CLI/src/Install/ConfigCustomizerPluginManager.php

@@ -0,0 +1,12 @@
+<?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

@@ -0,0 +1,10 @@
+<?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

@@ -0,0 +1,68 @@
+<?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

@@ -0,0 +1,43 @@
+<?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

@@ -0,0 +1,19 @@
+<?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

@@ -0,0 +1,100 @@
+<?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/Factory/DefaultConfigCustomizerPluginFactory.php

@@ -0,0 +1,31 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\CLI\Install\Plugin\Factory;
+
+use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+class DefaultConfigCustomizerPluginFactory implements FactoryInterface
+{
+    /**
+     * Create an object
+     *
+     * @param  ContainerInterface $container
+     * @param  string $requestedName
+     * @param  null|array $options
+     * @return object
+     * @throws ServiceNotFoundException if unable to resolve the 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)
+    {
+        return new $requestedName($container->get(QuestionHelper::class));
+    }
+}

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

@@ -0,0 +1,49 @@
+<?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

@@ -0,0 +1,57 @@
+<?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

@@ -0,0 +1,269 @@
+<?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-resources/config/params/generated_config.php

@@ -0,0 +1,2 @@
+<?php
+return [];

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

@@ -1,7 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Api\DisableKeyCommand;
 use Shlinkio\Shlink\Common\Exception\InvalidArgumentException;

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

@@ -1,7 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Api\GenerateKeyCommand;

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

@@ -1,7 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Api;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Api\ListKeysCommand;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;

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

@@ -1,7 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Config;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Command\Config\GenerateCharsetCommand;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Application;