Fixing installer

diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php
index 401d9c292c87cc758712c7e43a91932b9deb6154..d594b2605e19375d25c8a1b577fcdfaff03782bc 100644 (file)
--- a/src/Console/AutomaticInstallation.php
+++ b/src/Console/AutomaticInstallation.php
@@ -79,7 +79,8 @@ HELP;
                $installer = new Installer();
 
                $configCache = $a->getConfigCache();
-               $installer->setUpCache($configCache, BasePath::create($a->getBasePath(), $_SERVER));
+               $basepath = new BasePath($a->getBasePath());
+               $installer->setUpCache($configCache, $basepath->getPath());
 
                $this->out(" Complete!\n\n");
 

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index de041773ef6b88b7525b7a35cad64ce043e9e798..8163d546adeb62ed1934617bf9eeaadc2b0a9128 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -7,8 +7,8 @@ namespace Friendica\Core;
 use DOMDocument;
 use Exception;
 use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
-use Friendica\Factory\DBFactory;
 use Friendica\Object\Image;
 use Friendica\Util\Logger\VoidLogger;
 use Friendica\Util\Network;
@@ -600,7 +600,7 @@ class Installer
         */
        public function checkDB(ConfigCache $configCache, Profiler $profiler)
        {
-               $database = DBFactory::init($configCache, $profiler, [], new VoidLogger());
+               $database = new Database($configCache, $profiler, new VoidLogger());
 
                if ($database->connected()) {
                        if (DBStructure::existsTable('user')) {

diff --git a/src/Database/Database.php b/src/Database/Database.php
index cdd5a357ab1cb1c697318596712159bc3833cc7f..495e7d93d5b185252aab1b0ca9f286184ca6b7dd 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -46,7 +46,7 @@ class Database
        private $in_retrial     = false;
        private $relation       = [];
 
-       public function __construct(ConfigCache $configCache, Profiler $profiler, LoggerInterface $logger, array $server)
+       public function __construct(ConfigCache $configCache, Profiler $profiler, LoggerInterface $logger, array $server = [])
        {
                // We are storing these values for being able to perform a reconnect
                $this->configCache   = $configCache;

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 54c6141cc725fcda67362dabab8284aa674ee5ba..a7427ead0dbb226de0b1d0c851a5684ecfcde127 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -67,7 +67,8 @@ class Install extends BaseModule
 
                // get basic installation information and save them to the config cache
                $configCache = $a->getConfigCache();
-               self::$installer->setUpCache($configCache, BasePath::create($a->getBasePath(), $_SERVER));
+               $basePath = new BasePath($a->getBasePath());
+               self::$installer->setUpCache($configCache, $basePath->getPath());
 
                // We overwrite current theme css, because during install we may not have a working mod_rewrite
                // so we may not have a css at all. Here we set a static css file for the install procedure pages

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 4dffc568781fff6bbc4354044b04ec439672b355..5f9d3bf72cdc05b835e18443463f01c5bc49a296 100644 (file)
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -9,8 +9,6 @@ use Friendica\App\Mode;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Database\Database;
 use Friendica\Factory\ConfigFactory;
-use Friendica\Factory\DBFactory;
-use Friendica\Factory\ProfilerFactory;
 use Friendica\Util\BasePath;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Profiler;