Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-20 07:04:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Moving from DBA to Database

Browse source
This commit is contained in:
Philipp Holzer 2019-06-07 00:10:45 +02:00
parent 5e4ace271b
commit 082634adbc
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
11 changed files with 1778 additions and 1211 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Factory/DependencyFactory.php
View file

@ -3,7 +3,6 @@
namespace Friendica\Factory;
use Friendica\App;
use Friendica\Database\DBA;
use Friendica\Factory;
use Friendica\Util\BasePath;
use Friendica\Util\BaseURL;
@ -30,15 +29,14 @@ class DependencyFactory
$configLoader = new Config\ConfigFileLoader($basePath, $mode);
$configCache = Factory\ConfigFactory::createCache($configLoader);
$profiler = Factory\ProfilerFactory::create($configCache);
Factory\DBFactory::init($configCache, $profiler, $_SERVER);
$database = Factory\DBFactory::init($configCache, $profiler, $_SERVER);
$config = Factory\ConfigFactory::createConfig($configCache);
// needed to call PConfig::init()
Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create($channel, $config, $profiler);
DBA::setLogger($logger);
$logger = Factory\LoggerFactory::create($channel, $database, $config, $profiler);
Factory\LoggerFactory::createDev($channel, $config, $profiler);
$baseURL = new BaseURL($config, $_SERVER);
return new App($config, $mode, $router, $baseURL, $logger, $profiler, $isBackend);
return new App($database, $config, $mode, $router, $baseURL, $logger, $profiler, $isBackend);
}
}