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] 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;