From 9bea86f8f5a4e98f85878878999e3ae39e1f7cec Mon Sep 17 00:00:00 2001
From: Sergio Brighenti <sergio@brighenti.me>
Date: Sun, 12 Apr 2020 19:51:27 +0200
Subject: [PATCH] Installer improvements Updated sponsor list

---
 app/helpers.php   |  2 +-
 composer.lock     |  2 +-
 docs/sponsor.md   |  4 +++-
 install/index.php | 44 +++++++++++++++++++++-----------------------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 99388f1..70a2c8a 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -58,7 +58,7 @@ if (!function_exists('isDisplayableImage')) {
      *
      * @return bool
      */
-    function isDisplayableImage(string $mime): bool
+    function isDisplayableImage(?string $mime): bool
     {
         return in_array($mime, [
             'image/apng',
diff --git a/composer.lock b/composer.lock
index 7bd6365..13401b7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b24e9c18191beba54a5cc9a5130d191b",
+    "content-hash": "6f92268190e2189e19ce34681370d6f3",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
diff --git a/docs/sponsor.md b/docs/sponsor.md
index b499080..060e6bc 100644
--- a/docs/sponsor.md
+++ b/docs/sponsor.md
@@ -17,4 +17,6 @@ All those who make the recurring donations, the names or logos will be inserted
 [PayPal for XBackBone](http://bit.ly/XBackBonePaypal) |
 {: .text-center}
 
-## Sponsors
\ No newline at end of file
+## Sponsors
+
++ [@philw95](https://github.com/philw95)
\ No newline at end of file
diff --git a/install/index.php b/install/index.php
index 6b324ac..f25cb28 100644
--- a/install/index.php
+++ b/install/index.php
@@ -3,7 +3,6 @@
 (PHP_MAJOR_VERSION >= 7 && PHP_MINOR_VERSION >= 1) ?: die('Sorry, PHP 7.1 or above is required to run XBackBone.');
 require __DIR__.'/../vendor/autoload.php';
 
-use App\Database\DB;
 use App\Database\Migrator;
 use App\Factories\ViewFactory;
 use App\Web\Session;
@@ -14,7 +13,6 @@ use function DI\factory;
 use function DI\get;
 use function DI\value;
 use League\Flysystem\FileExistsException;
-use League\Flysystem\Filesystem;
 use Psr\Container\ContainerInterface as Container;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -38,8 +36,23 @@ $config = [
     ],
 ];
 
+$installed = false;
 if (file_exists(__DIR__.'/../config.php')) {
+    $installed = true;
     $config = array_replace_recursive($config, require __DIR__.'/../config.php');
+
+    if (isset($config['storage_dir'])) { // if from older installations with no support of other than local driver
+        $config['storage']['driver'] = 'local';
+        $config['storage']['path'] = $config['storage_dir'];
+        unset($config['storage_dir']);
+    }
+
+    if ($config['storage']['driver'] === 'local' && !is_dir($config['storage']['path'])) { // if installed with local driver, and the storage dir don't exists
+        $realPath = realpath(BASE_DIR.$config['storage']['path']);
+        if (is_dir($realPath) && is_writable($realPath)) { // and was a path relative to the upper folder
+            $config['storage']['path'] = $realPath; // update the config
+        }
+    }
 }
 
 $builder = new ContainerBuilder();
@@ -101,14 +114,12 @@ $app->get('/', function (Response $response, View $view, Session $session) {
     ]);
 })->setName('install');
 
-$app->post('/', function (Request $request, Response $response, Filesystem $storage, Session $session, DB $db) use (&$config) {
+$app->post('/', function (Request $request, Response $response, \DI\Container $container, Session $session) use (&$config, &$installed) {
     // disable debug in production
     unset($config['debug']);
 
     // Check if there is a previous installation, if not, setup the config file
-    if (!file_exists(__DIR__.'/../config.php')) {
-        $installed = false;
-
+    if (!$installed) {
         // config file setup
         $config['base_url'] = param($request, 'base_url');
         $config['storage']['driver'] = param($request, 'storage_driver');
@@ -153,26 +164,12 @@ $app->post('/', function (Request $request, Response $response, Filesystem $stor
                 $config['storage']['path'] = param($request, 'storage_path');
                 break;
         }
-    } else {
-        $installed = true;
-        if (isset($config['storage_dir'])) { // if from older installations with no support of other than local driver
-            $config['storage']['driver'] = 'local';
-            $config['storage']['path'] = $config['storage_dir'];
-            unset($config['storage_dir']);
-        }
-
-        if ($config['storage']['driver'] === 'local' && !is_dir($config['storage']['path'])) { // if installed with local driver, and the storage dir don't exists
-            $realPath = realpath(BASE_DIR.$config['storage']['path']);
-            if (is_dir($realPath) && is_writable($realPath)) { // and was a path relative to the upper folder
-                $config['storage']['path'] = $realPath; // update the config
-                $storage->getAdapter()->setPathPrefix($realPath); // update the prefix
-            }
-        }
+        $container->set('config', value($config));
     }
 
+    $storage = $container->get('storage');
     // check if the storage is valid
     $storageTestFile = 'storage_test.xbackbone.txt';
-
     try {
         try {
             $success = $storage->write($storageTestFile, 'XBACKBONE_TEST_FILE');
@@ -190,7 +187,8 @@ $app->post('/', function (Request $request, Response $response, Filesystem $stor
         return redirect($response, urlFor('/install'));
     }
 
-    // Build the dns string and run the migrations
+    // Get the db instance and run migrations
+    $db = $container->get('database');
     try {
         $migrator = new Migrator($db, __DIR__.'/../resources/schemas');
         $migrator->migrate();