Merge branch 'develop'

2024-12-19 13:43:29 -06:00 · 2017-10-23 14:01:22 +02:00 · 2017-10-23 14:01:22 +02:00 · d7e68d29de
commit d7e68d29de
parent ccb9d5e83a b8f24c3584
259 changed files with 2267 additions and 929 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,3 +5,4 @@ vendor/
 .env
 data/database.sqlite
 docs/swagger-ui
+docker-compose.override.yml
--- a/.travis-php.ini
+++ b/.travis-php.ini
@ -1 +0,0 @@
-extension="memcached.so"
--- a/.travis.yml
+++ b/.travis.yml
@ -6,11 +6,13 @@ branches:
    - develop

 php:
-  - 5.6
  - 7
  - 7.1
+  - 7.2

-before_install: phpenv config-add .travis-php.ini
+before_install:
+  - phpenv config-add data/infra/travis-php/memcached.ini
+  - phpenv config-add data/infra/travis-php/apcu.ini

 before_script:
  - composer self-update
@ -21,6 +23,7 @@ script:
  - composer check

 after_script:
+  - vendor/bin/phpcov merge build --clover build/clover.xml
  - wget https://scrutinizer-ci.com/ocular.phar
  - php ocular.phar code-coverage:upload --format=php-clover build/clover.xml

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,31 @@
 ## CHANGELOG

+### 1.6.0
+
+**Features**
+
+* [44: Consider allowing to set custom slugs instead of generating a short code](https://github.com/shlinkio/shlink/issues/44)
+* [47: Allow to limit short codes availability by date range](https://github.com/shlinkio/shlink/issues/47)
+* [48: Allow to limit the number of visits to a short code](https://github.com/shlinkio/shlink/issues/48)
+* [105: Added option to enable/disable URL validation by response status code.](https://github.com/shlinkio/shlink/pull/105)
+
+**Enhancements:**
+
+* [27: Add repository functional tests with dbunit](https://github.com/shlinkio/shlink/issues/27)
+* [86: Drop support for PHP 5](https://github.com/shlinkio/shlink/issues/86)
+* [101: Make actions just capture very specific exceptions, and let the ErrorHandler catch any other exception](https://github.com/shlinkio/shlink/issues/101)
+* [104: Use different templates for requested-short-code-does-not-exist and route-could-not-be-match](https://github.com/shlinkio/shlink/issues/104)
+
+**Tasks**
+
+* [99: Replace AnnotatedFactory by ConfigAbstractFactory](https://github.com/shlinkio/shlink/issues/99)
+* [100: Replace twig by plates](https://github.com/shlinkio/shlink/issues/100)
+* [102: Improve coding standards strictness](https://github.com/shlinkio/shlink/issues/102)
+
+**Bugs**
+
+* [103: Make NotFoundDelegate return proper content types based on accepted content](https://github.com/shlinkio/shlink/issues/103)
+
 ### 1.5.0

 **Enhancements:**
--- a/bin/install
+++ b/bin/install
@ -1,9 +1,11 @@
 #!/usr/bin/env php
 <?php
 use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
+use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Filesystem\Filesystem;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Zend\ServiceManager\Factory\InvokableFactory;
 use Zend\ServiceManager\ServiceManager;

@ -11,9 +13,18 @@ chdir(dirname(__DIR__));

 require __DIR__ . '/../vendor/autoload.php';

-$container = new ServiceManager(['factories' => [
-    Application::class => InstallApplicationFactory::class,
-    Filesystem::class => InvokableFactory::class,
-    QuestionHelper::class => InvokableFactory::class,
-]]);
+$container = new ServiceManager([
+    'factories' => [
+        Application::class => InstallApplicationFactory::class,
+        Filesystem::class => InvokableFactory::class,
+        QuestionHelper::class => InvokableFactory::class,
+    ],
+    'services' => [
+        'config' => [
+            ConfigAbstractFactory::class => [
+                DatabaseConfigCustomizerPlugin::class => [QuestionHelper::class, Filesystem::class]
+            ],
+        ],
+    ],
+]);
 $container->build(Application::class)->run();
--- a/bin/update
+++ b/bin/update
@ -1,9 +1,11 @@
 #!/usr/bin/env php
 <?php
 use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
+use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizerPlugin;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Filesystem\Filesystem;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Zend\ServiceManager\Factory\InvokableFactory;
 use Zend\ServiceManager\ServiceManager;

@ -11,9 +13,18 @@ chdir(dirname(__DIR__));

 require __DIR__ . '/../vendor/autoload.php';

-$container = new ServiceManager(['factories' => [
-    Application::class => InstallApplicationFactory::class,
-    Filesystem::class => InvokableFactory::class,
-    QuestionHelper::class => InvokableFactory::class,
-]]);
+$container = new ServiceManager([
+    'factories' => [
+        Application::class => InstallApplicationFactory::class,
+        Filesystem::class => InvokableFactory::class,
+        QuestionHelper::class => InvokableFactory::class,
+    ],
+    'services' => [
+        'config' => [
+            ConfigAbstractFactory::class => [
+                DatabaseConfigCustomizerPlugin::class => [QuestionHelper::class, Filesystem::class]
+            ],
+        ],
+    ],
+]);
 $container->build(Application::class, ['isUpdate' => true])->run();
--- a/build.sh
+++ b/build.sh
@ -20,8 +20,8 @@ cp -R "${projectdir}"/* "${builtcontent}"
 cd "${builtcontent}"

 # Install dependencies
-rm -r vendor
-rm composer.lock
+rm -rf vendor
+rm -f composer.lock
 composer self-update
 composer install --no-dev --optimize-autoloader --no-progress --no-interaction

@ -35,8 +35,8 @@ rm indocker
 rm docker-compose.yml
 rm php*
 rm README.md
-rm -r build
-rm -f data/database.sqlite
+rm -rf build
+rm -ff data/database.sqlite
 rm -rf data/infra
 rm -rf data/{cache,log,proxies}/{*,.gitignore}
 rm -rf config/params/{*,.gitignore}
--- a/composer.json
+++ b/composer.json
@ -12,36 +12,45 @@
        }
    ],
    "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.0",
+        "acelaya/ze-content-based-error-handler": "^2.0",
+        "cocur/slugify": "^3.0",
+        "doctrine/annotations": "^1.4 <1.5",
+        "doctrine/cache": "^1.6 <1.7",
+        "doctrine/collections": "^1.4 <1.5",
+        "doctrine/common": "^2.7 <2.8",
+        "doctrine/dbal": "^2.5 <2.6",
+        "doctrine/migrations": "^1.4",
+        "doctrine/orm": "^2.5 <2.6",
+        "endroid/qrcode": "^1.7",
+        "firebase/php-jwt": "^4.0",
+        "guzzlehttp/guzzle": "^6.2",
+        "http-interop/http-middleware": "^0.4.1",
+        "mikehaertl/phpwkhtmltopdf": "^2.2",
+        "monolog/monolog": "^1.21",
+        "roave/security-advisories": "dev-master",
+        "symfony/console": "^3.0",
+        "symfony/filesystem": "^3.0",
+        "symfony/process": "^3.0",
+        "theorchard/monolog-cascade": "^0.4",
+        "zendframework/zend-config": "^3.0",
+        "zendframework/zend-config-aggregator": "^1.0",
        "zendframework/zend-expressive": "^2.0",
        "zendframework/zend-expressive-fastroute": "^2.0",
-        "zendframework/zend-expressive-twigrenderer": "^1.4",
-        "zendframework/zend-stdlib": "^3.0",
-        "zendframework/zend-servicemanager": "^3.0",
-        "zendframework/zend-paginator": "^2.6",
-        "zendframework/zend-config": "^3.0",
+        "zendframework/zend-expressive-helpers": "^4.2",
+        "zendframework/zend-expressive-platesrenderer": "^1.3",
        "zendframework/zend-i18n": "^2.7",
-        "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",
-        "symfony/process": "^3.0",
-        "symfony/filesystem": "^3.0",
-        "firebase/php-jwt": "^4.0",
-        "monolog/monolog": "^1.21",
-        "theorchard/monolog-cascade": "^0.4",
-        "endroid/qrcode": "^1.7",
-        "mikehaertl/phpwkhtmltopdf": "^2.2",
-        "doctrine/migrations": "^1.4",
-        "http-interop/http-middleware": "^0.4"
+        "zendframework/zend-paginator": "^2.6",
+        "zendframework/zend-servicemanager": "^3.0",
+        "zendframework/zend-stdlib": "^3.0"
    },
    "require-dev": {
-        "phpunit/phpunit": "^5.7 || ^6.0",
-        "squizlabs/php_codesniffer": "^2.3",
-        "roave/security-advisories": "dev-master",
        "filp/whoops": "^2.0",
+        "phpunit/dbunit": "^3.0",
+        "phpunit/phpcov": "^4.0",
+        "phpunit/phpunit": "^6.0",
+        "slevomat/coding-standard": "^4.0",
+        "squizlabs/php_codesniffer": "^3.1",
        "symfony/var-dumper": "^3.0",
        "vlucas/phpdotenv": "^2.2",
        "zendframework/zend-expressive-tooling": "^0.4"
@ -61,22 +70,39 @@
        "psr-4": {
            "ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
            "ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
-            "ShlinkioTest\\Shlink\\Core\\": "module/Core/test",
-            "ShlinkioTest\\Shlink\\Common\\": "module/Common/test"
+            "ShlinkioTest\\Shlink\\Core\\": [
+                "module/Core/test",
+                "module/Core/test-func"
+            ],
+            "ShlinkioTest\\Shlink\\Common\\": [
+                "module/Common/test",
+                "module/Common/test-func"
+            ]
        }
    },
    "scripts": {
        "check": [
            "@cs",
-            "@test"
+            "@test",
+            "@func-test"
        ],
        "cs": "phpcs",
        "cs-fix": "phpcbf",
        "serve": "php -S 0.0.0.0:8000 -t public/",
-        "test": "phpunit --coverage-clover build/clover.xml",
-        "pretty-test": "phpunit --coverage-html build/coverage"
+        "test": "phpunit --coverage-php build/coverage-unit.cov",
+        "pretty-test": "phpunit --coverage-html build/coverage",
+        "func-test": "phpunit -c phpunit-func.xml --coverage-php build/coverage-func.cov",
+        "complete-pretty-test": [
+            "@test",
+            "@func-test",
+            "phpcov merge build --html build/html"
+        ]
    },
    "config": {
-        "process-timeout": 0
+        "process-timeout": 0,
+        "sort-packages": true,
+        "platform": {
+            "php": "7.0"
+        }
    }
 }
--- a/config/autoload/app_options.global.php
+++ b/config/autoload/app_options.global.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common;

 return [
--- a/config/autoload/dependencies.global.php
+++ b/config/autoload/dependencies.global.php
@ -1,11 +1,15 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common\Factory\EmptyResponseImplicitOptionsMiddlewareFactory;
 use Zend\Expressive;
 use Zend\Expressive\Container;
+use Zend\Expressive\Helper;
 use Zend\Expressive\Middleware;
+use Zend\Expressive\Plates;
 use Zend\Expressive\Router;
 use Zend\Expressive\Template;
-use Zend\Expressive\Twig;
+use Zend\ServiceManager\Factory\InvokableFactory;
 use Zend\Stratigility\Middleware\ErrorHandler;

 return [
@ -13,11 +17,13 @@ return [
    'dependencies' => [
        'factories' => [
            Expressive\Application::class => Container\ApplicationFactory::class,
-            Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class,
-            \Twig_Environment::class => Twig\TwigEnvironmentFactory::class,
+            Template\TemplateRendererInterface::class => Plates\PlatesRendererFactory::class,
            Router\RouterInterface::class => Router\FastRouteRouterFactory::class,
            ErrorHandler::class => Container\ErrorHandlerFactory::class,
            Middleware\ImplicitOptionsMiddleware::class => EmptyResponseImplicitOptionsMiddlewareFactory::class,
+
+            Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
+            Helper\ServerUrlHelper::class => InvokableFactory::class,
        ],
    ],

--- a/config/autoload/entity-manager.global.php
+++ b/config/autoload/entity-manager.global.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common;

 return [
--- a/config/autoload/logger.global.php
+++ b/config/autoload/logger.global.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;

--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common\Middleware\LocaleMiddleware;
 use Shlinkio\Shlink\Rest\Middleware\BodyParserMiddleware;
 use Shlinkio\Shlink\Rest\Middleware\CheckAuthenticationMiddleware;
--- a/config/autoload/phpwkhtmltopdf.global.php
+++ b/config/autoload/phpwkhtmltopdf.global.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [

    'phpwkhtmltopdf' => [
--- a/config/autoload/preview-generation.global.php
+++ b/config/autoload/preview-generation.global.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [

    'preview_generation' => [
--- a/config/autoload/router.global.php
+++ b/config/autoload/router.global.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Zend\Expressive\Router\FastRouteRouter;

 return [
--- a/config/autoload/templates.global.php
+++ b/config/autoload/templates.global.php
@ -1,9 +1,13 @@
 <?php
+declare(strict_types=1);

 return [

-    'twig' => [
-        'cache_dir'  => 'data/cache/twig',
+    'templates' => [
+        'extension' => 'phtml',
+    ],
+
+    'plates' => [
        'extensions' => [
            // extension service names or instances
        ],
--- a/config/autoload/translator.global.php
+++ b/config/autoload/translator.global.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Common;

 return [
--- a/config/autoload/url-shortener.global.php
+++ b/config/autoload/url-shortener.global.php
@ -1,15 +1,17 @@
 <?php
-use Shlinkio\Shlink\Common;
+declare(strict_types=1);
+
 use Shlinkio\Shlink\Core\Service\UrlShortener;
+use function Shlinkio\Shlink\Common\env;

 return [

    'url_shortener' => [
        'domain' => [
-            'schema' => Common\env('SHORTENED_URL_SCHEMA', 'http'),
-            'hostname' => Common\env('SHORTENED_URL_HOSTNAME'),
+            'schema' => env('SHORTENED_URL_SCHEMA', 'http'),
+            'hostname' => env('SHORTENED_URL_HOSTNAME'),
        ],
-        'shortcode_chars' => Common\env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
+        'shortcode_chars' => env('SHORTCODE_CHARS', UrlShortener::DEFAULT_CHARS),
        'validate_url' => true,
    ],

--- a/config/autoload/zend-expressive.global.php
+++ b/config/autoload/zend-expressive.global.php
@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);

 return [

--- a/config/cli-config.php
+++ b/config/cli-config.php
@ -1,10 +1,34 @@
 <?php
+declare(strict_types=1);
+
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Interop\Container\ContainerInterface;
+use Zend\ServiceManager\ServiceManager;

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

--- a/config/config.php
+++ b/config/config.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Acelaya\ExpressiveErrorHandler;
 use Shlinkio\Shlink\CLI;
 use Shlinkio\Shlink\Common;
--- a/config/container.php
+++ b/config/container.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Dotenv\Dotenv;
 use Zend\ServiceManager\ServiceManager;

@ -9,7 +11,7 @@ require 'vendor/autoload.php';
 // If the Dotenv class exists, load env vars and enable errors
 if (class_exists(Dotenv::class)) {
    error_reporting(E_ALL);
-    ini_set('display_errors', 1);
+    ini_set('display_errors', '1');
    $dotenv = new Dotenv(__DIR__ . '/..');
    $dotenv->load();
 }
--- a/data/infra/php.Dockerfile
+++ b/data/infra/php.Dockerfile
@ -26,7 +26,7 @@ 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
+ADD https://github.com/phpredis/phpredis/archive/3.1.4.tar.gz /tmp/phpredis.tar.gz
 RUN mkdir -p /usr/src/php/ext/redis\
  && tar xf /tmp/phpredis.tar.gz -C /usr/src/php/ext/redis --strip-components=1
 # configure and install
@ -85,3 +85,6 @@ RUN rm /tmp/xdebug.tar.gz
 RUN php -r "readfile('https://getcomposer.org/installer');" | php
 RUN chmod +x composer.phar
 RUN mv composer.phar /usr/local/bin/composer
+
+# Make home directory writable by anyone
+RUN chmod 777 /home
--- a/data/infra/travis-php/apcu.ini
+++ b/data/infra/travis-php/apcu.ini
@ -0,0 +1 @@
+extension="apcu.so"
--- a/data/infra/travis-php/memcached.ini
+++ b/data/infra/travis-php/memcached.ini
@ -0,0 +1 @@
+extension="memcached.so"
--- a/data/migrations/Version20160819142757.php
+++ b/data/migrations/Version20160819142757.php
@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);

 namespace ShlinkMigrations;

--- a/data/migrations/Version20160820191203.php
+++ b/data/migrations/Version20160820191203.php
@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);

 namespace ShlinkMigrations;

--- a/data/migrations/Version20171021093246.php
+++ b/data/migrations/Version20171021093246.php
@ -0,0 +1,49 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171021093246 extends AbstractMigration
+{
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function up(Schema $schema)
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if ($shortUrls->hasColumn('value_since')) {
+            return;
+        }
+
+        $shortUrls->addColumn('valid_since', Type::DATETIME, [
+            'notnull' => false,
+        ]);
+        $shortUrls->addColumn('valid_until', Type::DATETIME, [
+            'notnull' => false,
+        ]);
+    }
+
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function down(Schema $schema)
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if (! $shortUrls->hasColumn('value_since')) {
+            return;
+        }
+
+        $shortUrls->dropColumn('valid_since');
+        $shortUrls->dropColumn('valid_until');
+    }
+}
--- a/data/migrations/Version20171022064541.php
+++ b/data/migrations/Version20171022064541.php
@ -0,0 +1,46 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkMigrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Schema\SchemaException;
+use Doctrine\DBAL\Types\Type;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171022064541 extends AbstractMigration
+{
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function up(Schema $schema)
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if ($shortUrls->hasColumn('max_visits')) {
+            return;
+        }
+
+        $shortUrls->addColumn('max_visits', Type::INTEGER, [
+            'unsigned' => true,
+            'notnull' => false,
+        ]);
+    }
+
+    /**
+     * @param Schema $schema
+     * @throws SchemaException
+     */
+    public function down(Schema $schema)
+    {
+        $shortUrls = $schema->getTable('short_urls');
+        if (! $shortUrls->hasColumn('max_visits')) {
+            return;
+        }
+
+        $shortUrls->dropColumn('max_visits');
+    }
+}
--- a/docker-compose.override.yml.dist
+++ b/docker-compose.override.yml.dist
@ -0,0 +1,8 @@
+version: '2'
+
+services:
+    shlink_php:
+        user: 1000:1000
+        volumes:
+            - /etc/passwd:/etc/passwd:ro
+            - /etc/group:/etc/group:ro
--- a/func_tests_bootstrap.php
+++ b/func_tests_bootstrap.php
@ -0,0 +1,33 @@
+<?php
+declare(strict_types=1);
+
+use ShlinkioTest\Shlink\Common\DbUnit\DatabaseTestCase;
+use Symfony\Component\Process\Process;
+use Zend\ServiceManager\ServiceManager;
+
+// Create an empty .env file
+if (! file_exists('.env')) {
+    touch('.env');
+}
+
+$shlinkDbPath = realpath(sys_get_temp_dir()) . '/shlink-tests.db';
+if (file_exists($shlinkDbPath)) {
+    unlink($shlinkDbPath);
+}
+
+/** @var ServiceManager $sm */
+$sm = require __DIR__ . '/config/container.php';
+$sm->setAllowOverride(true);
+$config = $sm->get('config');
+$config['entity_manager']['connection'] = [
+    'driver' => 'pdo_sqlite',
+    'path' => $shlinkDbPath,
+];
+$sm->setService('config', $config);
+
+// Create database
+$process = new Process('vendor/bin/doctrine orm:schema-tool:create --no-interaction -q --test', __DIR__);
+$process->inheritEnvironmentVariables()
+        ->mustRun();
+
+DatabaseTestCase::$em = $sm->get('em');
--- a/module/CLI/config/cli.config.php
+++ b/module/CLI/config/cli.config.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 use Shlinkio\Shlink\CLI\Command;
 use Shlinkio\Shlink\Common;

@ -22,7 +24,7 @@ return [
            Command\Tag\CreateTagCommand::class,
            Command\Tag\RenameTagCommand::class,
            Command\Tag\DeleteTagsCommand::class,
-        ]
+        ],
    ],

 ];
--- a/module/CLI/config/dependencies.config.php
+++ b/module/CLI/config/dependencies.config.php
@ -1,8 +1,15 @@
 <?php
-use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
+declare(strict_types=1);
+
 use Shlinkio\Shlink\CLI\Command;
 use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
+use Shlinkio\Shlink\Common\Service\IpLocationResolver;
+use Shlinkio\Shlink\Common\Service\PreviewGenerator;
+use Shlinkio\Shlink\Core\Service;
+use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Symfony\Component\Console\Application;
+use Zend\I18n\Translator\Translator;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;

 return [

@ -10,22 +17,52 @@ return [
        'factories' => [
            Application::class => ApplicationFactory::class,

-            Command\Shortcode\GenerateShortcodeCommand::class => AnnotatedFactory::class,
-            Command\Shortcode\ResolveUrlCommand::class => AnnotatedFactory::class,
-            Command\Shortcode\ListShortcodesCommand::class => AnnotatedFactory::class,
-            Command\Shortcode\GetVisitsCommand::class => AnnotatedFactory::class,
-            Command\Shortcode\GeneratePreviewCommand::class => AnnotatedFactory::class,
-            Command\Visit\ProcessVisitsCommand::class => AnnotatedFactory::class,
-            Command\Config\GenerateCharsetCommand::class => AnnotatedFactory::class,
-            Command\Config\GenerateSecretCommand::class => AnnotatedFactory::class,
-            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,
+            Command\Shortcode\GenerateShortcodeCommand::class => ConfigAbstractFactory::class,
+            Command\Shortcode\ResolveUrlCommand::class => ConfigAbstractFactory::class,
+            Command\Shortcode\ListShortcodesCommand::class => ConfigAbstractFactory::class,
+            Command\Shortcode\GetVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\Shortcode\GeneratePreviewCommand::class => ConfigAbstractFactory::class,
+            Command\Visit\ProcessVisitsCommand::class => ConfigAbstractFactory::class,
+            Command\Config\GenerateCharsetCommand::class => ConfigAbstractFactory::class,
+            Command\Config\GenerateSecretCommand::class => ConfigAbstractFactory::class,
+            Command\Api\GenerateKeyCommand::class => ConfigAbstractFactory::class,
+            Command\Api\DisableKeyCommand::class => ConfigAbstractFactory::class,
+            Command\Api\ListKeysCommand::class => ConfigAbstractFactory::class,
+            Command\Tag\ListTagsCommand::class => ConfigAbstractFactory::class,
+            Command\Tag\CreateTagCommand::class => ConfigAbstractFactory::class,
+            Command\Tag\RenameTagCommand::class => ConfigAbstractFactory::class,
+            Command\Tag\DeleteTagsCommand::class => ConfigAbstractFactory::class,
        ],
    ],

+    ConfigAbstractFactory::class => [
+        Command\Shortcode\GenerateShortcodeCommand::class => [
+            Service\UrlShortener::class,
+            'translator',
+            'config.url_shortener.domain',
+        ],
+        Command\Shortcode\ResolveUrlCommand::class => [Service\UrlShortener::class, 'translator'],
+        Command\Shortcode\ListShortcodesCommand::class => [Service\ShortUrlService::class, 'translator'],
+        Command\Shortcode\GetVisitsCommand::class => [Service\VisitsTracker::class, 'translator'],
+        Command\Shortcode\GeneratePreviewCommand::class => [
+            Service\ShortUrlService::class,
+            PreviewGenerator::class,
+            'translator',
+        ],
+        Command\Visit\ProcessVisitsCommand::class => [
+            Service\VisitService::class,
+            IpLocationResolver::class,
+            'translator',
+        ],
+        Command\Config\GenerateCharsetCommand::class => ['translator'],
+        Command\Config\GenerateSecretCommand::class => ['translator'],
+        Command\Api\GenerateKeyCommand::class => [ApiKeyService::class, 'translator'],
+        Command\Api\DisableKeyCommand::class => [ApiKeyService::class, 'translator'],
+        Command\Api\ListKeysCommand::class => [ApiKeyService::class, 'translator'],
+        Command\Tag\ListTagsCommand::class => [Service\Tag\TagService::class, Translator::class],
+        Command\Tag\CreateTagCommand::class => [Service\Tag\TagService::class, Translator::class],
+        Command\Tag\RenameTagCommand::class => [Service\Tag\TagService::class, Translator::class],
+        Command\Tag\DeleteTagsCommand::class => [Service\Tag\TagService::class, Translator::class],
+    ],
+
 ];
--- a/module/CLI/config/translator.config.php
+++ b/module/CLI/config/translator.config.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [

    'translator' => [
--- a/module/CLI/lang/es.mo
+++ b/module/CLI/lang/es.mo
--- a/module/CLI/lang/es.po
+++ b/module/CLI/lang/es.po
@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Shlink 1.0\n"
-"POT-Creation-Date: 2017-07-16 09:35+0200\n"
-"PO-Revision-Date: 2017-07-16 09:39+0200\n"
+"POT-Creation-Date: 2017-10-21 20:17+0200\n"
+"PO-Revision-Date: 2017-10-21 20:19+0200\n"
 "Last-Translator: Alejandro Celaya <alejandro@alejandrocelaya.com>\n"
 "Language-Team: \n"
 "Language: es_ES\n"
@ -92,7 +92,7 @@ msgid "Processing URL %s..."
 msgstr "Procesando URL %s..."

 msgid " <info>Success!</info>"
-msgstr "<info>¡Correcto!</info>"
+msgstr " <info>¡Correcto!</info>"

 msgid "Error"
 msgstr "Error"
@ -107,6 +107,24 @@ msgstr "La URL larga a procesar"
 msgid "Tags to apply to the new short URL"
 msgstr "Etiquetas a aplicar a la nueva URL acortada"

+msgid ""
+"The date from which this short URL will be valid. If someone tries to access "
+"it before this date, it will not be found."
+msgstr ""
+"La fecha desde la cual será válida esta URL acortada. Si alguien intenta "
+"acceder a ella antes de esta fecha, no será encontrada."
+
+msgid ""
+"The date until which this short URL will be valid. If someone tries to "
+"access it after this date, it will not be found."
+msgstr ""
+"La fecha hasta la cual será válida está URL acortada. Si alguien intenta "
+"acceder a ella después de esta fecha, no será encontrada."
+
+msgid "If provided, this slug will be used instead of generating a short code"
+msgstr ""
+"Si se proporciona, este slug será usado en vez de generar un código corto"
+
 msgid "A long URL was not provided. Which URL do you want to shorten?:"
 msgstr "No se ha proporcionado una URL larga. ¿Qué URL deseas acortar?"

@ -123,6 +141,14 @@ msgstr "URL generada:"
 msgid "Provided URL \"%s\" is invalid. Try with a different one."
 msgstr "La URL proporcionada \"%s\" e inválida. Prueba con una diferente."

+#, php-format
+msgid ""
+"Provided slug \"%s\" is already in use by another URL. Try with a different "
+"one."
+msgstr ""
+"El slug proporcionado \"%s\" ya está siendo usado para otra URL. Prueba con "
+"uno diferente."
+
 msgid "Returns the detailed visits information for provided short code"
 msgstr ""
 "Devuelve la información detallada de visitas para el código corto "
@ -141,7 +167,7 @@ msgstr ""
 "Permite filtrar las visitas, devolviendo sólo aquellas más nuevas que endDate"

 msgid "A short code was not provided. Which short code do you want to use?:"
-msgstr "No se prporcionó un código corto. ¿Qué código corto deseas usar?"
+msgstr "No se prporcionó un código corto. ¿Qué código corto deseas usar?:"

 msgid "Referer"
 msgstr "Origen"
@ -210,7 +236,7 @@ msgstr "El código corto a convertir"

 msgid "A short code was not provided. Which short code do you want to parse?:"
 msgstr ""
-"No se proporcionó un código corto. ¿Qué código corto quieres convertir?"
+"No se proporcionó un código corto. ¿Qué código corto quieres convertir?:"

 #, php-format
 msgid "No URL found for short code \"%s\""
@ -223,6 +249,10 @@ msgstr "URL larga:"
 msgid "Provided short code \"%s\" has an invalid format."
 msgstr "El código corto proporcionado \"%s\" tiene un formato inválido."

+#, php-format
+msgid "Provided short code \"%s\" could not be found."
+msgstr "El código corto proporcionado \"%s\" no ha podido ser encontrado."
+
 msgid "Creates one or more tags."
 msgstr "Crea una o más etiquetas."

--- a/module/CLI/src/Command/Api/DisableKeyCommand.php
+++ b/module/CLI/src/Command/Api/DisableKeyCommand.php
@ -1,8 +1,8 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Api;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
-use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@ -21,13 +21,6 @@ class DisableKeyCommand extends Command
     */
    private $translator;

-    /**
-     * DisableKeyCommand constructor.
-     * @param ApiKeyServiceInterface|ApiKeyService $apiKeyService
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ApiKeyService::class, "translator"})
-     */
    public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
    {
        $this->apiKeyService = $apiKeyService;
--- a/module/CLI/src/Command/Api/GenerateKeyCommand.php
+++ b/module/CLI/src/Command/Api/GenerateKeyCommand.php
@ -1,8 +1,8 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Api;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
-use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@ -21,18 +21,11 @@ class GenerateKeyCommand extends Command
     */
    private $translator;

-    /**
-     * GenerateKeyCommand constructor.
-     * @param ApiKeyServiceInterface|ApiKeyService $apiKeyService
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ApiKeyService::class, "translator"})
-     */
    public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
    {
        $this->apiKeyService = $apiKeyService;
        $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
    }

    public function configure()
--- a/module/CLI/src/Command/Api/ListKeysCommand.php
+++ b/module/CLI/src/Command/Api/ListKeysCommand.php
@ -1,9 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Api;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
-use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
@ -23,18 +23,11 @@ class ListKeysCommand extends Command
     */
    private $translator;

-    /**
-     * ListKeysCommand constructor.
-     * @param ApiKeyServiceInterface|ApiKeyService $apiKeyService
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ApiKeyService::class, "translator"})
-     */
    public function __construct(ApiKeyServiceInterface $apiKeyService, TranslatorInterface $translator)
    {
        $this->apiKeyService = $apiKeyService;
        $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
    }

    public function configure()
--- a/module/CLI/src/Command/Config/GenerateCharsetCommand.php
+++ b/module/CLI/src/Command/Config/GenerateCharsetCommand.php
@ -1,7 +1,8 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Config;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@ -15,16 +16,10 @@ class GenerateCharsetCommand extends Command
     */
    private $translator;

-    /**
-     * GenerateCharsetCommand constructor.
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({"translator"})
-     */
    public function __construct(TranslatorInterface $translator)
    {
        $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
    }

    public function configure()
--- a/module/CLI/src/Command/Config/GenerateSecretCommand.php
+++ b/module/CLI/src/Command/Config/GenerateSecretCommand.php
@ -1,7 +1,8 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Config;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@ -17,16 +18,10 @@ class GenerateSecretCommand extends Command
     */
    private $translator;

-    /**
-     * GenerateCharsetCommand constructor.
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({"translator"})
-     */
    public function __construct(TranslatorInterface $translator)
    {
        $this->translator = $translator;
-        parent::__construct(null);
+        parent::__construct();
    }

    public function configure()
--- a/module/CLI/src/Command/Install/InstallCommand.php
+++ b/module/CLI/src/Command/Install/InstallCommand.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Install;

 use Shlinkio\Shlink\CLI\Install\ConfigCustomizerPluginManagerInterface;
--- a/module/CLI/src/Command/Shortcode/GeneratePreviewCommand.php
+++ b/module/CLI/src/Command/Shortcode/GeneratePreviewCommand.php
@ -1,11 +1,10 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
-use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
-use Shlinkio\Shlink\Core\Service\ShortUrlService;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@ -27,14 +26,6 @@ class GeneratePreviewCommand extends Command
     */
    private $shortUrlService;

-    /**
-     * GeneratePreviewCommand constructor.
-     * @param ShortUrlServiceInterface $shortUrlService
-     * @param PreviewGeneratorInterface $previewGenerator
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ShortUrlService::class, PreviewGenerator::class, "translator"})
-     */
    public function __construct(
        ShortUrlServiceInterface $shortUrlService,
        PreviewGeneratorInterface $previewGenerator,
--- a/module/CLI/src/Command/Shortcode/GenerateShortcodeCommand.php
+++ b/module/CLI/src/Command/Shortcode/GenerateShortcodeCommand.php
@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
-use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
@ -30,14 +31,6 @@ class GenerateShortcodeCommand extends Command
     */
    private $translator;

-    /**
-     * GenerateShortcodeCommand constructor.
-     * @param UrlShortenerInterface $urlShortener
-     * @param TranslatorInterface $translator
-     * @param array $domainConfig
-     *
-     * @Inject({UrlShortener::class, "translator", "config.url_shortener.domain"})
-     */
    public function __construct(
        UrlShortenerInterface $urlShortener,
        TranslatorInterface $translator,
@ -59,9 +52,23 @@ class GenerateShortcodeCommand extends Command
             ->addOption(
                 'tags',
                 't',
-                 InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL,
+                 InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
                 $this->translator->translate('Tags to apply to the new short URL')
-             );
+             )
+             ->addOption('validSince', 's', InputOption::VALUE_REQUIRED, $this->translator->translate(
+                 'The date from which this short URL will be valid. '
+                 . 'If someone tries to access it before this date, it will not be found.'
+             ))
+             ->addOption('validUntil', 'u', InputOption::VALUE_REQUIRED, $this->translator->translate(
+                 'The date until which this short URL will be valid. '
+                 . 'If someone tries to access it after this date, it will not be found.'
+             ))
+             ->addOption('customSlug', 'c', InputOption::VALUE_REQUIRED, $this->translator->translate(
+                 'If provided, this slug will be used instead of generating a short code'
+             ))
+             ->addOption('maxVisits', 'm', InputOption::VALUE_REQUIRED, $this->translator->translate(
+                 'This will limit the number of visits for this short URL.'
+             ));
    }

    public function interact(InputInterface $input, OutputInterface $output)
@ -94,6 +101,8 @@ class GenerateShortcodeCommand extends Command
            $processedTags = array_merge($processedTags, $explodedTags);
        }
        $tags = $processedTags;
+        $customSlug = $input->getOption('customSlug');
+        $maxVisits = $input->getOption('maxVisits');

        try {
            if (! isset($longUrl)) {
@ -101,7 +110,14 @@ class GenerateShortcodeCommand extends Command
                return;
            }

-            $shortCode = $this->urlShortener->urlToShortCode(new Uri($longUrl), $tags);
+            $shortCode = $this->urlShortener->urlToShortCode(
+                new Uri($longUrl),
+                $tags,
+                $this->getOptionalDate($input, 'validSince'),
+                $this->getOptionalDate($input, 'validUntil'),
+                $customSlug,
+                $maxVisits !== null ? (int) $maxVisits : null
+            );
            $shortUrl = (new Uri())->withPath($shortCode)
                                   ->withScheme($this->domainConfig['schema'])
                                   ->withHost($this->domainConfig['hostname']);
@ -117,6 +133,19 @@ class GenerateShortcodeCommand extends Command
                ) . '</error>',
                $longUrl
            ));
+        } catch (NonUniqueSlugException $e) {
+            $output->writeln(sprintf(
+                '<error>' . $this->translator->translate(
+                    'Provided slug "%s" is already in use by another URL. Try with a different one.'
+                ) . '</error>',
+                $customSlug
+            ));
        }
    }
+
+    private function getOptionalDate(InputInterface $input, string $fieldName)
+    {
+        $since = $input->getOption($fieldName);
+        return $since !== null ? new \DateTime($since) : null;
+    }
 }
--- a/module/CLI/src/Command/Shortcode/GetVisitsCommand.php
+++ b/module/CLI/src/Command/Shortcode/GetVisitsCommand.php
@ -1,9 +1,9 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Util\DateRange;
-use Shlinkio\Shlink\Core\Service\VisitsTracker;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
@ -26,13 +26,6 @@ class GetVisitsCommand extends Command
     */
    private $translator;

-    /**
-     * GetVisitsCommand constructor.
-     * @param VisitsTrackerInterface $visitsTracker
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({VisitsTracker::class, "translator"})
-     */
    public function __construct(VisitsTrackerInterface $visitsTracker, TranslatorInterface $translator)
    {
        $this->visitsTracker = $visitsTracker;
--- a/module/CLI/src/Command/Shortcode/ListShortcodesCommand.php
+++ b/module/CLI/src/Command/Shortcode/ListShortcodesCommand.php
@ -1,10 +1,10 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
 use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
-use Shlinkio\Shlink\Core\Service\ShortUrlService;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
@ -28,13 +28,6 @@ class ListShortcodesCommand extends Command
     */
    private $translator;

-    /**
-     * ListShortcodesCommand constructor.
-     * @param ShortUrlServiceInterface $shortUrlService
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({ShortUrlService::class, "translator"})
-     */
    public function __construct(ShortUrlServiceInterface $shortUrlService, TranslatorInterface $translator)
    {
        $this->shortUrlService = $shortUrlService;
@ -88,12 +81,11 @@ class ListShortcodesCommand extends Command

    public function execute(InputInterface $input, OutputInterface $output)
    {
-        $page = intval($input->getOption('page'));
+        $page = (int) $input->getOption('page');
        $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');
--- a/module/CLI/src/Command/Shortcode/ResolveUrlCommand.php
+++ b/module/CLI/src/Command/Shortcode/ResolveUrlCommand.php
@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Shortcode;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
+use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
-use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
@ -24,13 +25,6 @@ class ResolveUrlCommand extends Command
     */
    private $translator;

-    /**
-     * ResolveUrlCommand constructor.
-     * @param UrlShortenerInterface $urlShortener
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({UrlShortener::class, "translator"})
-     */
    public function __construct(UrlShortenerInterface $urlShortener, TranslatorInterface $translator)
    {
        $this->urlShortener = $urlShortener;
@ -88,6 +82,10 @@ class ResolveUrlCommand extends Command
            $output->writeln(sprintf('<error>' . $this->translator->translate(
                'Provided short code "%s" has an invalid format.'
            ) . '</error>', $shortCode));
+        } catch (EntityDoesNotExistException $e) {
+            $output->writeln(sprintf('<error>' . $this->translator->translate(
+                'Provided short code "%s" could not be found.'
+            ) . '</error>', $shortCode));
        }
    }
 }
--- a/module/CLI/src/Command/Tag/CreateTagCommand.php
+++ b/module/CLI/src/Command/Tag/CreateTagCommand.php
@ -1,14 +1,13 @@
 <?php
+declare(strict_types=1);
+
 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
@ -22,13 +21,6 @@ class CreateTagCommand extends Command
     */
    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;
--- a/module/CLI/src/Command/Tag/DeleteTagsCommand.php
+++ b/module/CLI/src/Command/Tag/DeleteTagsCommand.php
@ -1,14 +1,13 @@
 <?php
+declare(strict_types=1);
+
 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
@ -22,13 +21,6 @@ class DeleteTagsCommand extends Command
     */
    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;
--- a/module/CLI/src/Command/Tag/ListTagsCommand.php
+++ b/module/CLI/src/Command/Tag/ListTagsCommand.php
@ -1,15 +1,14 @@
 <?php
+declare(strict_types=1);
+
 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
@ -23,13 +22,6 @@ class ListTagsCommand extends Command
     */
    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;
--- a/module/CLI/src/Command/Tag/RenameTagCommand.php
+++ b/module/CLI/src/Command/Tag/RenameTagCommand.php
@ -1,15 +1,14 @@
 <?php
+declare(strict_types=1);
+
 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
@ -23,13 +22,6 @@ class RenameTagCommand extends Command
     */
    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;
--- a/module/CLI/src/Command/Visit/ProcessVisitsCommand.php
+++ b/module/CLI/src/Command/Visit/ProcessVisitsCommand.php
@ -1,12 +1,11 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Command\Visit;

-use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Exception\WrongIpException;
-use Shlinkio\Shlink\Common\Service\IpLocationResolver;
 use Shlinkio\Shlink\Common\Service\IpLocationResolverInterface;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
-use Shlinkio\Shlink\Core\Service\VisitService;
 use Shlinkio\Shlink\Core\Service\VisitServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@ -30,14 +29,6 @@ class ProcessVisitsCommand extends Command
     */
    private $translator;

-    /**
-     * ProcessVisitsCommand constructor.
-     * @param VisitServiceInterface $visitService
-     * @param IpLocationResolverInterface $ipLocationResolver
-     * @param TranslatorInterface $translator
-     *
-     * @Inject({VisitService::class, IpLocationResolver::class, "translator"})
-     */
    public function __construct(
        VisitServiceInterface $visitService,
        IpLocationResolverInterface $ipLocationResolver,
--- a/module/CLI/src/ConfigProvider.php
+++ b/module/CLI/src/ConfigProvider.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI;

 use Zend\Config\Factory;
--- a/module/CLI/src/Factory/ApplicationFactory.php
+++ b/module/CLI/src/Factory/ApplicationFactory.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Factory;

 use Interop\Container\ContainerInterface;
--- a/module/CLI/src/Factory/InstallApplicationFactory.php
+++ b/module/CLI/src/Factory/InstallApplicationFactory.php
@ -1,7 +1,8 @@
 <?php
+declare(strict_types=1);
+
 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;
@ -12,6 +13,7 @@ use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\Config\Writer\PhpArray;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\Factory\FactoryInterface;
@ -40,7 +42,7 @@ class InstallApplicationFactory implements FactoryInterface
            new PhpArray(),
            $container->get(Filesystem::class),
            new ConfigCustomizerPluginManager($container, ['factories' => [
-                Plugin\DatabaseConfigCustomizerPlugin::class => AnnotatedFactory::class,
+                Plugin\DatabaseConfigCustomizerPlugin::class => ConfigAbstractFactory::class,
                Plugin\UrlShortenerConfigCustomizerPlugin::class => DefaultConfigCustomizerPluginFactory::class,
                Plugin\LanguageConfigCustomizerPlugin::class => DefaultConfigCustomizerPluginFactory::class,
                Plugin\ApplicationConfigCustomizerPlugin::class => DefaultConfigCustomizerPluginFactory::class,
--- a/module/CLI/src/Install/ConfigCustomizerPluginManager.php
+++ b/module/CLI/src/Install/ConfigCustomizerPluginManager.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install;

 use Shlinkio\Shlink\CLI\Install\Plugin\ConfigCustomizerPluginInterface;
--- a/module/CLI/src/Install/ConfigCustomizerPluginManagerInterface.php
+++ b/module/CLI/src/Install/ConfigCustomizerPluginManagerInterface.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install;

 use Psr\Container\ContainerInterface;
--- a/module/CLI/src/Install/Plugin/AbstractConfigCustomizerPlugin.php
+++ b/module/CLI/src/Install/Plugin/AbstractConfigCustomizerPlugin.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;

 use Symfony\Component\Console\Exception\RuntimeException;
--- a/module/CLI/src/Install/Plugin/ApplicationConfigCustomizerPlugin.php
+++ b/module/CLI/src/Install/Plugin/ApplicationConfigCustomizerPlugin.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;

 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
--- a/module/CLI/src/Install/Plugin/ConfigCustomizerPluginInterface.php
+++ b/module/CLI/src/Install/Plugin/ConfigCustomizerPluginInterface.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;

 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
--- a/module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php
+++ b/module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;

 use Acelaya\ZsmAnnotatedServices\Annotation as DI;
--- a/module/CLI/src/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactory.php
+++ b/module/CLI/src/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactory.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin\Factory;

 use Interop\Container\ContainerInterface;
--- a/module/CLI/src/Install/Plugin/LanguageConfigCustomizerPlugin.php
+++ b/module/CLI/src/Install/Plugin/LanguageConfigCustomizerPlugin.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;

 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
--- a/module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizerPlugin.php
+++ b/module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizerPlugin.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Install\Plugin;

 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
@ -49,7 +51,7 @@ class UrlShortenerConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
                new ConfirmationQuestion(
                    '<question>Do you want to validate long urls by 200 HTTP status code on response (Y/n):</question>'
                )
-            )
+            ),
        ]);
    }
 }
--- a/module/CLI/src/Model/CustomizableAppConfig.php
+++ b/module/CLI/src/Model/CustomizableAppConfig.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\CLI\Model;

 use Zend\Stdlib\ArraySerializableInterface;
@ -189,7 +191,7 @@ final class CustomizableAppConfig implements ArraySerializableInterface
                'SCHEMA' => $urlShortener['domain']['schema'],
                'HOSTNAME' => $urlShortener['domain']['hostname'],
                'CHARS' => $urlShortener['shortcode_chars'],
-                'VALIDATE_URL' => $urlShortener['validate_url'],
+                'VALIDATE_URL' => $urlShortener['validate_url'] ?? true,
            ]);
        }
    }
@ -241,7 +243,7 @@ final class CustomizableAppConfig implements ArraySerializableInterface
                    'hostname' => $this->urlShortener['HOSTNAME'],
                ],
                'shortcode_chars' => $this->urlShortener['CHARS'],
-                'validate_url' => $this->urlShortener['VALIDATE_URL']
+                'validate_url' => $this->urlShortener['VALIDATE_URL'],
            ],
        ];

--- a/module/CLI/test/Command/Api/DisableKeyCommandTest.php
+++ b/module/CLI/test/Command/Api/DisableKeyCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Api;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Api/GenerateKeyCommandTest.php
+++ b/module/CLI/test/Command/Api/GenerateKeyCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Api;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Api/ListKeysCommandTest.php
+++ b/module/CLI/test/Command/Api/ListKeysCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Api;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Config/GenerateCharsetCommandTest.php
+++ b/module/CLI/test/Command/Config/GenerateCharsetCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Config;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Install/InstallCommandTest.php
+++ b/module/CLI/test/Command/Install/InstallCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Install;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Shortcode/GeneratePreviewCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/GeneratePreviewCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;

 use PHPUnit\Framework\TestCase;
@ -63,7 +65,7 @@ class GeneratePreviewCommandTest extends TestCase
        $this->previewGenerator->generatePreview('http://baz.com/something')->shouldBeCalledTimes(1);

        $this->commandTester->execute([
-            'command' => 'shortcode:process-previews'
+            'command' => 'shortcode:process-previews',
        ]);
    }

@ -83,7 +85,7 @@ class GeneratePreviewCommandTest extends TestCase
                                                                 ->shouldBeCalledTimes(count($items));

        $this->commandTester->execute([
-            'command' => 'shortcode:process-previews'
+            'command' => 'shortcode:process-previews',
        ]);
        $output = $this->commandTester->getDisplay();
        $this->assertEquals(count($items), substr_count($output, 'Error'));
--- a/module/CLI/test/Command/Shortcode/GenerateShortcodeCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/GenerateShortcodeCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;

 use PHPUnit\Framework\TestCase;
@ -27,7 +29,7 @@ class GenerateShortcodeCommandTest extends TestCase
        $this->urlShortener = $this->prophesize(UrlShortener::class);
        $command = new GenerateShortcodeCommand($this->urlShortener->reveal(), Translator::factory([]), [
            'schema' => 'http',
-            'hostname' => 'foo.com'
+            'hostname' => 'foo.com',
        ]);
        $app = new Application();
        $app->add($command);
@ -44,7 +46,7 @@ class GenerateShortcodeCommandTest extends TestCase

        $this->commandTester->execute([
            'command' => 'shortcode:generate',
-            'longUrl' => 'http://domain.com/foo/bar'
+            'longUrl' => 'http://domain.com/foo/bar',
        ]);
        $output = $this->commandTester->getDisplay();
        $this->assertTrue(strpos($output, 'http://foo.com/abc123') > 0);
@ -60,7 +62,7 @@ class GenerateShortcodeCommandTest extends TestCase

        $this->commandTester->execute([
            'command' => 'shortcode:generate',
-            'longUrl' => 'http://domain.com/invalid'
+            'longUrl' => 'http://domain.com/invalid',
        ]);
        $output = $this->commandTester->getDisplay();
        $this->assertTrue(
--- a/module/CLI/test/Command/Shortcode/GetVisitsCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/GetVisitsCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/ListShortcodesCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Shortcode/ResolveUrlCommandTest.php
+++ b/module/CLI/test/Command/Shortcode/ResolveUrlCommandTest.php
@ -1,9 +1,12 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Shortcode;

 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\Shortcode\ResolveUrlCommand;
+use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Application;
@ -55,7 +58,7 @@ class ResolveUrlCommandTest extends TestCase
    public function incorrectShortCodeOutputsErrorMessage()
    {
        $shortCode = 'abc123';
-        $this->urlShortener->shortCodeToUrl($shortCode)->willReturn(null)
+        $this->urlShortener->shortCodeToUrl($shortCode)->willThrow(EntityDoesNotExistException::class)
                                                       ->shouldBeCalledTimes(1);

        $this->commandTester->execute([
@ -63,7 +66,7 @@ class ResolveUrlCommandTest extends TestCase
            'shortCode' => $shortCode,
        ]);
        $output = $this->commandTester->getDisplay();
-        $this->assertEquals('No URL found for short code "' . $shortCode . '"' . PHP_EOL, $output);
+        $this->assertEquals('Provided short code "' . $shortCode . '" could not be found.' . PHP_EOL, $output);
    }

    /**
--- a/module/CLI/test/Command/Tag/CreateTagCommandTest.php
+++ b/module/CLI/test/Command/Tag/CreateTagCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Tag/DeleteTagsCommandTest.php
+++ b/module/CLI/test/Command/Tag/DeleteTagsCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Tag/ListTagsCommandTest.php
+++ b/module/CLI/test/Command/Tag/ListTagsCommandTest.php
@ -1,10 +1,12 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;

+use PHPUnit\Framework\TestCase;
 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;
--- a/module/CLI/test/Command/Tag/RenameTagCommandTest.php
+++ b/module/CLI/test/Command/Tag/RenameTagCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Tag;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php
+++ b/module/CLI/test/Command/Visit/ProcessVisitsCommandTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Command\Visit;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/ConfigProviderTest.php
+++ b/module/CLI/test/ConfigProviderTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Factory/ApplicationFactoryTest.php
+++ b/module/CLI/test/Factory/ApplicationFactoryTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Factory;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Factory/InstallApplicationFactoryTest.php
+++ b/module/CLI/test/Factory/InstallApplicationFactoryTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Factory;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Install/Plugin/ApplicationConfigCustomizerPluginTest.php
+++ b/module/CLI/test/Install/Plugin/ApplicationConfigCustomizerPluginTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Install/Plugin/DatabaseConfigCustomizerPluginTest.php
+++ b/module/CLI/test/Install/Plugin/DatabaseConfigCustomizerPluginTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactoryTest.php
+++ b/module/CLI/test/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactoryTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin\Factory;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Install/Plugin/LanguageConfigCustomizerPluginTest.php
+++ b/module/CLI/test/Install/Plugin/LanguageConfigCustomizerPluginTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;

 use PHPUnit\Framework\TestCase;
--- a/module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerPluginTest.php
+++ b/module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerPluginTest.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;

 use PHPUnit\Framework\TestCase;
--- a/module/Common/config/dependencies.config.php
+++ b/module/Common/config/dependencies.config.php
@ -1,48 +1,62 @@
 <?php
-use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
+declare(strict_types=1);
+
 use Doctrine\Common\Cache\Cache;
 use Doctrine\ORM\EntityManager;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Common\Factory;
 use Shlinkio\Shlink\Common\Image;
+use Shlinkio\Shlink\Common\Image\ImageBuilder;
 use Shlinkio\Shlink\Common\Middleware\LocaleMiddleware;
 use Shlinkio\Shlink\Common\Service;
-use Shlinkio\Shlink\Common\Twig\Extension\TranslatorExtension;
+use Shlinkio\Shlink\Common\Template\Extension\TranslatorExtension;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\I18n\Translator\Translator;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Zend\ServiceManager\Factory\InvokableFactory;

 return [

    'dependencies' => [
-        'invokables' => [
-            Filesystem::class => Filesystem::class,
-        ],
        'factories' => [
            EntityManager::class => Factory\EntityManagerFactory::class,
            GuzzleHttp\Client::class => InvokableFactory::class,
            Cache::class => Factory\CacheFactory::class,
            'Logger_Shlink' => Factory\LoggerFactory::class,
+            Filesystem::class => InvokableFactory::class,

            Translator::class => Factory\TranslatorFactory::class,
-            TranslatorExtension::class => AnnotatedFactory::class,
-            LocaleMiddleware::class => AnnotatedFactory::class,
+            TranslatorExtension::class => ConfigAbstractFactory::class,
+            LocaleMiddleware::class => ConfigAbstractFactory::class,

            Image\ImageBuilder::class => Image\ImageBuilderFactory::class,

-            Service\IpLocationResolver::class => AnnotatedFactory::class,
-            Service\PreviewGenerator::class => AnnotatedFactory::class,
+            Service\IpLocationResolver::class => ConfigAbstractFactory::class,
+            Service\PreviewGenerator::class => ConfigAbstractFactory::class,
        ],
        'aliases' => [
            'em' => EntityManager::class,
            'httpClient' => GuzzleHttp\Client::class,
            'translator' => Translator::class,
            'logger' => LoggerInterface::class,
-            AnnotatedFactory::CACHE_SERVICE => Cache::class,
            Logger::class => 'Logger_Shlink',
            LoggerInterface::class => 'Logger_Shlink',
        ],
+        'abstract_factories' => [
+            Factory\DottedAccessConfigAbstractFactory::class,
+        ],
+    ],
+
+    ConfigAbstractFactory::class => [
+        TranslatorExtension::class => ['translator'],
+        LocaleMiddleware::class => ['translator'],
+        Service\IpLocationResolver::class => ['httpClient'],
+        Service\PreviewGenerator::class => [
+            ImageBuilder::class,
+            Filesystem::class,
+            'config.preview_generation.files_location',
+        ],
    ],

 ];
--- a/module/Common/config/templates.config.php
+++ b/module/Common/config/templates.config.php
@ -1,9 +1,11 @@
 <?php
-use Shlinkio\Shlink\Common\Twig\Extension\TranslatorExtension;
+declare(strict_types=1);
+
+use Shlinkio\Shlink\Common\Template\Extension\TranslatorExtension;

 return [

-    'twig' => [
+    'plates' => [
        'extensions' => [
            TranslatorExtension::class,
        ],
--- a/module/Common/functions/functions.php
+++ b/module/Common/functions/functions.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common;

 /**
--- a/module/Common/src/ConfigProvider.php
+++ b/module/Common/src/ConfigProvider.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common;

 use Zend\Config\Factory;
--- a/module/Common/src/Entity/AbstractEntity.php
+++ b/module/Common/src/Entity/AbstractEntity.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Entity;

 use Doctrine\ORM\Mapping as ORM;
--- a/module/Common/src/Exception/ExceptionInterface.php
+++ b/module/Common/src/Exception/ExceptionInterface.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;

 interface ExceptionInterface
--- a/module/Common/src/Exception/InvalidArgumentException.php
+++ b/module/Common/src/Exception/InvalidArgumentException.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;

 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
--- a/module/Common/src/Exception/PreviewGenerationException.php
+++ b/module/Common/src/Exception/PreviewGenerationException.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;

 class PreviewGenerationException extends RuntimeException
--- a/module/Common/src/Exception/RuntimeException.php
+++ b/module/Common/src/Exception/RuntimeException.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;

 class RuntimeException extends \RuntimeException implements ExceptionInterface
--- a/module/Common/src/Exception/WrongIpException.php
+++ b/module/Common/src/Exception/WrongIpException.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Exception;

 class WrongIpException extends RuntimeException
--- a/module/Common/src/Factory/CacheFactory.php
+++ b/module/Common/src/Factory/CacheFactory.php
@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Shlinkio\Shlink\Common\Factory;

 use Doctrine\Common\Cache;
--- a/Show More
+++ b/Show More