From 6b131a3985c89bc0c7274f0f7ebd0be0c8d8cfa4 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 5 Sep 2023 05:15:14 +0000 Subject: [PATCH] Model class moved to factory --- src/{Model => Content/Conversation/Factory}/Channel.php | 2 +- src/Module/Conversation/Channel.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/{Model => Content/Conversation/Factory}/Channel.php (97%) diff --git a/src/Model/Channel.php b/src/Content/Conversation/Factory/Channel.php similarity index 97% rename from src/Model/Channel.php rename to src/Content/Conversation/Factory/Channel.php index d6d4eaa55c..f95971d647 100644 --- a/src/Model/Channel.php +++ b/src/Content/Conversation/Factory/Channel.php @@ -19,7 +19,7 @@ * */ - namespace Friendica\Model; + namespace Friendica\Content\Conversation\Factory; use Friendica\Model\User; use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php index 3b85f7fb94..41eff2999c 100644 --- a/src/Module/Conversation/Channel.php +++ b/src/Module/Conversation/Channel.php @@ -27,6 +27,7 @@ use Friendica\BaseModule; use Friendica\Content\BoundariesPager; use Friendica\Content\Conversation; use Friendica\Content\Conversation\Entity\Channel as ChannelEntity; +use Friendica\Content\Conversation\Factory\Channel as ChannelFactory; use Friendica\Content\Feature; use Friendica\Content\Nav; use Friendica\Content\Text\HTML; @@ -46,7 +47,6 @@ use Friendica\Module\Security\Login; use Friendica\Network\HTTPException; use Friendica\Core\Session\Model\UserSession; use Friendica\Database\Database; -use Friendica\Model\Channel as ChannelModel; use Friendica\Model\Item; use Friendica\Module\Response; use Friendica\Navigation\SystemMessages; @@ -81,11 +81,11 @@ class Channel extends BaseModule protected $pConfig; /** @var Database */ protected $database; - /** @var ChannelModel */ + /** @var ChannelFactory */ protected $channel; - public function __construct(ChannelModel $channel, SystemMessages $systemMessages, Database $database, IManagePersonalConfigValues $pConfig, Mode $mode, Conversation $conversation, App\Page $page, IManageConfigValues $config, ICanCache $cache, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) + public function __construct(ChannelFactory $channel, SystemMessages $systemMessages, Database $database, IManagePersonalConfigValues $pConfig, Mode $mode, Conversation $conversation, App\Page $page, IManageConfigValues $config, ICanCache $cache, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = []) { parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); -- 2.39.5