Merge pull request #65 from acelaya-forks/feature/shlink-config

Feature/shlink config
shlinkio · Mar 13, 2020 · 3f7adf0 · 3f7adf0
2 parents 53e2b95 + c3511b7
commit 3f7adf0
Show file tree

Hide file tree

Showing 63 changed files with 111 additions and 277 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## 4.3.0 - 2020-03-13
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#64](https://github.com/shlinkio/shlink-installer/issues/64) Added `shlinkio/shlink-config` as a project dependency, deprecating the `Shlinkio\Shlink\Installer\Utils\PathCollection` class.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* *Nothing*
+
+
 ## 4.2.0 - 2020-02-18
 
 #### Added

diff --git a/bin/run.php b/bin/run.php
@@ -9,8 +9,6 @@
 
 /** @var ServiceLocatorInterface $container */
 $container = include __DIR__ . '/../config/container.php';
+$runApp = fn (bool $isUpdate) => $container->build(Application::class, ['isUpdate' => $isUpdate])->run();
 
-return [
-    fn () => $container->build(Application::class, ['isUpdate' => false])->run(),
-    fn () => $container->build(Application::class, ['isUpdate' => true])->run(),
-];
+return [fn () => $runApp(false), fn () => $runApp(true)];
diff --git a/composer.json b/composer.json
@@ -13,11 +13,13 @@
     ],
     "require": {
         "php": "^7.4",
-        "lstrojny/functional-php": "^1.9",
         "laminas/laminas-config": "^3.2",
+        "laminas/laminas-config-aggregator": "^1.2",
         "laminas/laminas-dependency-plugin": "^1.0",
         "laminas/laminas-servicemanager": "^3.4",
         "laminas/laminas-stdlib": "^3.2",
+        "lstrojny/functional-php": "^1.9",
+        "shlinkio/shlink-config": "^1.0",
         "symfony/console": "^5.0",
         "symfony/filesystem": "^5.0",
         "symfony/process": "^5.0"

diff --git a/config/config.php b/config/config.php
@@ -19,7 +19,7 @@
             PhpExecutableFinder::class => InvokableFactory::class,
             Console\Helper\ProcessHelper::class => Factory\ProcessHelperFactory::class,
 
-            Service\InstallationCommandsRunner::class => Service\InstallationCommandsRunnerFactory::class,
+            Service\InstallationCommandsRunner::class => ConfigAbstractFactory::class,
             Service\ShlinkAssetsHandler::class => ConfigAbstractFactory::class,
             Config\ConfigGenerator::class => Config\ConfigGeneratorFactory::class,
             Factory\SwooleInstalledFactory::SWOOLE_INSTALLED => Factory\SwooleInstalledFactory::class,
@@ -93,6 +93,11 @@
         Config\Option\TaskWorkerNumConfigOption::class => [Factory\SwooleInstalledFactory::SWOOLE_INSTALLED],
         Config\Option\WebWorkerNumConfigOption::class => [Factory\SwooleInstalledFactory::SWOOLE_INSTALLED],
         Service\ShlinkAssetsHandler::class => [Filesystem::class],
+        Service\InstallationCommandsRunner::class => [
+            Console\Helper\ProcessHelper::class,
+            PhpExecutableFinder::class,
+            'config.installer.installation_commands',
+        ],
     ],
 
     'installer' => [

diff --git a/config/container.php b/config/container.php
@@ -4,10 +4,11 @@
 
 namespace Shlinkio\Shlink\Installer;
 
+use Laminas\ConfigAggregator\ConfigAggregator;
+use Laminas\ConfigAggregator\PhpFileProvider;
 use Laminas\ServiceManager\ServiceManager;
-use Laminas\Stdlib\ArrayUtils;
+use Shlinkio\Shlink\Config;
 
-use function array_reduce;
 use function file_exists;
 
 $autoloadFiles = [
@@ -21,8 +22,7 @@
     }
 }
 
-$installerConfig = require __DIR__ . '/config.php';
-$appConfig = (function () {
+$shlinkConfigLoader = static function () {
     $appConfigPath = __DIR__ . '/../../../../config/config.php';
     if (! file_exists($appConfigPath)) {
         return [];
@@ -33,13 +33,15 @@
     unset($appConfig['dependencies']);
 
     return $appConfig;
-})();
-$localConfig = (function () {
-    $localConfig = __DIR__ . '/config.local.php';
-    return file_exists($localConfig) ? require $localConfig : [];
-})();
+};
+
+$config = (new ConfigAggregator([
+    Config\ConfigProvider::class,
+    new PhpFileProvider('config/config.php'),       // Installer config
+    $shlinkConfigLoader,                            // Overwritten config coming from Shlink
+    new PhpFileProvider('config/config.local.php'), // Local config
+]))->getMergedConfig();
 
-$config = array_reduce([$installerConfig, $appConfig, $localConfig], [ArrayUtils::class, 'merge'], []);
 $container = new ServiceManager($config['dependencies']);
 $container->setService('config', $config);
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,6 +3,6 @@ version: '3'
 services:
   shlink_installer_php:
     container_name: shlink_installer_php
-    image: composer:1.9.3
+    image: composer:1.10.0
     volumes:
       - ./:/app
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,6 +14,10 @@
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">./src</directory>
+
+            <exclude>
+                <file>./src/Util/PathCollection.php</file>
+            </exclude>
         </whitelist>
     </filter>
 </phpunit>
diff --git a/src/Config/ConfigGenerator.php b/src/Config/ConfigGenerator.php
@@ -4,9 +4,9 @@
 
 namespace Shlinkio\Shlink\Installer\Config;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Config\Option\ConfigOptionInterface;
 use Shlinkio\Shlink\Installer\Config\Option\DependentConfigOptionInterface;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 use function array_combine;

diff --git a/src/Config/ConfigGeneratorInterface.php b/src/Config/ConfigGeneratorInterface.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 interface ConfigGeneratorInterface

diff --git a/src/Config/Option/AbstractDriverDependentConfigOption.php b/src/Config/Option/AbstractDriverDependentConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 
 abstract class AbstractDriverDependentConfigOption implements
     ConfigOptionInterface,

diff --git a/src/Config/Option/AbstractWorkerNumConfigOption.php b/src/Config/Option/AbstractWorkerNumConfigOption.php
@@ -5,8 +5,8 @@
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
 use Closure;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Config\Util\ConfigOptionsValidatorsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 use function sprintf;

diff --git a/src/Config/Option/BaseConfigOption.php b/src/Config/Option/BaseConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 
 abstract class BaseConfigOption implements ConfigOptionInterface
 {

diff --git a/src/Config/Option/BasePathConfigOption.php b/src/Config/Option/BasePathConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class BasePathConfigOption extends BaseConfigOption

diff --git a/src/Config/Option/BaseUrlRedirectConfigOption.php b/src/Config/Option/BaseUrlRedirectConfigOption.php
@@ -4,8 +4,8 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Config\Util\ConfigOptionsValidatorsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class BaseUrlRedirectConfigOption extends BaseConfigOption

diff --git a/src/Config/Option/CheckVisitsThresholdConfigOption.php b/src/Config/Option/CheckVisitsThresholdConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class CheckVisitsThresholdConfigOption extends BaseConfigOption

diff --git a/src/Config/Option/ConfigOptionInterface.php b/src/Config/Option/ConfigOptionInterface.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 interface ConfigOptionInterface

diff --git a/src/Config/Option/DatabaseDriverConfigOption.php b/src/Config/Option/DatabaseDriverConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 use function array_keys;

diff --git a/src/Config/Option/DatabaseHostConfigOption.php b/src/Config/Option/DatabaseHostConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class DatabaseHostConfigOption extends AbstractNonSqliteDependentConfigOption

diff --git a/src/Config/Option/DatabaseMySqlOptionsConfigOption.php b/src/Config/Option/DatabaseMySqlOptionsConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class DatabaseMySqlOptionsConfigOption extends AbstractDriverDependentConfigOption

diff --git a/src/Config/Option/DatabaseNameConfigOption.php b/src/Config/Option/DatabaseNameConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class DatabaseNameConfigOption extends AbstractNonSqliteDependentConfigOption

diff --git a/src/Config/Option/DatabasePasswordConfigOption.php b/src/Config/Option/DatabasePasswordConfigOption.php
@@ -4,8 +4,8 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Util\AskUtilsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class DatabasePasswordConfigOption extends AbstractNonSqliteDependentConfigOption

diff --git a/src/Config/Option/DatabasePortConfigOption.php b/src/Config/Option/DatabasePortConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class DatabasePortConfigOption extends AbstractNonSqliteDependentConfigOption

diff --git a/src/Config/Option/DatabaseSqlitePathConfigOption.php b/src/Config/Option/DatabaseSqlitePathConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class DatabaseSqlitePathConfigOption extends AbstractDriverDependentConfigOption

diff --git a/src/Config/Option/DatabaseUserConfigOption.php b/src/Config/Option/DatabaseUserConfigOption.php
@@ -4,8 +4,8 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Util\AskUtilsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class DatabaseUserConfigOption extends AbstractNonSqliteDependentConfigOption

diff --git a/src/Config/Option/DisableTrackParamConfigOption.php b/src/Config/Option/DisableTrackParamConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class DisableTrackParamConfigOption extends BaseConfigOption

diff --git a/src/Config/Option/InvalidShortUrlRedirectConfigOption.php b/src/Config/Option/InvalidShortUrlRedirectConfigOption.php
@@ -4,8 +4,8 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Config\Util\ConfigOptionsValidatorsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class InvalidShortUrlRedirectConfigOption extends BaseConfigOption

diff --git a/src/Config/Option/RedisServersConfigOption.php b/src/Config/Option/RedisServersConfigOption.php
@@ -4,8 +4,8 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Config\Util\ConfigOptionsValidatorsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 use function explode;

diff --git a/src/Config/Option/Regular404RedirectConfigOption.php b/src/Config/Option/Regular404RedirectConfigOption.php
@@ -4,8 +4,8 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Config\Util\ConfigOptionsValidatorsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class Regular404RedirectConfigOption extends BaseConfigOption

diff --git a/src/Config/Option/ShortCodeLengthOption.php b/src/Config/Option/ShortCodeLengthOption.php
@@ -4,8 +4,8 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Config\Util\ConfigOptionsValidatorsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class ShortCodeLengthOption extends BaseConfigOption

diff --git a/src/Config/Option/ShortDomainHostConfigOption.php b/src/Config/Option/ShortDomainHostConfigOption.php
@@ -4,8 +4,8 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Util\AskUtilsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class ShortDomainHostConfigOption extends BaseConfigOption

diff --git a/src/Config/Option/ShortDomainSchemaConfigOption.php b/src/Config/Option/ShortDomainSchemaConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class ShortDomainSchemaConfigOption extends BaseConfigOption

diff --git a/src/Config/Option/ValidateUrlConfigOption.php b/src/Config/Option/ValidateUrlConfigOption.php
@@ -4,7 +4,7 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
-use Shlinkio\Shlink\Installer\Util\PathCollection;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class ValidateUrlConfigOption extends BaseConfigOption

diff --git a/src/Config/Option/VisitsThresholdConfigOption.php b/src/Config/Option/VisitsThresholdConfigOption.php
@@ -4,8 +4,8 @@
 
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Config\Util\ConfigOptionsValidatorsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class VisitsThresholdConfigOption implements ConfigOptionInterface, DependentConfigOptionInterface

diff --git a/src/Config/Option/VisitsWebhooksConfigOption.php b/src/Config/Option/VisitsWebhooksConfigOption.php
@@ -5,8 +5,8 @@
 namespace Shlinkio\Shlink\Installer\Config\Option;
 
 use Closure;
+use Shlinkio\Shlink\Config\Collection\PathCollection;
 use Shlinkio\Shlink\Installer\Config\Util\ConfigOptionsValidatorsTrait;
-use Shlinkio\Shlink\Installer\Util\PathCollection;
 use Symfony\Component\Console\Style\StyleInterface;
 
 class VisitsWebhooksConfigOption implements ConfigOptionInterface