From a65ce649ac85267301997bb8fb8fd4dd6d156822 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 29 Sep 2018 09:52:32 +0200
Subject: [PATCH 1/7] Created new Installer module and moved everything from
 CLI there

---
 bin/install                                      |  4 ++--
 bin/update                                       |  4 ++--
 composer.json                                    | 10 ++++++----
 config/config.php                                | 16 +++-------------
 module/CLI/config/cli.config.php                 |  7 ++++---
 module/CLI/config/dependencies.config.php        |  6 +++---
 module/Installer/config/translator.config.php    | 16 ++++++++++++++++
 .../src/Command}/InstallCommand.php              | 12 ++++++------
 .../src/Config}/ConfigCustomizerManager.php      |  4 ++--
 .../Config}/ConfigCustomizerManagerInterface.php |  2 +-
 .../Plugin/ApplicationConfigCustomizer.php       |  4 ++--
 .../Config}/Plugin/ConfigCustomizerInterface.php |  4 ++--
 .../Config}/Plugin/DatabaseConfigCustomizer.php  |  7 ++++---
 .../Config}/Plugin/LanguageConfigCustomizer.php  |  9 +++++----
 .../Plugin/UrlShortenerConfigCustomizer.php      |  7 ++++---
 module/Installer/src/ConfigProvider.php          | 15 +++++++++++++++
 .../src/Factory/InstallApplicationFactory.php    |  8 ++++----
 .../src/Model/CustomizableAppConfig.php          |  4 ++--
 .../config/params/generated_config.php           |  0
 .../test/Command}/InstallCommandTest.php         | 12 ++++++------
 .../Plugin/ApplicationConfigCustomizerTest.php   |  6 +++---
 .../Plugin/DatabaseConfigCustomizerTest.php      |  6 +++---
 .../Plugin/LanguageConfigCustomizerTest.php      |  6 +++---
 .../Plugin/UrlShortenerConfigCustomizerTest.php  |  6 +++---
 .../Factory/InstallApplicationFactoryTest.php    |  4 ++--
 phpunit.xml.dist                                 |  3 +++
 26 files changed, 106 insertions(+), 76 deletions(-)
 create mode 100644 module/Installer/config/translator.config.php
 rename module/{CLI/src/Command/Install => Installer/src/Command}/InstallCommand.php (95%)
 rename module/{CLI/src/Install => Installer/src/Config}/ConfigCustomizerManager.php (68%)
 rename module/{CLI/src/Install => Installer/src/Config}/ConfigCustomizerManagerInterface.php (76%)
 rename module/{CLI/src/Install => Installer/src/Config}/Plugin/ApplicationConfigCustomizer.php (92%)
 rename module/{CLI/src/Install => Installer/src/Config}/Plugin/ConfigCustomizerInterface.php (74%)
 rename module/{CLI/src/Install => Installer/src/Config}/Plugin/DatabaseConfigCustomizer.php (92%)
 rename module/{CLI/src/Install => Installer/src/Config}/Plugin/LanguageConfigCustomizer.php (74%)
 rename module/{CLI/src/Install => Installer/src/Config}/Plugin/UrlShortenerConfigCustomizer.php (86%)
 create mode 100644 module/Installer/src/ConfigProvider.php
 rename module/{CLI => Installer}/src/Factory/InstallApplicationFactory.php (90%)
 rename module/{CLI => Installer}/src/Model/CustomizableAppConfig.php (98%)
 rename module/{CLI => Installer}/test-resources/config/params/generated_config.php (100%)
 rename module/{CLI/test/Command/Install => Installer/test/Command}/InstallCommandTest.php (92%)
 rename module/{CLI/test/Install => Installer/test/Config}/Plugin/ApplicationConfigCustomizerTest.php (92%)
 rename module/{CLI/test/Install => Installer/test/Config}/Plugin/DatabaseConfigCustomizerTest.php (95%)
 rename module/{CLI/test/Install => Installer/test/Config}/Plugin/LanguageConfigCustomizerTest.php (92%)
 rename module/{CLI/test/Install => Installer/test/Config}/Plugin/UrlShortenerConfigCustomizerTest.php (94%)
 rename module/{CLI => Installer}/test/Factory/InstallApplicationFactoryTest.php (86%)

diff --git a/bin/install b/bin/install
index 0d8dc72c..66282df0 100755
--- a/bin/install
+++ b/bin/install
@@ -2,8 +2,8 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
-use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizer;
+use Shlinkio\Shlink\Installer\Factory\InstallApplicationFactory;
+use Shlinkio\Shlink\Installer\Config\Plugin\DatabaseConfigCustomizer;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
diff --git a/bin/update b/bin/update
index 2a7e4091..92b0f054 100755
--- a/bin/update
+++ b/bin/update
@@ -2,8 +2,8 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
-use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizer;
+use Shlinkio\Shlink\Installer\Factory\InstallApplicationFactory;
+use Shlinkio\Shlink\Installer\Config\Plugin\DatabaseConfigCustomizer;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
diff --git a/composer.json b/composer.json
index 6a2c3b14..6111bd80 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,8 @@
             "Shlinkio\\Shlink\\CLI\\": "module/CLI/src",
             "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
             "Shlinkio\\Shlink\\Core\\": "module/Core/src",
-            "Shlinkio\\Shlink\\Common\\": "module/Common/src"
+            "Shlinkio\\Shlink\\Common\\": "module/Common/src",
+            "Shlinkio\\Shlink\\Installer\\": "module/Installer/src"
         },
         "files": [
             "module/Common/functions/functions.php"
@@ -78,7 +79,8 @@
             "ShlinkioTest\\Shlink\\Common\\": [
                 "module/Common/test",
                 "module/Common/test-func"
-            ]
+            ],
+            "ShlinkioTest\\Shlink\\Installer\\": "module/Installer/test"
         }
     },
     "scripts": {
@@ -101,8 +103,8 @@
             "phpcov merge build --html build/html"
         ],
         "stan": "phpstan analyse module/*/src/ --level=6 -c phpstan.neon",
-        "infect": "infection --threads=4 --min-msi=55 --only-covered --log-verbosity=2",
-        "infect-show": "infection --threads=4 --min-msi=55 --only-covered --log-verbosity=2 --show-mutations",
+        "infect": "infection --threads=4 --min-msi=60 --only-covered --log-verbosity=2",
+        "infect-show": "infection --threads=4 --min-msi=60 --only-covered --log-verbosity=2 --show-mutations",
         "expressive": "expressive"
     },
     "config": {
diff --git a/config/config.php b/config/config.php
index 506e29db..744d99d0 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,23 +1,12 @@
 <?php
 declare(strict_types=1);
 
+namespace Shlinkio\Shlink;
+
 use Acelaya\ExpressiveErrorHandler;
-use Shlinkio\Shlink\CLI;
-use Shlinkio\Shlink\Common;
-use Shlinkio\Shlink\Core;
-use Shlinkio\Shlink\Rest;
 use Zend\ConfigAggregator;
 use Zend\Expressive;
 
-/**
- * Configuration files are loaded in a specific order. First ``global.php``, then ``*.global.php``.
- * then ``local.php`` and finally ``*.local.php``. This way local settings overwrite global settings.
- *
- * The configuration can be cached. This can be done by setting ``config_cache_enabled`` to ``true``.
- *
- * Obviously, if you use closures in your config you can't cache it.
- */
-
 return (new ConfigAggregator\ConfigAggregator([
     Expressive\ConfigProvider::class,
     Expressive\Router\ConfigProvider::class,
@@ -31,6 +20,7 @@ return (new ConfigAggregator\ConfigAggregator([
     Common\ConfigProvider::class,
     Core\ConfigProvider::class,
     CLI\ConfigProvider::class,
+    Installer\ConfigProvider::class,
     Rest\ConfigProvider::class,
     new ConfigAggregator\ZendConfigProvider('config/{autoload/{{,*.}global,{,*.}local},params/generated_config}.php'),
 ], 'data/cache/app_config.php'))->getMergedConfig();
diff --git a/module/CLI/config/cli.config.php b/module/CLI/config/cli.config.php
index 501cb668..fb07cb47 100644
--- a/module/CLI/config/cli.config.php
+++ b/module/CLI/config/cli.config.php
@@ -1,13 +1,14 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\CLI\Command;
-use Shlinkio\Shlink\Common;
+namespace Shlinkio\Shlink\CLI;
+
+use function Shlinkio\Shlink\Common\env;
 
 return [
 
     'cli' => [
-        'locale' => Common\env('CLI_LOCALE', 'en'),
+        'locale' => env('CLI_LOCALE', 'en'),
         'commands' => [
             Command\ShortUrl\GenerateShortUrlCommand::NAME => Command\ShortUrl\GenerateShortUrlCommand::class,
             Command\ShortUrl\ResolveUrlCommand::NAME => Command\ShortUrl\ResolveUrlCommand::class,
diff --git a/module/CLI/config/dependencies.config.php b/module/CLI/config/dependencies.config.php
index f6f441c6..371c9175 100644
--- a/module/CLI/config/dependencies.config.php
+++ b/module/CLI/config/dependencies.config.php
@@ -1,8 +1,8 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\CLI\Command;
-use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
+namespace Shlinkio\Shlink\CLI;
+
 use Shlinkio\Shlink\Common\Service\IpApiLocationResolver;
 use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Service;
@@ -15,7 +15,7 @@ return [
 
     'dependencies' => [
         'factories' => [
-            Application::class => ApplicationFactory::class,
+            Application::class => Factory\ApplicationFactory::class,
 
             Command\ShortUrl\GenerateShortUrlCommand::class => ConfigAbstractFactory::class,
             Command\ShortUrl\ResolveUrlCommand::class => ConfigAbstractFactory::class,
diff --git a/module/Installer/config/translator.config.php b/module/Installer/config/translator.config.php
new file mode 100644
index 00000000..659d4cae
--- /dev/null
+++ b/module/Installer/config/translator.config.php
@@ -0,0 +1,16 @@
+<?php
+declare(strict_types=1);
+
+return [
+
+    'translator' => [
+        'translation_file_patterns' => [
+            [
+                'type' => 'gettext',
+                'base_dir' => __DIR__ . '/../lang',
+                'pattern' => '%s.mo',
+            ],
+        ],
+    ],
+
+];
diff --git a/module/CLI/src/Command/Install/InstallCommand.php b/module/Installer/src/Command/InstallCommand.php
similarity index 95%
rename from module/CLI/src/Command/Install/InstallCommand.php
rename to module/Installer/src/Command/InstallCommand.php
index e3ed030c..3e71a065 100644
--- a/module/CLI/src/Command/Install/InstallCommand.php
+++ b/module/Installer/src/Command/InstallCommand.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Command\Install;
+namespace Shlinkio\Shlink\Installer\Command;
 
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use Shlinkio\Shlink\CLI\Install\ConfigCustomizerManagerInterface;
-use Shlinkio\Shlink\CLI\Install\Plugin;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
+use Shlinkio\Shlink\Installer\Config\ConfigCustomizerManagerInterface;
+use Shlinkio\Shlink\Installer\Config\Plugin;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Exception\LogicException;
@@ -23,7 +23,7 @@ use Zend\Config\Writer\WriterInterface;
 
 class InstallCommand extends Command
 {
-    const GENERATED_CONFIG_PATH = 'config/params/generated_config.php';
+    public const GENERATED_CONFIG_PATH = 'config/params/generated_config.php';
 
     /**
      * @var SymfonyStyle
@@ -42,7 +42,7 @@ class InstallCommand extends Command
      */
     private $filesystem;
     /**
-     * @var ConfigCustomizerManagerInterface
+     * @var \Shlinkio\Shlink\Installer\Config\ConfigCustomizerManagerInterface
      */
     private $configCustomizers;
     /**
diff --git a/module/CLI/src/Install/ConfigCustomizerManager.php b/module/Installer/src/Config/ConfigCustomizerManager.php
similarity index 68%
rename from module/CLI/src/Install/ConfigCustomizerManager.php
rename to module/Installer/src/Config/ConfigCustomizerManager.php
index ee4aedfa..7f44103d 100644
--- a/module/CLI/src/Install/ConfigCustomizerManager.php
+++ b/module/Installer/src/Config/ConfigCustomizerManager.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Install;
+namespace Shlinkio\Shlink\Installer\Config;
 
-use Shlinkio\Shlink\CLI\Install\Plugin\ConfigCustomizerInterface;
+use Shlinkio\Shlink\Installer\Config\Plugin\ConfigCustomizerInterface;
 use Zend\ServiceManager\AbstractPluginManager;
 
 class ConfigCustomizerManager extends AbstractPluginManager implements ConfigCustomizerManagerInterface
diff --git a/module/CLI/src/Install/ConfigCustomizerManagerInterface.php b/module/Installer/src/Config/ConfigCustomizerManagerInterface.php
similarity index 76%
rename from module/CLI/src/Install/ConfigCustomizerManagerInterface.php
rename to module/Installer/src/Config/ConfigCustomizerManagerInterface.php
index bbeedca8..922f5977 100644
--- a/module/CLI/src/Install/ConfigCustomizerManagerInterface.php
+++ b/module/Installer/src/Config/ConfigCustomizerManagerInterface.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Install;
+namespace Shlinkio\Shlink\Installer\Config;
 
 use Psr\Container\ContainerInterface;
 
diff --git a/module/CLI/src/Install/Plugin/ApplicationConfigCustomizer.php b/module/Installer/src/Config/Plugin/ApplicationConfigCustomizer.php
similarity index 92%
rename from module/CLI/src/Install/Plugin/ApplicationConfigCustomizer.php
rename to module/Installer/src/Config/Plugin/ApplicationConfigCustomizer.php
index 70a64a90..f29adc15 100644
--- a/module/CLI/src/Install/Plugin/ApplicationConfigCustomizer.php
+++ b/module/Installer/src/Config/Plugin/ApplicationConfigCustomizer.php
@@ -1,10 +1,10 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
+namespace Shlinkio\Shlink\Installer\Config\Plugin;
 
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 class ApplicationConfigCustomizer implements ConfigCustomizerInterface
diff --git a/module/CLI/src/Install/Plugin/ConfigCustomizerInterface.php b/module/Installer/src/Config/Plugin/ConfigCustomizerInterface.php
similarity index 74%
rename from module/CLI/src/Install/Plugin/ConfigCustomizerInterface.php
rename to module/Installer/src/Config/Plugin/ConfigCustomizerInterface.php
index 0a2bf054..015f767b 100644
--- a/module/CLI/src/Install/Plugin/ConfigCustomizerInterface.php
+++ b/module/Installer/src/Config/Plugin/ConfigCustomizerInterface.php
@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
+namespace Shlinkio\Shlink\Installer\Config\Plugin;
 
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 interface ConfigCustomizerInterface
diff --git a/module/CLI/src/Install/Plugin/DatabaseConfigCustomizer.php b/module/Installer/src/Config/Plugin/DatabaseConfigCustomizer.php
similarity index 92%
rename from module/CLI/src/Install/Plugin/DatabaseConfigCustomizer.php
rename to module/Installer/src/Config/Plugin/DatabaseConfigCustomizer.php
index 9e226e27..663ffbe0 100644
--- a/module/CLI/src/Install/Plugin/DatabaseConfigCustomizer.php
+++ b/module/Installer/src/Config/Plugin/DatabaseConfigCustomizer.php
@@ -1,16 +1,17 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
+namespace Shlinkio\Shlink\Installer\Config\Plugin;
 
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
+use Shlinkio\Shlink\Installer\Config\Plugin\ConfigCustomizerInterface;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 
 class DatabaseConfigCustomizer implements ConfigCustomizerInterface
 {
-    const DATABASE_DRIVERS = [
+    private const DATABASE_DRIVERS = [
         'MySQL' => 'pdo_mysql',
         'PostgreSQL' => 'pdo_pgsql',
         'SQLite' => 'pdo_sqlite',
diff --git a/module/CLI/src/Install/Plugin/LanguageConfigCustomizer.php b/module/Installer/src/Config/Plugin/LanguageConfigCustomizer.php
similarity index 74%
rename from module/CLI/src/Install/Plugin/LanguageConfigCustomizer.php
rename to module/Installer/src/Config/Plugin/LanguageConfigCustomizer.php
index 15125d32..64582de8 100644
--- a/module/CLI/src/Install/Plugin/LanguageConfigCustomizer.php
+++ b/module/Installer/src/Config/Plugin/LanguageConfigCustomizer.php
@@ -1,18 +1,19 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
+namespace Shlinkio\Shlink\Installer\Config\Plugin;
 
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
+use Shlinkio\Shlink\Installer\Config\Plugin\ConfigCustomizerInterface;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 class LanguageConfigCustomizer implements ConfigCustomizerInterface
 {
-    const SUPPORTED_LANGUAGES = ['en', 'es'];
+    private const SUPPORTED_LANGUAGES = ['en', 'es'];
 
     /**
      * @param SymfonyStyle $io
-     * @param CustomizableAppConfig $appConfig
+     * @param \Shlinkio\Shlink\Installer\Model\CustomizableAppConfig $appConfig
      * @return void
      */
     public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig)
diff --git a/module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizer.php b/module/Installer/src/Config/Plugin/UrlShortenerConfigCustomizer.php
similarity index 86%
rename from module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizer.php
rename to module/Installer/src/Config/Plugin/UrlShortenerConfigCustomizer.php
index d010667d..d3737d66 100644
--- a/module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizer.php
+++ b/module/Installer/src/Config/Plugin/UrlShortenerConfigCustomizer.php
@@ -1,11 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Install\Plugin;
+namespace Shlinkio\Shlink\Installer\Config\Plugin;
 
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use function str_shuffle;
 
 class UrlShortenerConfigCustomizer implements ConfigCustomizerInterface
 {
@@ -36,7 +37,7 @@ class UrlShortenerConfigCustomizer implements ConfigCustomizerInterface
                 function ($value) {
                     return $value;
                 }
-            ) ?: \str_shuffle(UrlShortener::DEFAULT_CHARS),
+            ) ?: str_shuffle(UrlShortener::DEFAULT_CHARS),
             'VALIDATE_URL' => $io->confirm('Do you want to validate long urls by 200 HTTP status code on response'),
         ]);
     }
diff --git a/module/Installer/src/ConfigProvider.php b/module/Installer/src/ConfigProvider.php
new file mode 100644
index 00000000..6be4cf16
--- /dev/null
+++ b/module/Installer/src/ConfigProvider.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Installer;
+
+use Zend\Config\Factory;
+use Zend\Stdlib\Glob;
+
+class ConfigProvider
+{
+    public function __invoke()
+    {
+        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+    }
+}
diff --git a/module/CLI/src/Factory/InstallApplicationFactory.php b/module/Installer/src/Factory/InstallApplicationFactory.php
similarity index 90%
rename from module/CLI/src/Factory/InstallApplicationFactory.php
rename to module/Installer/src/Factory/InstallApplicationFactory.php
index c20d6706..b790bb87 100644
--- a/module/CLI/src/Factory/InstallApplicationFactory.php
+++ b/module/Installer/src/Factory/InstallApplicationFactory.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Factory;
+namespace Shlinkio\Shlink\Installer\Factory;
 
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
-use Shlinkio\Shlink\CLI\Command\Install\InstallCommand;
-use Shlinkio\Shlink\CLI\Install\ConfigCustomizerManager;
-use Shlinkio\Shlink\CLI\Install\Plugin;
+use Shlinkio\Shlink\Installer\Command\InstallCommand;
+use Shlinkio\Shlink\Installer\Config\ConfigCustomizerManager;
+use Shlinkio\Shlink\Installer\Config\Plugin;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Filesystem\Filesystem;
diff --git a/module/CLI/src/Model/CustomizableAppConfig.php b/module/Installer/src/Model/CustomizableAppConfig.php
similarity index 98%
rename from module/CLI/src/Model/CustomizableAppConfig.php
rename to module/Installer/src/Model/CustomizableAppConfig.php
index bf71c1eb..e5c1eda2 100644
--- a/module/CLI/src/Model/CustomizableAppConfig.php
+++ b/module/Installer/src/Model/CustomizableAppConfig.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\CLI\Model;
+namespace Shlinkio\Shlink\Installer\Model;
 
 use Zend\Stdlib\ArraySerializableInterface;
 
 final class CustomizableAppConfig implements ArraySerializableInterface
 {
-    const SQLITE_DB_PATH = 'data/database.sqlite';
+    public const SQLITE_DB_PATH = 'data/database.sqlite';
 
     /**
      * @var array
diff --git a/module/CLI/test-resources/config/params/generated_config.php b/module/Installer/test-resources/config/params/generated_config.php
similarity index 100%
rename from module/CLI/test-resources/config/params/generated_config.php
rename to module/Installer/test-resources/config/params/generated_config.php
diff --git a/module/CLI/test/Command/Install/InstallCommandTest.php b/module/Installer/test/Command/InstallCommandTest.php
similarity index 92%
rename from module/CLI/test/Command/Install/InstallCommandTest.php
rename to module/Installer/test/Command/InstallCommandTest.php
index 556f628b..bb2ce730 100644
--- a/module/CLI/test/Command/Install/InstallCommandTest.php
+++ b/module/Installer/test/Command/InstallCommandTest.php
@@ -1,15 +1,15 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Command\Install;
+namespace ShlinkioTest\Shlink\Installer\Command;
 
 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\ConfigCustomizerManagerInterface;
-use Shlinkio\Shlink\CLI\Install\Plugin\ConfigCustomizerInterface;
+use Shlinkio\Shlink\Installer\Command\InstallCommand;
+use Shlinkio\Shlink\Installer\Config\ConfigCustomizerManagerInterface;
+use Shlinkio\Shlink\Installer\Config\Plugin\ConfigCustomizerInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -131,14 +131,14 @@ class InstallCommandTest extends TestCase
 
         /** @var MethodProphecy $importedConfigExists */
         $importedConfigExists = $this->filesystem->exists(
-            __DIR__ . '/../../../test-resources/' . InstallCommand::GENERATED_CONFIG_PATH
+            __DIR__ . '/../../test-resources/' . InstallCommand::GENERATED_CONFIG_PATH
         )->willReturn(true);
 
         $this->commandTester->setInputs([
             '',
             '/foo/bar/wrong_previous_shlink',
             '',
-            __DIR__ . '/../../../test-resources',
+            __DIR__ . '/../../test-resources',
         ]);
         $this->commandTester->execute([]);
 
diff --git a/module/CLI/test/Install/Plugin/ApplicationConfigCustomizerTest.php b/module/Installer/test/Config/Plugin/ApplicationConfigCustomizerTest.php
similarity index 92%
rename from module/CLI/test/Install/Plugin/ApplicationConfigCustomizerTest.php
rename to module/Installer/test/Config/Plugin/ApplicationConfigCustomizerTest.php
index 5450d0b1..9a5bc3c5 100644
--- a/module/CLI/test/Install/Plugin/ApplicationConfigCustomizerTest.php
+++ b/module/Installer/test/Config/Plugin/ApplicationConfigCustomizerTest.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
+namespace ShlinkioTest\Shlink\Installer\Config\Plugin;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Install\Plugin\ApplicationConfigCustomizer;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
+use Shlinkio\Shlink\Installer\Config\Plugin\ApplicationConfigCustomizer;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 class ApplicationConfigCustomizerTest extends TestCase
diff --git a/module/CLI/test/Install/Plugin/DatabaseConfigCustomizerTest.php b/module/Installer/test/Config/Plugin/DatabaseConfigCustomizerTest.php
similarity index 95%
rename from module/CLI/test/Install/Plugin/DatabaseConfigCustomizerTest.php
rename to module/Installer/test/Config/Plugin/DatabaseConfigCustomizerTest.php
index 17835666..5d03409b 100644
--- a/module/CLI/test/Install/Plugin/DatabaseConfigCustomizerTest.php
+++ b/module/Installer/test/Config/Plugin/DatabaseConfigCustomizerTest.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
+namespace ShlinkioTest\Shlink\Installer\Config\Plugin;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Install\Plugin\DatabaseConfigCustomizer;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
+use Shlinkio\Shlink\Installer\Config\Plugin\DatabaseConfigCustomizer;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Filesystem\Filesystem;
 
diff --git a/module/CLI/test/Install/Plugin/LanguageConfigCustomizerTest.php b/module/Installer/test/Config/Plugin/LanguageConfigCustomizerTest.php
similarity index 92%
rename from module/CLI/test/Install/Plugin/LanguageConfigCustomizerTest.php
rename to module/Installer/test/Config/Plugin/LanguageConfigCustomizerTest.php
index cd7d57d4..42b7e10b 100644
--- a/module/CLI/test/Install/Plugin/LanguageConfigCustomizerTest.php
+++ b/module/Installer/test/Config/Plugin/LanguageConfigCustomizerTest.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
+namespace ShlinkioTest\Shlink\Installer\Config\Plugin;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Install\Plugin\LanguageConfigCustomizer;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
+use Shlinkio\Shlink\Installer\Config\Plugin\LanguageConfigCustomizer;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 class LanguageConfigCustomizerTest extends TestCase
diff --git a/module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerTest.php b/module/Installer/test/Config/Plugin/UrlShortenerConfigCustomizerTest.php
similarity index 94%
rename from module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerTest.php
rename to module/Installer/test/Config/Plugin/UrlShortenerConfigCustomizerTest.php
index 1b6c6a0f..779107f4 100644
--- a/module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerTest.php
+++ b/module/Installer/test/Config/Plugin/UrlShortenerConfigCustomizerTest.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
+namespace ShlinkioTest\Shlink\Installer\Config\Plugin;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Install\Plugin\UrlShortenerConfigCustomizer;
-use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
+use Shlinkio\Shlink\Installer\Config\Plugin\UrlShortenerConfigCustomizer;
+use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 class UrlShortenerConfigCustomizerTest extends TestCase
diff --git a/module/CLI/test/Factory/InstallApplicationFactoryTest.php b/module/Installer/test/Factory/InstallApplicationFactoryTest.php
similarity index 86%
rename from module/CLI/test/Factory/InstallApplicationFactoryTest.php
rename to module/Installer/test/Factory/InstallApplicationFactoryTest.php
index 35820bba..0cd72393 100644
--- a/module/CLI/test/Factory/InstallApplicationFactoryTest.php
+++ b/module/Installer/test/Factory/InstallApplicationFactoryTest.php
@@ -1,10 +1,10 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\CLI\Factory;
+namespace ShlinkioTest\Shlink\Installer\Factory;
 
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\CLI\Factory\InstallApplicationFactory;
+use Shlinkio\Shlink\Installer\Factory\InstallApplicationFactory;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\ServiceManager\ServiceManager;
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index af71c7cd..f9f7797b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -17,6 +17,9 @@
         <testsuite name="CLI">
             <directory>./module/CLI/test</directory>
         </testsuite>
+        <testsuite name="Installer">
+            <directory>./module/Installer/test</directory>
+        </testsuite>
     </testsuites>
 
     <filter>

From d5392a5f597fcd025006a60c14050c2bb703108f Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 29 Sep 2018 09:55:13 +0200
Subject: [PATCH 2/7] Added missing void return type hint

---
 .../src/Config/Plugin/ApplicationConfigCustomizer.php     | 7 +------
 .../src/Config/Plugin/ConfigCustomizerInterface.php       | 7 +------
 .../src/Config/Plugin/DatabaseConfigCustomizer.php        | 6 +-----
 .../src/Config/Plugin/LanguageConfigCustomizer.php        | 8 +-------
 .../src/Config/Plugin/UrlShortenerConfigCustomizer.php    | 7 +------
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/module/Installer/src/Config/Plugin/ApplicationConfigCustomizer.php b/module/Installer/src/Config/Plugin/ApplicationConfigCustomizer.php
index f29adc15..a57a3f78 100644
--- a/module/Installer/src/Config/Plugin/ApplicationConfigCustomizer.php
+++ b/module/Installer/src/Config/Plugin/ApplicationConfigCustomizer.php
@@ -11,12 +11,7 @@ class ApplicationConfigCustomizer implements ConfigCustomizerInterface
 {
     use StringUtilsTrait;
 
-    /**
-     * @param SymfonyStyle $io
-     * @param CustomizableAppConfig $appConfig
-     * @return void
-     */
-    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig)
+    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig): void
     {
         $io->title('APPLICATION');
 
diff --git a/module/Installer/src/Config/Plugin/ConfigCustomizerInterface.php b/module/Installer/src/Config/Plugin/ConfigCustomizerInterface.php
index 015f767b..908f6f90 100644
--- a/module/Installer/src/Config/Plugin/ConfigCustomizerInterface.php
+++ b/module/Installer/src/Config/Plugin/ConfigCustomizerInterface.php
@@ -8,10 +8,5 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 interface ConfigCustomizerInterface
 {
-    /**
-     * @param SymfonyStyle $io
-     * @param CustomizableAppConfig $appConfig
-     * @return void
-     */
-    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig);
+    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig): void;
 }
diff --git a/module/Installer/src/Config/Plugin/DatabaseConfigCustomizer.php b/module/Installer/src/Config/Plugin/DatabaseConfigCustomizer.php
index 663ffbe0..c117c32d 100644
--- a/module/Installer/src/Config/Plugin/DatabaseConfigCustomizer.php
+++ b/module/Installer/src/Config/Plugin/DatabaseConfigCustomizer.php
@@ -3,7 +3,6 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Installer\Config\Plugin;
 
-use Shlinkio\Shlink\Installer\Config\Plugin\ConfigCustomizerInterface;
 use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Filesystem\Exception\IOException;
@@ -28,12 +27,9 @@ class DatabaseConfigCustomizer implements ConfigCustomizerInterface
     }
 
     /**
-     * @param SymfonyStyle $io
-     * @param CustomizableAppConfig $appConfig
-     * @return void
      * @throws IOException
      */
-    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig)
+    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig): void
     {
         $io->title('DATABASE');
 
diff --git a/module/Installer/src/Config/Plugin/LanguageConfigCustomizer.php b/module/Installer/src/Config/Plugin/LanguageConfigCustomizer.php
index 64582de8..1a7a2de4 100644
--- a/module/Installer/src/Config/Plugin/LanguageConfigCustomizer.php
+++ b/module/Installer/src/Config/Plugin/LanguageConfigCustomizer.php
@@ -3,7 +3,6 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Installer\Config\Plugin;
 
-use Shlinkio\Shlink\Installer\Config\Plugin\ConfigCustomizerInterface;
 use Shlinkio\Shlink\Installer\Model\CustomizableAppConfig;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
@@ -11,12 +10,7 @@ class LanguageConfigCustomizer implements ConfigCustomizerInterface
 {
     private const SUPPORTED_LANGUAGES = ['en', 'es'];
 
-    /**
-     * @param SymfonyStyle $io
-     * @param \Shlinkio\Shlink\Installer\Model\CustomizableAppConfig $appConfig
-     * @return void
-     */
-    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig)
+    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig): void
     {
         $io->title('LANGUAGE');
 
diff --git a/module/Installer/src/Config/Plugin/UrlShortenerConfigCustomizer.php b/module/Installer/src/Config/Plugin/UrlShortenerConfigCustomizer.php
index d3737d66..729ec2f8 100644
--- a/module/Installer/src/Config/Plugin/UrlShortenerConfigCustomizer.php
+++ b/module/Installer/src/Config/Plugin/UrlShortenerConfigCustomizer.php
@@ -10,12 +10,7 @@ use function str_shuffle;
 
 class UrlShortenerConfigCustomizer implements ConfigCustomizerInterface
 {
-    /**
-     * @param SymfonyStyle $io
-     * @param CustomizableAppConfig $appConfig
-     * @return void
-     */
-    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig)
+    public function process(SymfonyStyle $io, CustomizableAppConfig $appConfig): void
     {
         $io->title('URL SHORTENER');
 

From 1b4343ffc258000c2e0285129ba6c7610db44fd0 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 29 Sep 2018 10:00:17 +0200
Subject: [PATCH 3/7] Moved update and install duplicated code to common config
 file

---
 bin/install                  | 28 +++++-----------------------
 bin/update                   | 28 +++++-----------------------
 config/install-container.php | 29 +++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 46 deletions(-)
 create mode 100644 config/install-container.php

diff --git a/bin/install b/bin/install
index 66282df0..13c0a3e8 100755
--- a/bin/install
+++ b/bin/install
@@ -2,29 +2,11 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\Installer\Factory\InstallApplicationFactory;
-use Shlinkio\Shlink\Installer\Config\Plugin\DatabaseConfigCustomizer;
+namespace Shlinkio\Shlink\Installer;
+
 use Symfony\Component\Console\Application;
-use Symfony\Component\Filesystem\Filesystem;
-use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Zend\ServiceManager\Factory\InvokableFactory;
-use Zend\ServiceManager\ServiceManager;
+use Zend\ServiceManager\ServiceLocatorInterface;
 
-chdir(dirname(__DIR__));
-
-require __DIR__ . '/../vendor/autoload.php';
-
-$container = new ServiceManager([
-    'factories' => [
-        Application::class => InstallApplicationFactory::class,
-        Filesystem::class => InvokableFactory::class,
-    ],
-    'services' => [
-        'config' => [
-            ConfigAbstractFactory::class => [
-                DatabaseConfigCustomizer::class => [Filesystem::class]
-            ],
-        ],
-    ],
-]);
+/** @var ServiceLocatorInterface $container */
+$container = include __DIR__ . '/../config/install-container.php';
 $container->build(Application::class)->run();
diff --git a/bin/update b/bin/update
index 92b0f054..8e2e02b5 100755
--- a/bin/update
+++ b/bin/update
@@ -2,29 +2,11 @@
 <?php
 declare(strict_types=1);
 
-use Shlinkio\Shlink\Installer\Factory\InstallApplicationFactory;
-use Shlinkio\Shlink\Installer\Config\Plugin\DatabaseConfigCustomizer;
+namespace Shlinkio\Shlink\Installer;
+
 use Symfony\Component\Console\Application;
-use Symfony\Component\Filesystem\Filesystem;
-use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Zend\ServiceManager\Factory\InvokableFactory;
-use Zend\ServiceManager\ServiceManager;
+use Zend\ServiceManager\ServiceLocatorInterface;
 
-chdir(dirname(__DIR__));
-
-require __DIR__ . '/../vendor/autoload.php';
-
-$container = new ServiceManager([
-    'factories' => [
-        Application::class => InstallApplicationFactory::class,
-        Filesystem::class => InvokableFactory::class,
-    ],
-    'services' => [
-        'config' => [
-            ConfigAbstractFactory::class => [
-                DatabaseConfigCustomizer::class => [Filesystem::class]
-            ],
-        ],
-    ],
-]);
+/** @var ServiceLocatorInterface $container */
+$container = include __DIR__ . '/../config/install-container.php';
 $container->build(Application::class, ['isUpdate' => true])->run();
diff --git a/config/install-container.php b/config/install-container.php
new file mode 100644
index 00000000..0db90897
--- /dev/null
+++ b/config/install-container.php
@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+use Shlinkio\Shlink\Installer\Config\Plugin\DatabaseConfigCustomizer;
+use Shlinkio\Shlink\Installer\Factory\InstallApplicationFactory;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Filesystem\Filesystem;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+use Zend\ServiceManager\Factory\InvokableFactory;
+use Zend\ServiceManager\ServiceManager;
+
+chdir(dirname(__DIR__));
+
+require __DIR__ . '/../vendor/autoload.php';
+
+$container = new ServiceManager([
+    'factories' => [
+        Application::class => InstallApplicationFactory::class,
+        Filesystem::class => InvokableFactory::class,
+    ],
+    'services' => [
+        'config' => [
+            ConfigAbstractFactory::class => [
+                DatabaseConfigCustomizer::class => [Filesystem::class],
+            ],
+        ],
+    ],
+]);
+return $container;

From f92cff6241cd5b050506c8cc09e3f66c534a747b Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 29 Sep 2018 10:05:13 +0200
Subject: [PATCH 4/7] Removed not used translator config

---
 module/Installer/config/module.config.php     |  4 ++++
 module/Installer/config/translator.config.php | 16 ----------------
 2 files changed, 4 insertions(+), 16 deletions(-)
 create mode 100644 module/Installer/config/module.config.php
 delete mode 100644 module/Installer/config/translator.config.php

diff --git a/module/Installer/config/module.config.php b/module/Installer/config/module.config.php
new file mode 100644
index 00000000..353ace17
--- /dev/null
+++ b/module/Installer/config/module.config.php
@@ -0,0 +1,4 @@
+<?php
+declare(strict_types=1);
+
+return [];
diff --git a/module/Installer/config/translator.config.php b/module/Installer/config/translator.config.php
deleted file mode 100644
index 659d4cae..00000000
--- a/module/Installer/config/translator.config.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-declare(strict_types=1);
-
-return [
-
-    'translator' => [
-        'translation_file_patterns' => [
-            [
-                'type' => 'gettext',
-                'base_dir' => __DIR__ . '/../lang',
-                'pattern' => '%s.mo',
-            ],
-        ],
-    ],
-
-];

From 49cca5cd696359eb6c0a5816aec75136cfbc1d81 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 29 Sep 2018 10:07:10 +0200
Subject: [PATCH 5/7] Removed FQCN

---
 module/Installer/src/Command/InstallCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/Installer/src/Command/InstallCommand.php b/module/Installer/src/Command/InstallCommand.php
index 3e71a065..dde61aa3 100644
--- a/module/Installer/src/Command/InstallCommand.php
+++ b/module/Installer/src/Command/InstallCommand.php
@@ -42,7 +42,7 @@ class InstallCommand extends Command
      */
     private $filesystem;
     /**
-     * @var \Shlinkio\Shlink\Installer\Config\ConfigCustomizerManagerInterface
+     * @var ConfigCustomizerManagerInterface
      */
     private $configCustomizers;
     /**

From a81fd497d41833cc9f276b872d2bdd0ea0ef4dd1 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 29 Sep 2018 10:09:12 +0200
Subject: [PATCH 6/7] Updated Rest translations

---
 module/Rest/lang/es.mo | Bin 3192 -> 3049 bytes
 module/Rest/lang/es.po |  19 +++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/module/Rest/lang/es.mo b/module/Rest/lang/es.mo
index 5c1a1db85e453930f41c9653edbbab26355f550d..bd1f572331456c7c7c606abec23bc2657fc9ef8b 100644
GIT binary patch
delta 572
zcmX}n&r1|x9LMqRxURnv5jvC*^-Yj0)>2V4!-LXx3!ywj*5TQiXLVqCW|(I-_2i{{
z(bA<u*YFtQf8eombPGHb1YIg9kG*GCeBhbaJl|)Y@8_A*%Rer?UO3nkk<&mV#D{$%
zckm<L!V^>+t%%&l8C=9?cpu;31b#W&|AkYmwO?cvA7Huv64&uPZs7@*eO9Y-Am0i1
zRgtR{o(>X%``E+}XmD&uWEoSuhljX=-*5?aSY!>KU>WcZr}6Ju{n|*cufaO?S9k?K
zkMO&Xc==7iVf}*00v;jvl2K+k#+dYyYR3dOu3s!mjPV}bCpQ&-t2+idhrz~XeJ{0P
zZX->c)ugHUj@4$;Y9+g|+g8(N?eaJ@d7L=iu_m&auW6&5t1D0J+RSR2B`@O0Mm61<
zobr>;JO6^W#YE*(-_ZPBots^mT`qoB{{+p)R;^EMW*SD@&S+${WxV=$yB(8ay@sY?
sLq7239^t+0Fg`9^O*xs6s=k|;CRxaxjth0%ly>LoUk8g~WB6v}KM-7Vp8x;=

delta 698
zcmZY4zfTlF6bJBk2L~rVO)T^hLY^cSek7g}AzmO9D3(M+1(9ahd3YPn*>iUH%w6Gy
zf{uc?`~#H6DABXj3MyhrXtC1Rnb1)3-CYO;Q_N@g&CL7p@9z1%ovD^XMCTczhj2AZ
zv<<i61T1tAF<gKpC~z9?!UcE)3vjSAJs*cf{4c{f_#VdRKj2e%0$;&GF3l6>s6~HJ
z{1XDhIQY;_^Z<T^3ZB9;oX->egiSaL%eRPTU;v-MeK-&Q!nnYA578Lhf^qx{jPw47
z&*5+{(Gb+V7<&mHn+O<q45#3;J|gr*AXx+0k()Xrl^MO?l?Lhdr7`F<S$DAKqK}yu
z(PDPDwdnf3YhJTw*)?@lbv3InsBqwIh~b*`>aG@D;+JCAJ^O|g8+n&p5fiwM3S7^y
zmA9ez0V|`~7i?GWF4N$O)WtTEw^x@D3@ZJ?BSn9NE26a6_V4VkY<_Z@C(ARB9=E^e
z&N9(J{#z?;MoU~bE$g@kZNna;s$h$IKiEU_UWu0kQ#2Ka2EB$-S6mZxnmo9fqQQcv
rpA}2>dghvE9n7UP3K(`qmA;t@2UW$6S`$aCN~VZbx`*0_`C`WfK0%{i

diff --git a/module/Rest/lang/es.po b/module/Rest/lang/es.po
index 61f49207..7998abc0 100644
--- a/module/Rest/lang/es.po
+++ b/module/Rest/lang/es.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Shlink 1.0\n"
-"POT-Creation-Date: 2018-09-15 18:02+0200\n"
-"PO-Revision-Date: 2018-09-15 18:03+0200\n"
+"POT-Creation-Date: 2018-09-29 10:08+0200\n"
+"PO-Revision-Date: 2018-09-29 10:08+0200\n"
 "Last-Translator: Alejandro Celaya <alejandro@alejandrocelaya.com>\n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -89,11 +89,22 @@ msgstr ""
 "El tipo de autorización proporcionado %s no está soportado. En vez de eso "
 "utiliza Bearer."
 
-#, php-format
+#, fuzzy, php-format
+#| msgid ""
+#| "Missing or invalid auth token provided. Perform a new authentication "
+#| "request and send provided token on every new request on the \"%s\" header"
 msgid ""
 "Missing or invalid auth token provided. Perform a new authentication request "
-"and send provided token on every new request on the \"%s\" header"
+"and send provided token on every new request on the %s header"
 msgstr ""
 "No se ha proporcionado token de autenticación o este es inválido. Realiza "
 "una nueva petición de autenticación y envía el token proporcionado en cada "
 "nueva petición en la cabecera \"%s\""
+
+#, php-format
+msgid ""
+"Expected one of the following authentication headers, but none were "
+"provided, [\"%s\"]"
+msgstr ""
+"Se esperaba una de las siguientes cabeceras de autenticación, pero no se "
+"proporcionó ninguna, [\"%s\"]"

From 2edb48e314840076e034f3f98383cf8d7d722c65 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 29 Sep 2018 10:15:39 +0200
Subject: [PATCH 7/7] Documented where the installer command has to be run

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 262f271d..e605d8b0 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Despite how you built the project, you are going to need to install it now, by f
 
 * If you are going to use MySQL or PostgreSQL, create an empty database with the name of your choice.
 * Recursively grant write permissions to the `data` directory. Shlink uses it to cache some information.
-* Setup the application by running the `bin/install` script. It will guide you through the installation process.
+* Setup the application by running the `bin/install` script. It is a command line tool that will guide you through the installation process. **Take into account that this tool has to be run directly on the server where you plan to host Shlink. Do not run it before uploading/moving it there.**
 * Configure the web server of your choice to serve shlink using your short domain.
 
     For example, assuming your domain is doma.in and shlink is in the `/path/to/shlink` folder, this would be the basic configuration for Nginx and Apache.