X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=8bdb00f0459131c222cc63804618a8f29285a9c2;hb=0dbce6e58ba6494daf1ad30812cdffd5a779eda4;hp=d0beedc092e9a3fce43b40d3b5f8a5e38e6af9e7;hpb=9d45118356b0a72172661ae373845e403b4ed9dc;p=friendica.git diff --git a/src/Core/Installer.php b/src/Core/Installer.php index d0beedc092..8bdb00f045 100644 --- a/src/Core/Installer.php +++ b/src/Core/Installer.php @@ -7,11 +7,10 @@ namespace Friendica\Core; use DOMDocument; use Exception; use Friendica\Core\Config\Cache\ConfigCache; -use Friendica\Database\DBA; +use Friendica\Database\Database; use Friendica\Database\DBStructure; -use Friendica\Object\Image; +use Friendica\Util\Images; use Friendica\Util\Network; -use Friendica\Util\Profiler; use Friendica\Util\Strings; /** @@ -570,7 +569,7 @@ class Installer if (class_exists('Imagick')) { $imagick = true; - $supported = Image::supportedTypes(); + $supported = Images::supportedTypes(); if (array_key_exists('image/gif', $supported)) { $gif = true; } @@ -591,17 +590,16 @@ class Installer /** * Checking the Database connection and if it is available for the current installation * - * @param ConfigCache $configCache The configuration cache - * @param Profiler $profiler The profiler of this app + * @param Database $dba * * @return bool true if the check was successful, otherwise false * @throws Exception */ - public function checkDB(ConfigCache $configCache, Profiler $profiler) + public function checkDB(Database $dba) { - DBA::reconnect(); + $dba->reconnect(); - if (DBA::connected()) { + if ($dba->isConnected()) { if (DBStructure::existsTable('user')) { $this->addCheck(L10n::t('Database already in use.'), false, true, '');