mirror of
https://git.sekbaer.de/Friendica/friendica.git
synced 2025-06-11 17:44:27 +02:00
Introduce new DI container
- Adding Friendica\DI class for getting dynamic classes - Replacing BaseObject::getApp() with this class
This commit is contained in:
parent
a9220aa83b
commit
1de3f186d7
132 changed files with 377 additions and 270 deletions
|
@ -12,6 +12,7 @@ use Friendica\Core\Logger;
|
|||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
|
||||
|
@ -19,7 +20,7 @@ class Cron
|
|||
{
|
||||
public static function execute()
|
||||
{
|
||||
$a = BaseObject::getApp();
|
||||
$a = DI::app();
|
||||
|
||||
$last = Config::get('system', 'last_cron');
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@ use Friendica\Core\StorageManager;
|
|||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Database\PostUpdate;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\GContact;
|
||||
use Friendica\Model\GServer;
|
||||
|
@ -29,7 +30,7 @@ class CronJobs
|
|||
{
|
||||
public static function execute($command = '')
|
||||
{
|
||||
$a = BaseObject::getApp();
|
||||
$a = DI::app();
|
||||
|
||||
// No parameter set? So return
|
||||
if ($command == '') {
|
||||
|
|
|
@ -8,6 +8,7 @@ namespace Friendica\Worker;
|
|||
use Friendica\BaseObject;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\Update;
|
||||
use Friendica\DI;
|
||||
|
||||
class DBUpdate extends BaseObject
|
||||
{
|
||||
|
@ -15,7 +16,7 @@ class DBUpdate extends BaseObject
|
|||
{
|
||||
// Just in case the last update wasn't failed
|
||||
if (Config::get('system', 'update', Update::SUCCESS, true) != Update::FAILED) {
|
||||
Update::run(self::getApp()->getBasePath());
|
||||
Update::run(DI::app()->getBasePath());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,6 +11,7 @@ use Friendica\Core\Logger;
|
|||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model;
|
||||
use Friendica\Protocol\DFRN;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
|
@ -140,7 +141,7 @@ class Delivery extends BaseObject
|
|||
// if $parent['wall'] == 1 we will already have the parent message in our array
|
||||
// and we will relay the whole lot.
|
||||
|
||||
$localhost = self::getApp()->getHostName();
|
||||
$localhost = DI::app()->getHostName();
|
||||
if (strpos($localhost, ':')) {
|
||||
$localhost = substr($localhost, 0, strpos($localhost, ':'));
|
||||
}
|
||||
|
@ -548,7 +549,7 @@ class Delivery extends BaseObject
|
|||
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n";
|
||||
}
|
||||
} else {
|
||||
$headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . self::getApp()->getHostName() . '>' . "\n";
|
||||
$headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . DI::app()->getHostName() . '>' . "\n";
|
||||
}
|
||||
|
||||
$headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";
|
||||
|
|
|
@ -12,13 +12,14 @@ use Friendica\Core\Hook;
|
|||
use Friendica\Core\Logger;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\Item;
|
||||
|
||||
class Expire
|
||||
{
|
||||
public static function execute($param = '', $hook_function = '')
|
||||
{
|
||||
$a = BaseObject::getApp();
|
||||
$a = DI::app();
|
||||
|
||||
Hook::loadHooks();
|
||||
|
||||
|
|
|
@ -6,12 +6,13 @@
|
|||
namespace Friendica\Worker;
|
||||
|
||||
use Friendica\Core\Hook;
|
||||
use Friendica\DI;
|
||||
|
||||
Class ForkHook
|
||||
{
|
||||
public static function execute($name, $hook, $data)
|
||||
{
|
||||
$a = \Friendica\BaseObject::getApp();
|
||||
$a = DI::app();
|
||||
|
||||
Hook::callSingle($a, $name, $hook, $data);
|
||||
}
|
||||
|
|
|
@ -11,6 +11,7 @@ use Friendica\Core\Logger;
|
|||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\APContact;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Conversation;
|
||||
|
@ -41,7 +42,7 @@ class Notifier
|
|||
{
|
||||
public static function execute($cmd, $target_id)
|
||||
{
|
||||
$a = BaseObject::getApp();
|
||||
$a = DI::app();
|
||||
|
||||
Logger::info('Invoked', ['cmd' => $cmd, 'target' => $target_id]);
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ namespace Friendica\Worker;
|
|||
use Friendica\BaseObject;
|
||||
use Friendica\Core\Logger;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\DI;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
use Friendica\Protocol\ActivityPub;
|
||||
|
||||
|
@ -18,7 +19,7 @@ class ProfileUpdate {
|
|||
return;
|
||||
}
|
||||
|
||||
$a = BaseObject::getApp();
|
||||
$a = DI::app();
|
||||
|
||||
$inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser($uid);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue