bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Refactor dynamic App::getMode() to static DI::mode()

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

7
bin/daemon.php
View file

@ -12,6 +12,7 @@ use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Psr\Log\LoggerInterface;
// Get options
@ -36,10 +37,10 @@ require dirname(__DIR__) . '/vendor/autoload.php';
$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]);
\Friendica\DI::init($dice);
$a = \Friendica\DI::app();
DI::init($dice);
$a = DI::app();
if ($a->getMode()->isInstall()) {
if (DI::mode()->isInstall()) {
die("Friendica isn't properly installed yet.\n");
}

9
bin/worker.php
View file

@ -10,6 +10,7 @@ use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\Update;
use Friendica\Core\Worker;
use Friendica\DI;
use Psr\Log\LoggerInterface;
// Get options
@ -34,14 +35,14 @@ require dirname(__DIR__) . '/vendor/autoload.php';
$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['worker']]);
\Friendica\DI::init($dice);
$a = Friendica\DI::app();
DI::init($dice);
$a = DI::app();
// Check the database structure and possibly fixes it
Update::check($a->getBasePath(), true, $a->getMode());
Update::check($a->getBasePath(), true, DI::mode());
// Quit when in maintenance
if (!$a->getMode()->has(App\Mode::MAINTENANCEDISABLED)) {
if (!DI::mode()->has(App\Mode::MAINTENANCEDISABLED)) {
return;
}

10
src/App.php
View file

@ -155,16 +155,6 @@ class App
return $this->config->getCache()->get('system', 'basepath');
}
/**
* Returns the Mode of the Application
*
* @return App\Mode The Application Mode
*/
public function getMode()
{
return $this->mode;
}
/**
* Returns the Database of the Application
*

4
src/Core/Worker.php
View file

@ -1086,7 +1086,7 @@ class Worker
$args = ['no_cron' => !$do_cron];
$a = get_app();
$process = new Core\Process(DI::logger(), $a->getMode(), DI::config(), $a->getBasePath());
$process = new Core\Process(DI::logger(), DI::mode(), DI::config(), $a->getBasePath());
$process->run($command, $args);
// after spawning we have to remove the flag.
@ -1129,7 +1129,7 @@ class Worker
$priority = PRIORITY_MEDIUM;
// Don't fork from frontend tasks by default
$dont_fork = Config::get("system", "worker_dont_fork", false) || !\get_app()->getMode()->isBackend();
$dont_fork = Config::get("system", "worker_dont_fork", false) || !DI::mode()->isBackend();
$created = DateTimeFormat::utcNow();
$force_priority = false;

2
src/Module/Admin/Summary.php
View file

@ -111,7 +111,7 @@ class Summary extends BaseAdminModule
}
// check legacy basepath settings
$configLoader = new ConfigFileLoader($a->getBasePath(), $a->getMode());
$configLoader = new ConfigFileLoader($a->getBasePath());
$configCache = new Config\Cache\ConfigCache();
$configLoader->setupCache($configCache);
$confBasepath = $configCache->get('system', 'basepath');

2
src/Module/Install.php
View file

@ -51,7 +51,7 @@ class Install extends BaseModule
{
$a = DI::app();
if (!$a->getMode()->isInstall()) {
if (!DI::mode()->isInstall()) {
throw new HTTPException\ForbiddenException();
}