strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Convert class calls into DI calls

Browse source
This commit is contained in:
Michael 2022-05-19 09:08:04 +00:00
parent 5aa798b1dc
commit 49c47008d1
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/Post/UserNotification.php
View file

@ -308,7 +308,7 @@ class UserNotification
return; return;
} }
$notification = (new Notifications\Factory\Notification(DI::baseUrl(), DI::l10n(), DI::localRelationship(), DI::logger()))->createForUser( $notification = DI::notificationFactory()->createForUser(
$uid, $uid,
$item['vid'], $item['vid'],
$type, $type,
@ -336,7 +336,7 @@ class UserNotification
*/ */
public static function insertNotification(int $actor, string $verb, int $uid): bool public static function insertNotification(int $actor, string $verb, int $uid): bool
{ {
$notification = (new Notifications\Factory\Notification(DI::baseUrl(), DI::l10n(), DI::localRelationship(), DI::logger()))->createForRelationship( $notification = DI::notificationFactory()->createForRelationship(
$uid, $uid,
$actor, $actor,
$verb $verb

6
src/Navigation/Notifications/Factory/Notification.php
View file

@ -30,8 +30,6 @@ use Friendica\Content\Text\Plaintext;
use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\Enum\Duration;
use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Cache\Capability\ICanCache;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Verb; use Friendica\Model\Verb;
@ -51,14 +49,14 @@ class Notification extends BaseFactory implements ICanCreateFromTableRow
/** @var ICanCache */ /** @var ICanCache */
private $cache; private $cache;
public function __construct(\Friendica\App\BaseURL $baseUrl, \Friendica\Core\L10n $l10n, \Friendica\Contact\LocalRelationship\Repository\LocalRelationship $localRelationshipRepo, LoggerInterface $logger) public function __construct(\Friendica\App\BaseURL $baseUrl, \Friendica\Core\L10n $l10n, \Friendica\Contact\LocalRelationship\Repository\LocalRelationship $localRelationshipRepo, LoggerInterface $logger, ICanCache $cache)
{ {
parent::__construct($logger); parent::__construct($logger);
$this->baseUrl = $baseUrl; $this->baseUrl = $baseUrl;
$this->l10n = $l10n; $this->l10n = $l10n;
$this->localRelationshipRepo = $localRelationshipRepo; $this->localRelationshipRepo = $localRelationshipRepo;
$this->cache = DI::cache(); // @todo Add the correct mechanism for class construction here $this->cache = $cache;
} }
public function createFromTableRow(array $row): Entity\Notification public function createFromTableRow(array $row): Entity\Notification