Merge pull request #98 from shlinkio/develop

Develop

.gitignore

@@ -4,3 +4,4 @@ composer.lock
 vendor/
 .env
 data/database.sqlite
+docs/swagger-ui

.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('') => [
+        '' == '@',
+    ],
 ];

CHANGELOG.md

@@ -1,88 +1,155 @@
 ## CHANGELOG
 
+### 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)
-* [7: Add website previews while listing available URLs](https://github.com/acelaya/url-shortener/issues/7)
+* [45: Allow to define tags on short codes, to improve filtering and classification](https://github.com/shlinkio/shlink/issues/45)
+* [7: Add website previews while listing available URLs](https://github.com/shlinkio/shlink/issues/7)
 
 **Enhancements:**
 
-* [57: Add database migrations system to improve updating between versions](https://github.com/acelaya/url-shortener/issues/57)
-* [31: Add support for other database management systems by improving the EntityManager factory](https://github.com/acelaya/url-shortener/issues/31)
-* [51: Generate build process to paquetize the app and ease distribution](https://github.com/acelaya/url-shortener/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)
+* [57: Add database migrations system to improve updating between versions](https://github.com/shlinkio/shlink/issues/57)
+* [31: Add support for other database management systems by improving the EntityManager factory](https://github.com/shlinkio/shlink/issues/31)
+* [51: Generate build process to paquetize the app and ease distribution](https://github.com/shlinkio/shlink/issues/51)
+* [38: Define installation script. It will request dynamic data on the fly so that there is no need to define env vars](https://github.com/shlinkio/shlink/issues/38)
 
 **Tasks**
 
-* [55: Create update script which does not try to create a new database](https://github.com/acelaya/url-shortener/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)
-* [29: Use the acelaya/ze-content-based-error-handler package instead of custom error handler implementation](https://github.com/acelaya/url-shortener/issues/29)
+* [55: Create update script which does not try to create a new database](https://github.com/shlinkio/shlink/issues/55)
+* [54: Add cache namespace to prevent name collisions with other apps in the same environment](https://github.com/shlinkio/shlink/issues/54)
+* [29: Use the acelaya/ze-content-based-error-handler package instead of custom error handler implementation](https://github.com/shlinkio/shlink/issues/29)
 
 **Bugs**
 
-* [53: Fix entities database interoperability](https://github.com/acelaya/url-shortener/issues/53)
-* [52: Add missing htaccess file for apache environments](https://github.com/acelaya/url-shortener/issues/52)
+* [53: Fix entities database interoperability](https://github.com/shlinkio/shlink/issues/53)
+* [52: Add missing htaccess file for apache environments](https://github.com/shlinkio/shlink/issues/52)
 
 ### 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)
-* [14: https://github.com/shlinkio/shlink/issues/14](https://github.com/acelaya/url-shortener/issues/14)
-* [41: Cache the "short code" => "URL" map to prevent extra DB hits](https://github.com/acelaya/url-shortener/issues/41)
-* [13: Improve REST authentication](https://github.com/acelaya/url-shortener/issues/13)
+* [32: Add support for other cache adapters by improving the Cache factory](https://github.com/shlinkio/shlink/issues/32)
+* [14: https://github.com/shlinkio/shlink/issues/14](https://github.com/shlinkio/shlink/issues/14)
+* [41: Cache the "short code" => "URL" map to prevent extra DB hits](https://github.com/shlinkio/shlink/issues/41)
+* [13: Improve REST authentication](https://github.com/shlinkio/shlink/issues/13)
 
 **Tasks**
 
-* [39: Change copyright from "Alejandro Celaya" to "Shlink" in error pages](https://github.com/acelaya/url-shortener/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)
-* [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)
+* [39: Change copyright from "Alejandro Celaya" to "Shlink" in error pages](https://github.com/shlinkio/shlink/issues/39)
+* [42: Make REST endpoints that need to find something return a 404 when "something" is not found](https://github.com/shlinkio/shlink/issues/42)
+* [35: Make CLI commands to use the same PHP namespace as the one used for the command name](https://github.com/shlinkio/shlink/issues/35)
 
 **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)
-* [15: Return JSON/HTML responses for errors (4xx and 5xx) based on accept header (content negotiation)](https://github.com/acelaya/url-shortener/issues/15)
-* [23: Translate application literals](https://github.com/acelaya/url-shortener/issues/23)
-* [21: Allow to filter visits by date range](https://github.com/acelaya/url-shortener/issues/21)
-* [22: Save visits locations data on a visit_locations table](https://github.com/acelaya/url-shortener/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)
-* [11: Separate code into multiple modules](https://github.com/acelaya/url-shortener/issues/11)
-* [18: Group routable middleware in an Action namespace](https://github.com/acelaya/url-shortener/issues/18)
+* [33: Create a command to generate a short code charset by randomizing the default one](https://github.com/shlinkio/shlink/issues/33)
+* [15: Return JSON/HTML responses for errors (4xx and 5xx) based on accept header (content negotiation)](https://github.com/shlinkio/shlink/issues/15)
+* [23: Translate application literals](https://github.com/shlinkio/shlink/issues/23)
+* [21: Allow to filter visits by date range](https://github.com/shlinkio/shlink/issues/21)
+* [22: Save visits locations data on a visit_locations table](https://github.com/shlinkio/shlink/issues/22)
+* [20: Inject cross domain headers in response only if the Origin header is present in the request](https://github.com/shlinkio/shlink/issues/20)
+* [11: Separate code into multiple modules](https://github.com/shlinkio/shlink/issues/11)
+* [18: Group routable middleware in an Action namespace](https://github.com/shlinkio/shlink/issues/18)
 
 **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)
-* [4: Installation steps](https://github.com/acelaya/url-shortener/issues/4)
-* [6: Remove dependency on expressive helpers package](https://github.com/acelaya/url-shortener/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)
-* [12: Improve code coverage](https://github.com/acelaya/url-shortener/issues/12)
-* [25: Replace "Middleware" suffix on routable middlewares by "Action"](https://github.com/acelaya/url-shortener/issues/25)
-* [19: Update the vendor and app namespace from Acelaya\UrlShortener to Shlinkio\Shlink](https://github.com/acelaya/url-shortener/issues/19)
+* [36: Remove hhvm from the CI matrix since it doesn't support array constants and will fail](https://github.com/shlinkio/shlink/issues/36)
+* [4: Installation steps](https://github.com/shlinkio/shlink/issues/4)
+* [6: Remove dependency on expressive helpers package](https://github.com/shlinkio/shlink/issues/6)
+* [30: Replace the "services" first level config entry by "dependencies", in order to fulfill default Expressive name](https://github.com/shlinkio/shlink/issues/30)
+* [12: Improve code coverage](https://github.com/shlinkio/shlink/issues/12)
+* [25: Replace "Middleware" suffix on routable middlewares by "Action"](https://github.com/shlinkio/shlink/issues/25)
+* [19: Update the vendor and app namespace from Acelaya\UrlShortener to Shlinkio\Shlink](https://github.com/shlinkio/shlink/issues/19)
 
 **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)
-* [8: Create a REST API](https://github.com/acelaya/url-shortener/issues/8)
-* [10: Add more CLI functionality](https://github.com/acelaya/url-shortener/issues/10)
+* [9: Use symfony/console to dispatch console requests, instead of trying to integrate the process with expressive](https://github.com/shlinkio/shlink/issues/9)
+* [8: Create a REST API](https://github.com/shlinkio/shlink/issues/8)
+* [10: Add more CLI functionality](https://github.com/shlinkio/shlink/issues/10)
 
 **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';
-
-/** @var CliApp $app */
-$app = $container->get(CliApp::class);
-$app->run();
+$container->get(CliApp::class)->run();

bin/install

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

bin/update

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

build.sh

@@ -8,13 +8,14 @@ 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}"
 
@@ -22,7 +23,7 @@ cd "${builtcontent}"
 rm -r vendor
 rm 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 -f 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,29 +1,29 @@
 {
     "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",
-        "zendframework/zend-expressive": "^1.0",
-        "zendframework/zend-expressive-fastroute": "^1.1",
-        "zendframework/zend-expressive-twigrenderer": "^1.0",
-        "zendframework/zend-stdlib": "^2.7",
+        "zendframework/zend-expressive": "^2.0",
+        "zendframework/zend-expressive-fastroute": "^2.0",
+        "zendframework/zend-expressive-twigrenderer": "^1.4",
+        "zendframework/zend-stdlib": "^3.0",
         "zendframework/zend-servicemanager": "^3.0",
         "zendframework/zend-paginator": "^2.6",
-        "zendframework/zend-config": "^2.6",
+        "zendframework/zend-config": "^3.0",
         "zendframework/zend-i18n": "^2.7",
-        "mtymek/expressive-config-manager": "^0.4",
-        "acelaya/zsm-annotated-services": "^0.2.0",
-        "acelaya/ze-content-based-error-handler": "^1.0",
+        "zendframework/zend-config-aggregator": "^0.1",
+        "acelaya/zsm-annotated-services": "^1.0",
+        "acelaya/ze-content-based-error-handler": "^2.0",
         "doctrine/orm": "^2.5",
         "guzzlehttp/guzzle": "^6.2",
         "symfony/console": "^3.0",
@@ -37,12 +37,13 @@
         "doctrine/migrations": "^1.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0",
+        "phpunit/phpunit": "^5.7 || ^6.0",
         "squizlabs/php_codesniffer": "^2.3",
         "roave/security-advisories": "dev-master",
         "filp/whoops": "^2.0",
         "symfony/var-dumper": "^3.0",
-        "vlucas/phpdotenv": "^2.2"
+        "vlucas/phpdotenv": "^2.2",
+        "zendframework/zend-expressive-tooling": "^0.4"
     },
     "autoload": {
         "psr-4": {
@@ -73,5 +74,8 @@
         "serve": "php -S 0.0.0.0:8000 -t public/",
         "test": "phpunit --coverage-clover build/clover.xml",
         "pretty-test": "phpunit --coverage-html build/coverage"
+    },
+    "config": {
+        "process-timeout": 0
     }
 }

config/autoload/app_options.global.php

@@ -1,10 +1,12 @@
 <?php
+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,23 @@
 <?php
+use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory;
 use Zend\Expressive;
 use Zend\Expressive\Container;
+use Zend\Expressive\Middleware;
 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 => Twig\TwigRendererFactory::class,
-        ],
-        'aliases' => [
-            Router\RouterInterface::class => Router\FastRouteRouter::class,
+            \Twig_Environment::class => Twig\TwigEnvironmentFactory::class,
+            Router\RouterInterface::class => Router\FastRouteRouterFactory::class,
+            ErrorHandler::class => Container\ErrorHandlerFactory::class,
+            Middleware\ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,
         ],
     ],
 

config/autoload/entity-manager.global.php

@@ -1,4 +1,6 @@
 <?php
+use Shlinkio\Shlink\Common;
+
 return [
 
     'entity_manager' => [
@@ -6,14 +8,10 @@ return [
             'proxies_dir' => 'data/proxies',
         ],
         'connection' => [
-            'driver' => 'pdo_mysql',
-            'user' => env('DB_USER'),
-            'password' => env('DB_PASSWORD'),
-            'dbname' => env('DB_NAME', 'shlink'),
+            'user' => Common\env('DB_USER'),
+            'password' => Common\env('DB_PASSWORD'),
+            'dbname' => Common\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\WhoopsErrorHandlerFactory;
+use Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory;
 
 return [
     'dependencies' => [
@@ -21,7 +20,7 @@ return [
     'error_handler' => [
         'plugins' => [
             'factories' => [
-                ContentBasedErrorHandler::DEFAULT_CONTENT => WhoopsErrorHandlerFactory::class,
+                'text/html' => WhoopsErrorResponseGeneratorFactory::class,
             ],
         ],
     ],

config/autoload/middleware-pipeline.global.php

@@ -1,19 +1,51 @@
 <?php
-use Zend\Expressive\Container\ApplicationFactory;
+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/router.global.php

@@ -0,0 +1,13 @@
+<?php
+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/translator.global.php

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

config/autoload/url-shortener.global.php

@@ -1,14 +1,15 @@
 <?php
+use Shlinkio\Shlink\Common;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 
 return [
 
     'url_shortener' => [
         'domain' => [
-            'schema' => env('SHORTENED_URL_SCHEMA', 'http'),
-            'hostname' => env('SHORTENED_URL_HOSTNAME'),
+            'schema' => Common\env('SHORTENED_URL_SCHEMA', 'http'),
+            'hostname' => Common\env('SHORTENED_URL_HOSTNAME'),
         ],
-        'shortcode_chars' => env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
+        'shortcode_chars' => Common\env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
     ],
 
 ];

config/config.php

@@ -4,7 +4,7 @@ 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 +15,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();

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,87 @@
+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/php7.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

data/infra/php.ini

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

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

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

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,11 @@
 <?php
 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,6 +18,10 @@ 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

@@ -21,6 +21,10 @@ return [
             Command\Api\GenerateKeyCommand::class => AnnotatedFactory::class,
             Command\Api\DisableKeyCommand::class => AnnotatedFactory::class,
             Command\Api\ListKeysCommand::class => AnnotatedFactory::class,
+            Command\Tag\ListTagsCommand::class => AnnotatedFactory::class,
+            Command\Tag\CreateTagCommand::class => AnnotatedFactory::class,
+            Command\Tag\RenameTagCommand::class => AnnotatedFactory::class,
+            Command\Tag\DeleteTagsCommand::class => AnnotatedFactory::class,
         ],
     ],
 

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"
-"PO-Revision-Date: 2016-08-21 18:16+0200\n"
+"POT-Creation-Date: 2017-07-16 09:35+0200\n"
+"PO-Revision-Date: 2017-07-16 09:39+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"
@@ -162,6 +162,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"
 
@@ -207,6 +223,53 @@ msgstr "URL larga:"
 msgid "Provided short code \"%s\" has an invalid format."
 msgstr "El código corto proporcionado \"%s\" tiene un formato inválido."
 
+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

@@ -32,7 +32,7 @@ class DisableKeyCommand extends Command
     {
         $this->apiKeyService = $apiKeyService;
         $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
     }
 
     public function configure()

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

@@ -73,15 +73,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[] = $row->isEnabled() ? $this->getSuccessString('+++') : $this->getErrorString('---');
+                $rowData[] = $this->{$formatMethod}($key);
+                $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 +108,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/Install/InstallCommand.php

@@ -1,27 +1,25 @@
 <?php
 namespace Shlinkio\Shlink\CLI\Command\Install;
 
-use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
-use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManagerInterface;
+use Shlinkio\Shlink\CLI\Install\Plugin;
+use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\LogicException;
+use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\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 DATABASE_DRIVERS = [
-        'MySQL' => 'pdo_mysql',
-        'PostgreSQL' => 'pdo_pgsql',
-        'SQLite' => 'pdo_sqlite',
-    ];
-    const SUPPORTED_LANGUAGES = ['en', 'es'];
+    const GENERATED_CONFIG_PATH = 'config/params/generated_config.php';
 
     /**
      * @var InputInterface
@@ -43,22 +41,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)
-    {
-        parent::__construct(null);
+    public function __construct(
+        WriterInterface $configWriter,
+        Filesystem $filesystem,
+        ConfigCustomizerPluginManagerInterface $configCustomizers,
+        $isUpdate = false
+    ) {
+        parent::__construct();
         $this->configWriter = $configWriter;
+        $this->isUpdate = $isUpdate;
+        $this->filesystem = $filesystem;
+        $this->configCustomizers = $configCustomizers;
     }
 
     public function configure()
     {
-        $this->setName('shlink:install')
-             ->setDescription('Installs Shlink');
+        $this
+            ->setName('shlink:install')
+            ->setDescription('Installs or updates Shlink');
     }
 
     public function execute(InputInterface $input, OutputInterface $output)
@@ -67,40 +87,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();
-        $params['URL_SHORTENER'] = $this->askUrlShortener();
-        $params['LANGUAGE'] = $this->askLanguage();
-        $params['APP'] = $this->askApplication();
+        foreach ([
+            Plugin\DatabaseConfigCustomizerPlugin::class,
+            Plugin\UrlShortenerConfigCustomizerPlugin::class,
+            Plugin\LanguageConfigCustomizerPlugin::class,
+            Plugin\ApplicationConfigCustomizerPlugin::class,
+        ] as $pluginName) {
+            /** @var Plugin\ConfigCustomizerPluginInterface $configCustomizer */
+            $configCustomizer = $this->configCustomizers->get($pluginName);
+            $configCustomizer->process($input, $output, $config);
+        }
 
         // Generate config params files
-        $config = $this->buildAppConfig($params);
-        $this->configWriter->toFile('config/params/generated_config.php', $config, false);
+        $this->configWriter->toFile(self::GENERATED_CONFIG_PATH, $config->getArrayCopy(), false);
         $output->writeln(['<info>Custom configuration properly generated!</info>', '']);
 
-        // Generate database
-        if (! $this->createDatabase()) {
-            return;
+        // If current command is not update, generate database
+        if (!  $this->isUpdate) {
+            $this->output->writeln('Initializing database...');
+            if (! $this->runCommand(
+                'php vendor/bin/doctrine.php orm:schema-tool:create',
+                'Error generating database.'
+            )) {
+                return;
+            }
         }
 
         // Run database migrations
@@ -116,98 +154,47 @@ class InstallCommand extends Command
         }
     }
 
-    protected function askDatabase()
+    /**
+     * @return CustomizableAppConfig
+     * @throws RuntimeException
+     */
+    private function importConfig()
     {
-        $params = [];
-        $this->printTitle('DATABASE');
+        $config = new CustomizableAppConfig();
 
-        // Select database type
-        $databases = array_keys(self::DATABASE_DRIVERS);
-        $dbType = $this->questionHelper->ask($this->input, $this->output, new ChoiceQuestion(
-            '<question>Select database type (defaults to ' . $databases[0] . '):</question>',
-            $databases,
-            0
+        // Ask the user if he/she wants to import an older configuration
+        $importConfig = $this->questionHelper->ask($this->input, $this->output, new ConfirmationQuestion(
+            '<question>Do you want to import previous configuration? (Y/n):</question> '
         ));
-        $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('Database name', 'shlink');
-            $params['USER'] = $this->ask('Database username');
-            $params['PASSWORD'] = $this->ask('Database password');
+        if (! $importConfig) {
+            return $config;
         }
 
-        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()
-    {
-        $this->printTitle('URL SHORTENER');
+            if (! $configExists) {
+                $keepAsking = $this->questionHelper->ask($this->input, $this->output, new ConfirmationQuestion(
+                    'Provided path does not seem to be a valid shlink root path. '
+                    . '<question>Do you want to try another path? (Y/n):</question> '
+                ));
+            }
+        } while (! $configExists && $keepAsking);
 
-        // Ask for URL shortener params
-        return [
-            'SCHEMA' => $this->questionHelper->ask($this->input, $this->output, new ChoiceQuestion(
-                '<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)
-        ];
-    }
+        // If after some retries the user has chosen not to test another path, return
+        if (! $configExists) {
+            return $config;
+        }
 
-    protected function askLanguage()
-    {
-        $this->printTitle('LANGUAGE');
-
-        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>',
-        ]);
+        // Read the config file
+        $config->exchangeArray(include $configFile);
+        return $config;
     }
 
     /**
@@ -215,10 +202,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 +217,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;
-            }
-            $this->output->writeln(
-                '    <error>' . $errorMessage . '</error>  Run this command with -vvv to see specific error info.'
-            );
+        }
+
+        if ($this->output->isVerbose()) {
             return false;
         }
+
+        $this->output->writeln(
+            '    <error>' . $errorMessage . '</error>  Run this command with -vvv to see specific error info.'
+        );
+        return false;
     }
 }

module/CLI/src/Command/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/ListShortcodesCommand.php

@@ -56,9 +56,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')
              );
@@ -67,13 +89,17 @@ class ListShortcodesCommand extends Command
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $page = intval($input->getOption('page'));
-        $showTags = $input->getOption('tags');
+        $searchTerm = $input->getOption('searchTerm');
+        $tags = $input->getOption('tags');
+        $tags = ! empty($tags) ? explode(',', $tags) : [];
+        $showTags = $input->getOption('showTags');
+        $orderBy = $input->getOption('orderBy');
 
         /** @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 +145,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/Tag/CreateTagCommand.php

@@ -0,0 +1,69 @@
+<?php
+namespace Shlinkio\Shlink\CLI\Command\Tag;
+
+use Acelaya\ZsmAnnotatedServices\Annotation as DI;
+use Shlinkio\Shlink\Core\Service\Tag\TagService;
+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\Translator;
+use Zend\I18n\Translator\TranslatorInterface;
+
+class CreateTagCommand extends Command
+{
+    /**
+     * @var TagServiceInterface
+     */
+    private $tagService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    /**
+     * CreateTagCommand constructor.
+     * @param TagServiceInterface $tagService
+     * @param TranslatorInterface $translator
+     *
+     * @DI\Inject({TagService::class, Translator::class})
+     */
+    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,69 @@
+<?php
+namespace Shlinkio\Shlink\CLI\Command\Tag;
+
+use Acelaya\ZsmAnnotatedServices\Annotation as DI;
+use Shlinkio\Shlink\Core\Service\Tag\TagService;
+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\Translator;
+use Zend\I18n\Translator\TranslatorInterface;
+
+class DeleteTagsCommand extends Command
+{
+    /**
+     * @var TagServiceInterface
+     */
+    private $tagService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    /**
+     * ListTagsCommand constructor.
+     * @param TagServiceInterface $tagService
+     * @param TranslatorInterface $translator
+     *
+     * @DI\Inject({TagService::class, Translator::class})
+     */
+    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,67 @@
+<?php
+namespace Shlinkio\Shlink\CLI\Command\Tag;
+
+use Acelaya\ZsmAnnotatedServices\Annotation as DI;
+use Shlinkio\Shlink\Core\Entity\Tag;
+use Shlinkio\Shlink\Core\Service\Tag\TagService;
+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\Translator;
+use Zend\I18n\Translator\TranslatorInterface;
+
+class ListTagsCommand extends Command
+{
+    /**
+     * @var TagServiceInterface
+     */
+    private $tagService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    /**
+     * ListTagsCommand constructor.
+     * @param TagServiceInterface $tagService
+     * @param TranslatorInterface $translator
+     *
+     * @DI\Inject({TagService::class, Translator::class})
+     */
+    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,63 @@
+<?php
+namespace Shlinkio\Shlink\CLI\Command\Tag;
+
+use Acelaya\ZsmAnnotatedServices\Annotation as DI;
+use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
+use Shlinkio\Shlink\Core\Service\Tag\TagService;
+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\Translator;
+use Zend\I18n\Translator\TranslatorInterface;
+
+class RenameTagCommand extends Command
+{
+    /**
+     * @var TagServiceInterface
+     */
+    private $tagService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    /**
+     * RenameTagCommand constructor.
+     * @param TagServiceInterface $tagService
+     * @param TranslatorInterface $translator
+     *
+     * @DI\Inject({TagService::class, Translator::class})
+     */
+    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/Factory/InstallApplicationFactory.php

@@ -0,0 +1,55 @@
+<?php
+namespace Shlinkio\Shlink\CLI\Factory;
+
+use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
+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\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 => AnnotatedFactory::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,10 @@
+<?php
+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,8 @@
+<?php
+namespace Shlinkio\Shlink\CLI\Install;
+
+use Psr\Container\ContainerInterface;
+
+interface ConfigCustomizerPluginManagerInterface extends ContainerInterface
+{
+}

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

@@ -0,0 +1,66 @@
+<?php
+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,41 @@
+<?php
+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,17 @@
+<?php
+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,98 @@
+<?php
+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,29 @@
+<?php
+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,47 @@
+<?php
+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,48 @@
+<?php
+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)
+        ]);
+    }
+}

module/CLI/src/Model/CustomizableAppConfig.php

@@ -0,0 +1,265 @@
+<?php
+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'],
+            ]);
+        }
+    }
+
+    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'],
+            ],
+        ];
+
+        // 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,7 @@
 <?php
 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,7 @@
 <?php
 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,7 @@
 <?php
 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,7 @@
 <?php
 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;

module/CLI/test/Command/Install/InstallCommandTest.php

@@ -1,18 +1,27 @@
 <?php
 namespace ShlinkioTest\Shlink\CLI\Command\Install;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Install\InstallCommand;
+use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManagerInterface;
+use Shlinkio\Shlink\CLI\Install\Plugin\ConfigCustomizerPluginInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\Filesystem\Exception\IOException;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Process\Process;
 use Zend\Config\Writer\WriterInterface;
 
 class InstallCommandTest extends TestCase
 {
+    /**
+     * @var InstallCommand
+     */
+    protected $command;
     /**
      * @var CommandTester
      */
@@ -21,6 +30,10 @@ class InstallCommandTest extends TestCase
      * @var ObjectProphecy
      */
     protected $configWriter;
+    /**
+     * @var ObjectProphecy
+     */
+    protected $filesystem;
 
     public function setUp()
     {
@@ -31,74 +44,96 @@ class InstallCommandTest extends TestCase
         $processHelper->setHelperSet(Argument::any())->willReturn(null);
         $processHelper->run(Argument::cetera())->willReturn($processMock->reveal());
 
+        $this->filesystem = $this->prophesize(Filesystem::class);
+        $this->filesystem->exists(Argument::cetera())->willReturn(false);
+
+        $this->configWriter = $this->prophesize(WriterInterface::class);
+
+        $configCustomizer = $this->prophesize(ConfigCustomizerPluginInterface::class);
+        $configCustomizers = $this->prophesize(ConfigCustomizerPluginManagerInterface::class);
+        $configCustomizers->get(Argument::cetera())->willReturn($configCustomizer->reveal());
+
         $app = new Application();
         $helperSet = $app->getHelperSet();
         $helperSet->set($processHelper->reveal());
         $app->setHelperSet($helperSet);
-
-        $this->configWriter = $this->prophesize(WriterInterface::class);
-        $command = new InstallCommand($this->configWriter->reveal());
-        $app->add($command);
-
-        $questionHelper = $command->getHelper('question');
-        $questionHelper->setInputStream($this->createInputStream());
-        $this->commandTester = new CommandTester($command);
-    }
-
-    protected function createInputStream()
-    {
-        $stream = fopen('php://memory', 'r+', false);
-        fputs($stream, <<<CLI_INPUT
-
-shlink_db
-alejandro
-1234
-0
-doma.in
-abc123BCA
-
-1
-my_secret
-CLI_INPUT
+        $this->command = new InstallCommand(
+            $this->configWriter->reveal(),
+            $this->filesystem->reveal(),
+            $configCustomizers->reveal()
         );
-        rewind($stream);
+        $app->add($this->command);
 
-        return $stream;
+        $this->commandTester = new CommandTester($this->command);
     }
 
     /**
      * @test
      */
-    public function testInputIsProperlyParsed()
+    public function generatedConfigIsProperlyPersisted()
     {
-        $this->configWriter->toFile(Argument::any(), [
-            'app_options' => [
-                'secret_key' => 'my_secret',
-            ],
-            'entity_manager' => [
-                'connection' => [
-                    'driver' => 'pdo_mysql',
-                    'dbname' => 'shlink_db',
-                    'user' => 'alejandro',
-                    'password' => '1234',
-                ],
-            ],
-            'translator' => [
-                'locale' => 'en',
-            ],
-            'cli' => [
-                'locale' => 'es',
-            ],
-            'url_shortener' => [
-                'domain' => [
-                    'schema' => 'http',
-                    'hostname' => 'doma.in',
-                ],
-                'shortcode_chars' => 'abc123BCA',
-            ],
-        ], false)->shouldBeCalledTimes(1);
-        $this->commandTester->execute([
-            'command' => 'shlink:install',
+        $this->configWriter->toFile(Argument::any(), Argument::type('array'), false)->shouldBeCalledTimes(1);
+        $this->commandTester->execute([]);
+    }
+
+    /**
+     * @test
+     */
+    public function cachedConfigIsDeletedIfExists()
+    {
+        /** @var MethodProphecy $appConfigExists */
+        $appConfigExists = $this->filesystem->exists('data/cache/app_config.php')->willReturn(true);
+        /** @var MethodProphecy $appConfigRemove */
+        $appConfigRemove = $this->filesystem->remove('data/cache/app_config.php')->willReturn(null);
+
+        $this->commandTester->execute([]);
+
+        $appConfigExists->shouldHaveBeenCalledTimes(1);
+        $appConfigRemove->shouldHaveBeenCalledTimes(1);
+    }
+
+    /**
+     * @test
+     */
+    public function exceptionWhileDeletingCachedConfigCancelsProcess()
+    {
+        /** @var MethodProphecy $appConfigExists */
+        $appConfigExists = $this->filesystem->exists('data/cache/app_config.php')->willReturn(true);
+        /** @var MethodProphecy $appConfigRemove */
+        $appConfigRemove = $this->filesystem->remove('data/cache/app_config.php')->willThrow(IOException::class);
+        /** @var MethodProphecy $configToFile */
+        $configToFile = $this->configWriter->toFile(Argument::cetera())->willReturn(true);
+
+        $this->commandTester->execute([]);
+
+        $appConfigExists->shouldHaveBeenCalledTimes(1);
+        $appConfigRemove->shouldHaveBeenCalledTimes(1);
+        $configToFile->shouldNotHaveBeenCalled();
+    }
+
+    /**
+     * @test
+     */
+    public function whenCommandIsUpdatePreviousConfigCanBeImported()
+    {
+        $ref = new \ReflectionObject($this->command);
+        $prop = $ref->getProperty('isUpdate');
+        $prop->setAccessible(true);
+        $prop->setValue($this->command, true);
+
+        /** @var MethodProphecy $importedConfigExists */
+        $importedConfigExists = $this->filesystem->exists(
+            __DIR__ . '/../../../test-resources/' . InstallCommand::GENERATED_CONFIG_PATH
+        )->willReturn(true);
+
+        $this->commandTester->setInputs([
+            '',
+            '/foo/bar/wrong_previous_shlink',
+            '',
+            __DIR__ . '/../../../test-resources',
         ]);
+        $this->commandTester->execute([]);
+
+        $importedConfigExists->shouldHaveBeenCalled();
     }
 }

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

@@ -1,7 +1,7 @@
 <?php
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Shortcode\GeneratePreviewCommand;

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

@@ -1,7 +1,7 @@
 <?php
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Shortcode\GenerateShortcodeCommand;

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

@@ -1,7 +1,7 @@
 <?php
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Shortcode\GetVisitsCommand;

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

@@ -1,7 +1,7 @@
 <?php
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Shortcode\ListShortcodesCommand;
@@ -46,8 +46,8 @@ class ListShortcodesCommandTest extends TestCase
     public function noInputCallsListJustOnce()
     {
         $this->questionHelper->setInputStream($this->getInputStream('\n'));
-        $this->shortUrlService->listShortUrls(1)->willReturn(new Paginator(new ArrayAdapter()))
-                                                ->shouldBeCalledTimes(1);
+        $this->shortUrlService->listShortUrls(1, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
+                                                                ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute(['command' => 'shortcode:list']);
     }
@@ -66,7 +66,11 @@ class ListShortcodesCommandTest extends TestCase
 
         $questionHelper = $this->questionHelper;
         $that = $this;
-        $this->shortUrlService->listShortUrls(Argument::any())->will(function () use (&$data, $questionHelper, $that) {
+        $this->shortUrlService->listShortUrls(Argument::cetera())->will(function () use (
+            &$data,
+            $questionHelper,
+            $that
+        ) {
             $questionHelper->setInputStream($that->getInputStream('y'));
             return new Paginator(new ArrayAdapter(array_shift($data)));
         })->shouldBeCalledTimes(3);
@@ -86,8 +90,8 @@ class ListShortcodesCommandTest extends TestCase
         }
 
         $this->questionHelper->setInputStream($this->getInputStream('n'));
-        $this->shortUrlService->listShortUrls(Argument::any())->willReturn(new Paginator(new ArrayAdapter($data)))
-                                                              ->shouldBeCalledTimes(1);
+        $this->shortUrlService->listShortUrls(Argument::cetera())->willReturn(new Paginator(new ArrayAdapter($data)))
+                                                                 ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute(['command' => 'shortcode:list']);
     }
@@ -99,8 +103,8 @@ class ListShortcodesCommandTest extends TestCase
     {
         $page = 5;
         $this->questionHelper->setInputStream($this->getInputStream('\n'));
-        $this->shortUrlService->listShortUrls($page)->willReturn(new Paginator(new ArrayAdapter()))
-                                                    ->shouldBeCalledTimes(1);
+        $this->shortUrlService->listShortUrls($page, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
+                                                                    ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute([
             'command' => 'shortcode:list',
@@ -114,12 +118,12 @@ class ListShortcodesCommandTest extends TestCase
     public function ifTagsFlagIsProvidedTagsColumnIsIncluded()
     {
         $this->questionHelper->setInputStream($this->getInputStream('\n'));
-        $this->shortUrlService->listShortUrls(1)->willReturn(new Paginator(new ArrayAdapter()))
-                                                ->shouldBeCalledTimes(1);
+        $this->shortUrlService->listShortUrls(1, null, [], null)->willReturn(new Paginator(new ArrayAdapter()))
+                                                                ->shouldBeCalledTimes(1);
 
         $this->commandTester->execute([
             'command' => 'shortcode:list',
-            '--tags' => true,
+            '--showTags' => true,
         ]);
         $output = $this->commandTester->getDisplay();
         $this->assertTrue(strpos($output, 'Tags') > 0);

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

@@ -1,7 +1,7 @@
 <?php
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Shortcode\ResolveUrlCommand;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;

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

@@ -0,0 +1,67 @@
+<?php
+namespace ShlinkioTest\Shlink\CLI\Command\Tag;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\MethodProphecy;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Tag\CreateTagCommand;
+use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Zend\I18n\Translator\Translator;
+
+class CreateTagCommandTest extends TestCase
+{
+    /**
+     * @var CreateTagCommand
+     */
+    private $command;
+    /**
+     * @var CommandTester
+     */
+    private $commandTester;
+    /**
+     * @var ObjectProphecy
+     */
+    private $tagService;
+
+    public function setUp()
+    {
+        $this->tagService = $this->prophesize(TagServiceInterface::class);
+
+        $command = new CreateTagCommand($this->tagService->reveal(), Translator::factory([]));
+        $app = new Application();
+        $app->add($command);
+
+        $this->commandTester = new CommandTester($command);
+    }
+
+    /**
+     * @test
+     */
+    public function errorIsReturnedWhenNoTagsAreProvided()
+    {
+        $this->commandTester->execute([]);
+
+        $output = $this->commandTester->getDisplay();
+        $this->assertContains('You have to provide at least one tag name', $output);
+    }
+
+    /**
+     * @test
+     */
+    public function serviceIsInvokedOnSuccess()
+    {
+        $tagNames = ['foo', 'bar'];
+        /** @var MethodProphecy $createTags */
+        $createTags = $this->tagService->createTags($tagNames)->willReturn([]);
+
+        $this->commandTester->execute([
+            '--name' => $tagNames,
+        ]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains(sprintf('Created tags: ["%s"]', implode('", "', $tagNames)), $output);
+        $createTags->shouldHaveBeenCalled();
+    }
+}

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

@@ -0,0 +1,68 @@
+<?php
+namespace ShlinkioTest\Shlink\CLI\Command\Tag;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\MethodProphecy;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Tag\DeleteTagsCommand;
+use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Zend\I18n\Translator\Translator;
+
+class DeleteTagsCommandTest extends TestCase
+{
+    /**
+     * @var DeleteTagsCommand
+     */
+    private $command;
+    /**
+     * @var CommandTester
+     */
+    private $commandTester;
+    /**
+     * @var ObjectProphecy
+     */
+    private $tagService;
+
+    public function setUp()
+    {
+        $this->tagService = $this->prophesize(TagServiceInterface::class);
+
+        $command = new DeleteTagsCommand($this->tagService->reveal(), Translator::factory([]));
+        $app = new Application();
+        $app->add($command);
+
+        $this->commandTester = new CommandTester($command);
+    }
+
+    /**
+     * @test
+     */
+    public function errorIsReturnedWhenNoTagsAreProvided()
+    {
+        $this->commandTester->execute([]);
+
+        $output = $this->commandTester->getDisplay();
+        $this->assertContains('You have to provide at least one tag name', $output);
+    }
+
+    /**
+     * @test
+     */
+    public function serviceIsInvokedOnSuccess()
+    {
+        $tagNames = ['foo', 'bar'];
+        /** @var MethodProphecy $deleteTags */
+        $deleteTags = $this->tagService->deleteTags($tagNames)->will(function () {
+        });
+
+        $this->commandTester->execute([
+            '--name' => $tagNames,
+        ]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains(sprintf('Deleted tags: ["%s"]', implode('", "', $tagNames)), $output);
+        $deleteTags->shouldHaveBeenCalled();
+    }
+}

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

@@ -0,0 +1,73 @@
+<?php
+namespace ShlinkioTest\Shlink\CLI\Command\Tag;
+
+use Prophecy\Prophecy\MethodProphecy;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Tag\ListTagsCommand;
+use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\Core\Entity\Tag;
+use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Zend\I18n\Translator\Translator;
+
+class ListTagsCommandTest extends TestCase
+{
+    /**
+     * @var ListTagsCommand
+     */
+    private $command;
+    /**
+     * @var CommandTester
+     */
+    private $commandTester;
+    /**
+     * @var ObjectProphecy
+     */
+    private $tagService;
+
+    public function setUp()
+    {
+        $this->tagService = $this->prophesize(TagServiceInterface::class);
+
+        $command = new ListTagsCommand($this->tagService->reveal(), Translator::factory([]));
+        $app = new Application();
+        $app->add($command);
+
+        $this->commandTester = new CommandTester($command);
+    }
+
+    /**
+     * @test
+     */
+    public function noTagsPrintsEmptyMessage()
+    {
+        /** @var MethodProphecy $listTags */
+        $listTags = $this->tagService->listTags()->willReturn([]);
+
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains('No tags yet', $output);
+        $listTags->shouldHaveBeenCalled();
+    }
+
+    /**
+     * @test
+     */
+    public function listOfTagsIsPrinted()
+    {
+        /** @var MethodProphecy $listTags */
+        $listTags = $this->tagService->listTags()->willReturn([
+            (new Tag())->setName('foo'),
+            (new Tag())->setName('bar'),
+        ]);
+
+        $this->commandTester->execute([]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains('foo', $output);
+        $this->assertContains('bar', $output);
+        $listTags->shouldHaveBeenCalled();
+    }
+}

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

@@ -0,0 +1,80 @@
+<?php
+namespace ShlinkioTest\Shlink\CLI\Command\Tag;
+
+use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\MethodProphecy;
+use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\CLI\Command\Tag\RenameTagCommand;
+use Shlinkio\Shlink\Core\Entity\Tag;
+use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
+use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Zend\I18n\Translator\Translator;
+
+class RenameTagCommandTest extends TestCase
+{
+    /**
+     * @var RenameTagCommand
+     */
+    private $command;
+    /**
+     * @var CommandTester
+     */
+    private $commandTester;
+    /**
+     * @var ObjectProphecy
+     */
+    private $tagService;
+
+    public function setUp()
+    {
+        $this->tagService = $this->prophesize(TagServiceInterface::class);
+
+        $command = new RenameTagCommand($this->tagService->reveal(), Translator::factory([]));
+        $app = new Application();
+        $app->add($command);
+
+        $this->commandTester = new CommandTester($command);
+    }
+
+    /**
+     * @test
+     */
+    public function errorIsPrintedIfExceptionIsThrown()
+    {
+        $oldName = 'foo';
+        $newName = 'bar';
+        /** @var MethodProphecy $renameTag */
+        $renameTag = $this->tagService->renameTag($oldName, $newName)->willThrow(EntityDoesNotExistException::class);
+
+        $this->commandTester->execute([
+            'oldName' => $oldName,
+            'newName' => $newName,
+        ]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains('A tag with name "foo" was not found', $output);
+        $renameTag->shouldHaveBeenCalled();
+    }
+
+    /**
+     * @test
+     */
+    public function successIsPrintedIfNoErrorOccurs()
+    {
+        $oldName = 'foo';
+        $newName = 'bar';
+        /** @var MethodProphecy $renameTag */
+        $renameTag = $this->tagService->renameTag($oldName, $newName)->willReturn(new Tag());
+
+        $this->commandTester->execute([
+            'oldName' => $oldName,
+            'newName' => $newName,
+        ]);
+        $output = $this->commandTester->getDisplay();
+
+        $this->assertContains('Tag properly renamed', $output);
+        $renameTag->shouldHaveBeenCalled();
+    }
+}

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

@@ -1,7 +1,7 @@
 <?php
 namespace ShlinkioTest\Shlink\CLI\Command\Visit;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Visit\ProcessVisitsCommand;

module/CLI/test/ConfigProviderTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace ShlinkioTest\Shlink\CLI;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\ConfigProvider;
 
 class ConfigProviderTest extends TestCase

module/CLI/test/Factory/ApplicationFactoryTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace ShlinkioTest\Shlink\CLI\Factory;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Symfony\Component\Console\Application;

module/CLI/test/Factory/InstallApplicationFactoryTest.php

@@ -0,0 +1,33 @@
+<?php
+namespace ShlinkioTest\Shlink\CLI\Factory;
+
+use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Filesystem\Filesystem;
+use Zend\ServiceManager\ServiceManager;
+
+class InstallApplicationFactoryTest extends TestCase
+{
+    /**
+     * @var InstallApplicationFactory
+     */
+    private $factory;
+
+    public function setUp()
+    {
+        $this->factory = new InstallApplicationFactory();
+    }
+
+    /**
+     * @test
+     */
+    public function serviceIsCreated()
+    {
+        $instance = $this->factory->__invoke(new ServiceManager(['services' => [
+            Filesystem::class => $this->prophesize(Filesystem::class)->reveal(),
+        ]]), '');
+
+        $this->assertInstanceOf(Application::class, $instance);
+    }
+}

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

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

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

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

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

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

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

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

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

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

module/Common/config/middleware-pipeline.config.php

@@ -1,15 +0,0 @@
-<?php
-use Shlinkio\Shlink\Common\Middleware;
-
-return [
-
-    'middleware_pipeline' => [
-        'pre-routing' => [
-            'middleware' => [
-                Middleware\LocaleMiddleware::class,
-            ],
-            'priority' => 5,
-        ],
-    ],
-
-];

module/Common/functions/functions.php

@@ -1,36 +1,36 @@
 <?php
-if (! function_exists('env')) {
-    /**
-     * Gets the value of an environment variable. Supports boolean, empty and null.
-     * This is basically Laravel's env helper
-     *
-     * @param string $key
-     * @param mixed $default
-     * @return mixed
-     * @link https://github.com/laravel/framework/blob/5.2/src/Illuminate/Foundation/helpers.php#L369
-     */
-    function env($key, $default = null)
-    {
-        $value = getenv($key);
-        if ($value === false) {
-            return $default;
-        }
+namespace Shlinkio\Shlink\Common;
 
-        switch (strtolower($value)) {
-            case 'true':
-            case '(true)':
-                return true;
-            case 'false':
-            case '(false)':
-                return false;
-            case 'empty':
-            case '(empty)':
-                return '';
-            case 'null':
-            case '(null)':
-                return null;
-        }
-
-        return trim($value);
+/**
+ * Gets the value of an environment variable. Supports boolean, empty and null.
+ * This is basically Laravel's env helper
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ * @link https://github.com/laravel/framework/blob/5.2/src/Illuminate/Foundation/helpers.php#L369
+ */
+function env($key, $default = null)
+{
+    $value = getenv($key);
+    if ($value === false) {
+        return $default;
     }
+
+    switch (strtolower($value)) {
+        case 'true':
+        case '(true)':
+            return true;
+        case 'false':
+        case '(false)':
+            return false;
+        case 'empty':
+        case '(empty)':
+            return '';
+        case 'null':
+        case '(null)':
+            return null;
+    }
+
+    return trim($value);
 }

module/Common/src/Factory/CacheFactory.php

@@ -4,6 +4,7 @@ namespace Shlinkio\Shlink\Common\Factory;
 use Doctrine\Common\Cache;
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
+use Shlinkio\Shlink\Common;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
@@ -48,15 +49,14 @@ class CacheFactory implements FactoryInterface
     {
         // Try to get the adapter from config
         $config = $container->get('config');
-        if (isset($config['cache'])
-            && isset($config['cache']['adapter'])
+        if (isset($config['cache'], $config['cache']['adapter'])
             && in_array($config['cache']['adapter'], self::VALID_CACHE_ADAPTERS)
         ) {
             return $this->resolveCacheAdapter($config['cache']);
         }
 
         // If the adapter has not been set in config, create one based on environment
-        return env('APP_ENV', 'pro') === 'pro' ? new Cache\ApcuCache() : new Cache\ArrayCache();
+        return Common\env('APP_ENV', 'pro') === 'pro' ? new Cache\ApcuCache() : new Cache\ArrayCache();
     }
 
     /**
@@ -80,7 +80,7 @@ class CacheFactory implements FactoryInterface
                     if (! isset($server['host'])) {
                         continue;
                     }
-                    $port = isset($server['port']) ? intval($server['port']) : 11211;
+                    $port = isset($server['port']) ? (int) $server['port'] : 11211;
 
                     $memcached->addServer($server['host'], $port);
                 }

module/Common/src/Factory/EmptyResponseImplicitOptionsMiddlewareFactory.php

@@ -0,0 +1,30 @@
+<?php
+namespace Shlinkio\Shlink\Common\Factory;
+
+use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
+use Zend\Diactoros\Response\EmptyResponse;
+use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
+use Zend\ServiceManager\Factory\FactoryInterface;
+
+class EmptyResponseImplicitOptionsMiddlewareFactory 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 ImplicitOptionsMiddleware(new EmptyResponse());
+    }
+}

module/Common/src/Middleware/LocaleMiddleware.php

@@ -2,10 +2,11 @@
 namespace Shlinkio\Shlink\Common\Middleware;
 
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Zend\I18n\Translator\Translator;
-use Zend\Stratigility\MiddlewareInterface;
 
 class LocaleMiddleware implements MiddlewareInterface
 {
@@ -25,40 +26,26 @@ class LocaleMiddleware implements MiddlewareInterface
         $this->translator = $translator;
     }
 
+
+
     /**
-     * Process an incoming request and/or response.
-     *
-     * Accepts a server-side request and a response instance, and does
-     * something with them.
-     *
-     * If the response is not complete and/or further processing would not
-     * interfere with the work done in the middleware, or if the middleware
-     * wants to delegate to another process, it can use the `$out` callable
-     * if present.
-     *
-     * If the middleware does not return a value, execution of the current
-     * request is considered complete, and the response instance provided will
-     * be considered the response to return.
-     *
-     * Alternately, the middleware may return a response instance.
-     *
-     * Often, middleware will `return $out();`, with the assumption that a
-     * later middleware will return a response.
+     * Process an incoming server request and return a response, optionally delegating
+     * to the next middleware component to create the response.
      *
      * @param Request $request
-     * @param Response $response
-     * @param null|callable $out
-     * @return null|Response
+     * @param DelegateInterface $delegate
+     *
+     * @return Response
      */
-    public function __invoke(Request $request, Response $response, callable $out = null)
+    public function process(Request $request, DelegateInterface $delegate)
     {
         if (! $request->hasHeader('Accept-Language')) {
-            return $out($request, $response);
+            return $delegate->process($request);
         }
 
         $locale = $request->getHeaderLine('Accept-Language');
         $this->translator->setLocale($this->normalizeLocale($locale));
-        return $out($request, $response);
+        return $delegate->process($request);
     }
 
     /**

module/Common/src/Paginator/Adapter/PaginableRepositoryAdapter.php

@@ -13,19 +13,28 @@ class PaginableRepositoryAdapter implements AdapterInterface
      */
     private $paginableRepository;
     /**
-     * @var null
+     * @var null|string
      */
     private $searchTerm;
     /**
-     * @var null
+     * @var null|array|string
      */
     private $orderBy;
+    /**
+     * @var array
+     */
+    private $tags;
 
-    public function __construct(PaginableRepositoryInterface $paginableRepository, $searchTerm = null, $orderBy = null)
-    {
+    public function __construct(
+        PaginableRepositoryInterface $paginableRepository,
+        $searchTerm = null,
+        array $tags = [],
+        $orderBy = null
+    ) {
         $this->paginableRepository = $paginableRepository;
-        $this->searchTerm = $searchTerm;
+        $this->searchTerm = trim(strip_tags($searchTerm));
         $this->orderBy = $orderBy;
+        $this->tags = $tags;
     }
 
     /**
@@ -37,7 +46,13 @@ class PaginableRepositoryAdapter implements AdapterInterface
      */
     public function getItems($offset, $itemCountPerPage)
     {
-        return $this->paginableRepository->findList($itemCountPerPage, $offset, $this->searchTerm, $this->orderBy);
+        return $this->paginableRepository->findList(
+            $itemCountPerPage,
+            $offset,
+            $this->searchTerm,
+            $this->tags,
+            $this->orderBy
+        );
     }
 
     /**
@@ -51,6 +66,6 @@ class PaginableRepositoryAdapter implements AdapterInterface
      */
     public function count()
     {
-        return $this->paginableRepository->countList($this->searchTerm);
+        return $this->paginableRepository->countList($this->searchTerm, $this->tags);
     }
 }

module/Common/src/Repository/PaginableRepositoryInterface.php

@@ -9,16 +9,18 @@ interface PaginableRepositoryInterface
      * @param int|null $limit
      * @param int|null $offset
      * @param string|null $searchTerm
+     * @param array $tags
      * @param string|array|null $orderBy
      * @return array
      */
-    public function findList($limit = null, $offset = null, $searchTerm = null, $orderBy = null);
+    public function findList($limit = null, $offset = null, $searchTerm = null, array $tags = [], $orderBy = null);
 
     /**
      * Counts the number of elements in a list using provided filtering data
      *
      * @param null $searchTerm
+     * @param array $tags
      * @return int
      */
-    public function countList($searchTerm = null);
+    public function countList($searchTerm = null, array $tags = []);
 }

module/Common/src/Util/StringUtilsTrait.php

@@ -9,7 +9,7 @@ trait StringUtilsTrait
         $charactersLength = strlen($characters);
         $randomString = '';
         for ($i = 0; $i < $length; $i++) {
-            $randomString .= $characters[rand(0, $charactersLength - 1)];
+            $randomString .= $characters[mt_rand(0, $charactersLength - 1)];
         }
 
         return $randomString;

module/Common/test/ConfigProviderTest.php

@@ -1,7 +1,7 @@
 <?php
 namespace ShlinkioTest\Shlink\Common;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\ConfigProvider;
 
 class ConfigProviderTest extends TestCase
@@ -23,7 +23,6 @@ class ConfigProviderTest extends TestCase
     {
         $config = $this->configProvider->__invoke();
 
-        $this->assertArrayHasKey('middleware_pipeline', $config);
         $this->assertArrayHasKey('dependencies', $config);
         $this->assertArrayHasKey('twig', $config);
     }

module/Common/test/Factory/CacheFactoryTest.php

@@ -6,7 +6,7 @@ use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\Common\Cache\FilesystemCache;
 use Doctrine\Common\Cache\MemcachedCache;
 use Doctrine\Common\Cache\RedisCache;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Shlinkio\Shlink\Common\Factory\CacheFactory;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Zend\ServiceManager\ServiceManager;