tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Refactor dynamic App::getDBA() to static DI::dba()

Browse source
This commit is contained in:
Philipp Holzer 2019-12-15 23:52:47 +01:00
parent 9cec293ccc
commit cc9b7bb14f
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/App.php
View file

@ -155,16 +155,6 @@ class App
return $this->config->getCache()->get('system', 'basepath'); return $this->config->getCache()->get('system', 'basepath');
} }
/**
* Returns the Database of the Application
*
* @return Database
*/
public function getDBA()
{
return $this->database;
}
/** /**
* @deprecated 2019.09 - use Page->registerStylesheet instead * @deprecated 2019.09 - use Page->registerStylesheet instead
* @see Page::registerStylesheet() * @see Page::registerStylesheet()

4
src/Module/Install.php
View file

@ -111,7 +111,7 @@ class Install extends BaseModule
self::checkSetting($configCache, $_POST, 'database', 'database', ''); self::checkSetting($configCache, $_POST, 'database', 'database', '');
// If we cannot connect to the database, return to the previous step // If we cannot connect to the database, return to the previous step
if (!self::$installer->checkDB($a->getDBA())) { if (!self::$installer->checkDB(DI::dba())) {
self::$currentWizardStep = self::DATABASE_CONFIG; self::$currentWizardStep = self::DATABASE_CONFIG;
} }
@ -135,7 +135,7 @@ class Install extends BaseModule
self::checkSetting($configCache, $_POST, 'config', 'admin_email', ''); self::checkSetting($configCache, $_POST, 'config', 'admin_email', '');
// If we cannot connect to the database, return to the Database config wizard // If we cannot connect to the database, return to the Database config wizard
if (!self::$installer->checkDB($a->getDBA())) { if (!self::$installer->checkDB(DI::dba())) {
self::$currentWizardStep = self::DATABASE_CONFIG; self::$currentWizardStep = self::DATABASE_CONFIG;
return; return;
} }