Reformat code

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

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index cf5dd9ffc2e5db713e03cec05ef7c5241e7934b9..b6090bddb60f667e2be9919036aad4d5eb455226 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -6,10 +6,12 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
+use Friendica\Core\Config\Cache\IConfigCache;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
 use Friendica\Util\Network;
+use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
 
 /**
@@ -168,12 +170,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;
@@ -224,8 +228,6 @@ class Installer
         */
        public function checkPHP($phppath = null, $required = false)
        {
-               $passed = false;
-               $passed2 = false;
                $passed3 = false;
 
                if (!isset($phppath)) {
@@ -356,6 +358,7 @@ class Installer
         * - mb_string
         * - XML
         * - iconv
+        * - fileinfo
         * - POSIX
         *
         * @return bool false if something required failed
@@ -394,7 +397,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;
@@ -451,6 +454,13 @@ class Installer
                );
                $returnVal = $returnVal ? $status : false;
 
+               $status = $this->checkFunction('finfo_open',
+                       L10n::t('File Information PHP module'),
+                       L10n::t('Error: File Information PHP module required but not installed.'),
+                       true
+               );
+               $returnVal = $returnVal ? $status : false;
+
                return $returnVal;
        }
 
@@ -581,17 +591,20 @@ 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 string       $basePath    The basepath of this call
+        * @param IConfigCache $configCache The configuration cache
+        * @param Profiler    $profiler    The profiler of this app
+        * @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($basePath, IConfigCache $configCache, Profiler $profiler, $dbhost, $dbuser, $dbpass, $dbdata)
        {
-               if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
+               if (!DBA::connect($basePath, $configCache, $profiler, $dbhost, $dbuser, $dbpass, $dbdata)) {
                        $this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
 
                        return false;