mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #14566 from MrPetovan/bug/phpstan-follow-up 

Differentiate both UserGServer types used in Content/Conversation
pull/14567/head
Michael Vogel 2024-11-20 22:43:38 +01:00 zatwierdzone przez GitHub
rodzic 17dba36e77 0e5b79f1dd
commit 9e2b192054
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
1 zmienionych plików z 5 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
src/Content/Conversation.php
Wyświetl plik

@ -34,7 +34,8 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Object\Post as PostObject;
use Friendica\Object\Thread;
use Friendica\Protocol\Activity;
use Friendica\User\Settings\Repository\UserGServer;
use Friendica\User\Settings\Entity\UserGServer as UserGServerEntity;
use Friendica\User\Settings\Repository\UserGServer as UserGServerRepository;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Profiler;
@ -81,10 +82,10 @@ class Conversation
private $mode;
/** @var IHandleUserSessions */
private $session;
/** @var UserGServer */
/** @var UserGServerRepository */
private $userGServer;
public function __construct(UserGServer $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, Mode $mode, AppHelper $appHelper, IHandleUserSessions $session)
public function __construct(UserGServerRepository $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, Mode $mode, AppHelper $appHelper, IHandleUserSessions $session)
{
$this->activity = $activity;
$this->item = $item;
@ -455,7 +456,7 @@ class Conversation
$userGservers = $this->userGServer->listIgnoredByUser($this->session->getLocalUserId());
$ignoredGsids = array_map(function (UserGServer $userGServer) {
$ignoredGsids = array_map(function (UserGServerEntity $userGServer) {
return $userGServer->gsid;
}, $userGservers->getArrayCopy());