Changed class names

diff --git a/src/Content/Conversation/Repository/Channel.php b/src/Content/Conversation/Repository/Channel.php
index 7c4fe1dcd4be0d176cb3d9108dc3d801a8b96749..c067c5d7a9a4ab2c725717f4c3b1803f9cdf5462 100644 (file)
--- a/src/Content/Conversation/Repository/Channel.php
+++ b/src/Content/Conversation/Repository/Channel.php
@@ -22,7 +22,7 @@
 namespace Friendica\Content\Conversation\Repository;
 
 use Friendica\BaseCollection;
-use Friendica\Content\Conversation\Entity\Timeline as EntityTimeline;
+use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity;
 use Friendica\Content\Conversation\Factory\Timeline;
 use Friendica\Database\Database;
 use Psr\Log\LoggerInterface;
@@ -41,10 +41,10 @@ class Channel extends \Friendica\BaseRepository
         *
         * @param int $id
         * @param int $uid
-        * @return EntityTimeline
+        * @return TimelineEntity
         * @throws \Friendica\Network\HTTPException\NotFoundException
         */
-       public function selectById(int $id, int $uid): EntityTimeline
+       public function selectById(int $id, int $uid): TimelineEntity
        {
                return $this->_selectOne(['id' => $id, 'uid' => $uid]);
        }
@@ -72,7 +72,7 @@ class Channel extends \Friendica\BaseRepository
                return $this->_select(['uid' => $uid]);
        }
 
-       public function save(EntityTimeline $Channel): EntityTimeline
+       public function save(TimelineEntity $Channel): TimelineEntity
        {
                $fields = [
                        'label'            => $Channel->label,

diff --git a/src/Module/Conversation/Channel.php b/src/Module/Conversation/Channel.php
index 9bb3a42333a664f4aca65fad382a2a49e7c287a1..3affa1a156f3feea1b8f4b36a266284af5e8d939 100644 (file)
--- a/src/Module/Conversation/Channel.php
+++ b/src/Module/Conversation/Channel.php
@@ -27,7 +27,7 @@ use Friendica\Content\BoundariesPager;
 use Friendica\Content\Conversation;
 use Friendica\Content\Conversation\Entity\Timeline as TimelineEntity;
 use Friendica\Content\Conversation\Factory\Timeline as TimelineFactory;
-use Friendica\Content\Conversation\Repository\Channel as RepositoryChannel;
+use Friendica\Content\Conversation\Repository\Channel as ChannelRepository;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\HTML;
@@ -58,7 +58,7 @@ class Channel extends Timeline
        /** @var SystemMessages */
        protected $systemMessages;
 
-       public function __construct(RepositoryChannel $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(ChannelRepository $channel, TimelineFactory $timeline, Conversation $conversation, App\Page $page, SystemMessages $systemMessages, Mode $mode, IHandleUserSessions $session, Database $database, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, ICanCache $cache, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($channel, $mode, $session, $database, $pConfig, $config, $cache, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);