Avoid memory issue in exception

[friendica.git] / src / Core / Installer.php

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 6ea3d553cf8a1bf6a96e415edef41273d4aed332..4a287a885f50e9d5e47988de099608fe567f4e74 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -6,7 +6,7 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
-use Friendica\Core\Renderer;
+use Friendica\Core\Config\ConfigCache;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
@@ -169,12 +169,14 @@ class Installer
        /***
         * Installs the DB-Scheme for Friendica
         *
+        * @param string $basePath The base path of this application
+        *
         * @return bool true if the installation was successful, otherwise false
         * @throws Exception
         */
-       public function installDatabase()
+       public function installDatabase($basePath)
        {
-               $result = DBStructure::update(false, true, true);
+               $result = DBStructure::update($basePath, false, true, true);
 
                if ($result) {
                        $txt = L10n::t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
@@ -225,8 +227,6 @@ class Installer
         */
        public function checkPHP($phppath = null, $required = false)
        {
-               $passed = false;
-               $passed2 = false;
                $passed3 = false;
 
                if (!isset($phppath)) {
@@ -395,7 +395,7 @@ class Installer
                $help = '';
                $status = true;
                try {
-                       $xml = new DOMDocument();
+                       new DOMDocument();
                } catch (Exception $e) {
                        $help = L10n::t('Error, XML PHP module required but not installed.');
                        $status = false;
@@ -582,17 +582,18 @@ class Installer
        /**
         * Checking the Database connection and if it is available for the current installation
         *
-        * @param string $dbhost Hostname/IP of the Friendica Database
-        * @param string $dbuser Username of the Database connection credentials
-        * @param string $dbpass Password of the Database connection credentials
-        * @param string $dbdata Name of the Database
+        * @param ConfigCache $configCache The configuration cache
+        * @param string $dbhost           Hostname/IP of the Friendica Database
+        * @param string $dbuser           Username of the Database connection credentials
+        * @param string $dbpass           Password of the Database connection credentials
+        * @param string $dbdata           Name of the Database
         *
         * @return bool true if the check was successful, otherwise false
         * @throws Exception
         */
-       public function checkDB($dbhost, $dbuser, $dbpass, $dbdata)
+       public function checkDB(ConfigCache $configCache, $dbhost, $dbuser, $dbpass, $dbdata)
        {
-               if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
+               if (!DBA::connect($configCache, $dbhost, $dbuser, $dbpass, $dbdata)) {
                        $this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
 
                        return false;