From 3a1ccc4c87450e02c968dde81a7932f5fce2d1ce Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Wed, 16 Jan 2019 12:00:59 -0100 Subject: [PATCH] fixing var name Signed-off-by: Maxence Lange --- lib/Command/CacheRefresh.php | 12 ++++++------ lib/Command/NoteCreate.php | 8 ++++---- lib/Controller/LocalController.php | 4 ++-- lib/Service/ActivityService.php | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/Command/CacheRefresh.php b/lib/Command/CacheRefresh.php index c90355a3..1ea3f9fa 100644 --- a/lib/Command/CacheRefresh.php +++ b/lib/Command/CacheRefresh.php @@ -46,7 +46,7 @@ class CacheRefresh extends Base { /** @var AccountService */ - private $actorService; + private $accountService; /** @var CacheActorService */ private $cacheActorService; @@ -64,19 +64,19 @@ class CacheRefresh extends Base { /** * CacheUpdate constructor. * - * @param AccountService $actorService + * @param AccountService $accountService * @param CacheActorService $cacheActorService * @param DocumentService $documentService * @param ConfigService $configService * @param MiscService $miscService */ public function __construct( - AccountService $actorService, CacheActorService $cacheActorService, + AccountService $accountService, CacheActorService $cacheActorService, DocumentService $documentService, ConfigService $configService, MiscService $miscService ) { parent::__construct(); - $this->actorService = $actorService; + $this->accountService = $accountService; $this->cacheActorService = $cacheActorService; $this->documentService = $documentService; $this->configService = $configService; @@ -102,10 +102,10 @@ class CacheRefresh extends Base { */ protected function execute(InputInterface $input, OutputInterface $output) { - $result = $this->actorService->blindKeyRotation(); + $result = $this->accountService->blindKeyRotation(); $output->writeLn($result . ' key pairs refreshed'); - $result = $this->actorService->manageCacheLocalActors(); + $result = $this->accountService->manageCacheLocalActors(); $output->writeLn($result . ' local accounts regenerated'); $result = $this->cacheActorService->missingCacheRemoteActors(); diff --git a/lib/Command/NoteCreate.php b/lib/Command/NoteCreate.php index 14216ea8..5b12d52b 100644 --- a/lib/Command/NoteCreate.php +++ b/lib/Command/NoteCreate.php @@ -54,7 +54,7 @@ class NoteCreate extends Base { private $activityService; /** @var AccountService */ - private $actorService; + private $accountService; /** @var PostService */ private $postService; @@ -70,21 +70,21 @@ class NoteCreate extends Base { * NoteCreate constructor. * * @param ActivityService $activityService - * @param AccountService $actorService + * @param AccountService $accountService * @param PostService $postService * @param CurlService $curlService * @param ConfigService $configService * @param MiscService $miscService */ public function __construct( - ActivityService $activityService, AccountService $actorService, + ActivityService $activityService, AccountService $accountService, PostService $postService, CurlService $curlService, ConfigService $configService, MiscService $miscService ) { parent::__construct(); $this->activityService = $activityService; - $this->actorService = $actorService; + $this->accountService = $accountService; $this->postService = $postService; $this->curlService = $curlService; $this->configService = $configService; diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php index cd78c297..ddecb6d0 100644 --- a/lib/Controller/LocalController.php +++ b/lib/Controller/LocalController.php @@ -397,9 +397,9 @@ class LocalController extends Controller { $this->initViewer(); $actor = $this->accountService->getActorFromUserId($this->userId); - $followers = $this->followService->getFollowing($actor); + $following = $this->followService->getFollowing($actor); - return $this->success($followers); + return $this->success($following); } catch (Exception $e) { return $this->fail($e); } diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php index 1e538cdf..5823f648 100644 --- a/lib/Service/ActivityService.php +++ b/lib/Service/ActivityService.php @@ -130,7 +130,7 @@ class ActivityService { * @param ACore $activity * * @return string - * @throws Exception + * @throws SocialAppConfigException */ public function createActivity(Person $actor, ACore $item, ACore &$activity = null): string {