From cd9440748d0f0760d7166cedc4841fc9b8f566f5 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 28 Oct 2024 11:53:06 -0100 Subject: [PATCH] fix cs/psalm Signed-off-by: Maxence Lange --- lib/AP.php | 6 +- lib/Command/AccountCreate.php | 8 +- lib/Command/AccountDelete.php | 6 +- lib/Command/AccountFollowing.php | 12 +- lib/Command/CacheRefresh.php | 4 +- lib/Command/CheckInstall.php | 6 +- lib/Command/ExtendedBase.php | 8 +- lib/Command/Fediverse.php | 14 +-- lib/Command/NoteBoost.php | 10 +- lib/Command/NoteCreate.php | 36 +++--- lib/Command/NoteLike.php | 10 +- lib/Command/QueueProcess.php | 4 +- lib/Command/QueueStatus.php | 10 +- lib/Command/Reset.php | 6 +- lib/Command/StreamDetails.php | 8 +- lib/Command/Timeline.php | 30 ++--- lib/Controller/ActivityPubController.php | 2 +- lib/Controller/ApiController.php | 96 +++++++------- lib/Controller/ConfigController.php | 2 +- lib/Controller/LocalController.php | 4 +- lib/Controller/NavigationController.php | 4 +- lib/Controller/OAuthController.php | 36 +++--- lib/Controller/OStatusController.php | 2 +- lib/Controller/QueueController.php | 2 +- lib/Controller/SocialPubController.php | 4 +- lib/Dashboard/SocialWidget.php | 2 +- lib/Db/ActionsRequest.php | 14 +-- lib/Db/ActionsRequestBuilder.php | 6 +- lib/Db/ActorsRequest.php | 30 ++--- lib/Db/ActorsRequestBuilder.php | 24 ++-- lib/Db/CacheActorsRequest.php | 72 +++++------ lib/Db/CacheActorsRequestBuilder.php | 4 +- lib/Db/CacheDocumentsRequest.php | 54 ++++---- lib/Db/CacheDocumentsRequestBuilder.php | 2 +- lib/Db/ClientRequest.php | 14 +-- lib/Db/ClientRequestBuilder.php | 2 +- lib/Db/CoreRequestBuilder.php | 96 +++++++------- lib/Db/FollowsRequest.php | 40 +++--- lib/Db/FollowsRequestBuilder.php | 4 +- lib/Db/HashtagsRequest.php | 2 +- lib/Db/HashtagsRequestBuilder.php | 2 +- lib/Db/InstancesRequest.php | 2 +- lib/Db/InstancesRequestBuilder.php | 2 +- lib/Db/RequestQueueRequest.php | 32 ++--- lib/Db/RequestQueueRequestBuilder.php | 2 +- lib/Db/SocialCoreQueryBuilder.php | 8 +- lib/Db/SocialCrossQueryBuilder.php | 104 +++++++-------- lib/Db/SocialLimitsQueryBuilder.php | 4 +- lib/Db/StreamActionsRequest.php | 14 +-- lib/Db/StreamActionsRequestBuilder.php | 2 +- lib/Db/StreamDestRequest.php | 2 +- lib/Db/StreamDestRequestBuilder.php | 4 +- lib/Db/StreamQueueRequest.php | 18 +-- lib/Db/StreamQueueRequestBuilder.php | 2 +- lib/Db/StreamRequest.php | 118 +++++++++--------- lib/Db/StreamRequestBuilder.php | 6 +- lib/Db/StreamTagsRequest.php | 2 +- lib/Db/StreamTagsRequestBuilder.php | 2 +- lib/Interfaces/Activity/MoveInterface.php | 2 +- lib/Interfaces/Actor/PersonInterface.php | 2 +- .../SocialAppNotificationInterface.php | 2 +- lib/Interfaces/Object/AnnounceInterface.php | 16 +-- lib/Interfaces/Object/DocumentInterface.php | 4 +- lib/Interfaces/Object/FollowInterface.php | 14 +-- lib/Interfaces/Object/ImageInterface.php | 2 +- lib/Interfaces/Object/LikeInterface.php | 14 +-- lib/Interfaces/Object/NoteInterface.php | 14 +-- lib/Listeners/UserAccountListener.php | 2 +- lib/Migration/RenameDocumentLocalCopy.php | 2 +- lib/Model/ActivityPub/ACore.php | 10 +- lib/Model/ActivityPub/Actor/Person.php | 46 +++---- lib/Model/ActivityPub/Item.php | 2 +- lib/Model/ActivityPub/Object/Document.php | 12 +- lib/Model/ActivityPub/Object/Mention.php | 2 +- lib/Model/ActivityPub/Object/Note.php | 2 +- lib/Model/ActivityPub/OrderedCollection.php | 4 +- lib/Model/ActivityPub/Stream.php | 38 +++--- lib/Model/Client/AttachmentMetaDim.php | 12 +- lib/Model/Client/MediaAttachment.php | 2 +- lib/Model/Client/Options/ProbeOptions.php | 2 +- lib/Notification/Notifier.php | 4 +- lib/Providers/ContactsMenuProvider.php | 2 +- lib/Search/UnifiedSearchProvider.php | 4 +- lib/Search/UnifiedSearchResult.php | 2 +- lib/Service/AccountService.php | 4 +- lib/Service/ActionService.php | 2 +- lib/Service/ActivityService.php | 18 +-- lib/Service/ActorService.php | 2 +- lib/Service/BoostService.php | 2 +- lib/Service/CacheActorService.php | 4 +- lib/Service/CacheDocumentService.php | 6 +- lib/Service/CheckService.php | 4 +- lib/Service/ConfigService.php | 2 +- lib/Service/CurlService.php | 4 +- lib/Service/DetailsService.php | 2 +- lib/Service/DocumentService.php | 4 +- lib/Service/FediverseService.php | 2 +- lib/Service/FollowService.php | 2 +- lib/Service/HashtagService.php | 2 +- lib/Service/InstanceService.php | 2 +- lib/Service/LikeService.php | 2 +- lib/Service/MiscService.php | 4 +- lib/Service/PostService.php | 10 +- lib/Service/PushService.php | 2 +- lib/Service/RequestQueueService.php | 2 +- lib/Service/SearchService.php | 2 +- lib/Service/SignatureService.php | 22 ++-- lib/Service/StreamActionService.php | 2 +- lib/Service/StreamQueueService.php | 2 +- lib/Service/StreamService.php | 10 +- lib/Service/TestService.php | 4 +- lib/Service/UpdateService.php | 12 +- lib/Tools/Db/ExtendedQueryBuilder.php | 20 ++- lib/Tools/Db/RequestBuilder.php | 14 +-- lib/Tools/IExtendedQueryBuilder.php | 14 +-- lib/Tools/Model/Request.php | 6 +- lib/Tools/Traits/TArrayTools.php | 2 +- lib/Tools/Traits/TNCDataResponse.php | 7 +- lib/Tools/Traits/TPathTools.php | 2 +- lib/Tools/Traits/TRequest.php | 4 +- lib/WellKnown/JrdResponse.php | 2 +- lib/WellKnown/WebfingerHandler.php | 4 +- psalm.xml | 3 + tests/bootstrap.php | 2 +- tests/psalm-baseline.xml | 39 +++--- tests/stub.phpstub | 5 +- 126 files changed, 750 insertions(+), 750 deletions(-) diff --git a/lib/AP.php b/lib/AP.php index 1e719fb0..692aad32 100644 --- a/lib/AP.php +++ b/lib/AP.php @@ -121,7 +121,7 @@ class AP { RemoveInterface $removeInterface, UndoInterface $undoInterface, UpdateInterface $updateInterface, - ConfigService $configService + ConfigService $configService, ) { $this->acceptInterface = $acceptInterface; $this->addInterface = $addInterface; @@ -152,7 +152,7 @@ class AP { AP::$activityPub = Server::get(AP::class); } catch (QueryException $e) { Server::get(LoggerInterface::class) - ->error($e->getMessage(), ['exception' => $e]); + ->error($e->getMessage(), ['exception' => $e]); } } @@ -162,7 +162,7 @@ class AP { * @throws SocialAppConfigException * @throws ItemUnknownException */ - public function getItemFromData(array $data, ACore $parent = null, int $level = 0): ACore { + public function getItemFromData(array $data, ?ACore $parent = null, int $level = 0): ACore { if (++$level > self::REDUNDANCY_LIMIT) { throw new RedundancyLimitException((string)$level); } diff --git a/lib/Command/AccountCreate.php b/lib/Command/AccountCreate.php index 73bc512a..002daaed 100644 --- a/lib/Command/AccountCreate.php +++ b/lib/Command/AccountCreate.php @@ -30,7 +30,7 @@ class AccountCreate extends Base { public function __construct( IUserManager $userManager, AccountService $accountService, - CacheActorService $cacheActorService, ConfigService $configService, MiscService $miscService + CacheActorService $cacheActorService, ConfigService $configService, MiscService $miscService, ) { parent::__construct(); @@ -45,9 +45,9 @@ class AccountCreate extends Base { protected function configure() { parent::configure(); $this->setName('social:account:create') - ->addArgument('userId', InputArgument::REQUIRED, 'Nextcloud username of the account') - ->addOption('handle', '', InputOption::VALUE_REQUIRED, 'social handle') - ->setDescription('Create a new social account'); + ->addArgument('userId', InputArgument::REQUIRED, 'Nextcloud username of the account') + ->addOption('handle', '', InputOption::VALUE_REQUIRED, 'social handle') + ->setDescription('Create a new social account'); } /** diff --git a/lib/Command/AccountDelete.php b/lib/Command/AccountDelete.php index 00a9dd42..c765bd9c 100644 --- a/lib/Command/AccountDelete.php +++ b/lib/Command/AccountDelete.php @@ -29,7 +29,7 @@ class AccountDelete extends Base { IUserManager $userManager, AccountService $accountService, CacheActorService $cacheActorService, - ConfigService $configService + ConfigService $configService, ) { parent::__construct(); @@ -42,8 +42,8 @@ class AccountDelete extends Base { protected function configure(): void { parent::configure(); $this->setName('social:account:delete') - ->addArgument('account', InputArgument::REQUIRED, 'Social Local Account') - ->setDescription('Delete a local social account'); + ->addArgument('account', InputArgument::REQUIRED, 'Social Local Account') + ->setDescription('Delete a local social account'); } /** diff --git a/lib/Command/AccountFollowing.php b/lib/Command/AccountFollowing.php index be4d2bb7..77f6d3d5 100644 --- a/lib/Command/AccountFollowing.php +++ b/lib/Command/AccountFollowing.php @@ -30,7 +30,7 @@ class AccountFollowing extends Base { public function __construct( AccountService $accountService, CacheActorService $cacheActorService, - FollowService $followService, ConfigService $configService, MiscService $miscService + FollowService $followService, ConfigService $configService, MiscService $miscService, ) { parent::__construct(); @@ -44,11 +44,11 @@ class AccountFollowing extends Base { protected function configure() { parent::configure(); $this->setName('social:account:following') - ->addArgument('userId', InputArgument::REQUIRED, 'Nextcloud userid') - ->addArgument('account', InputArgument::REQUIRED, 'Account to follow') - ->addOption('local', '', InputOption::VALUE_NONE, 'account is local') - ->addOption('unfollow', '', InputOption::VALUE_NONE, 'unfollow') - ->setDescription('Following a new account'); + ->addArgument('userId', InputArgument::REQUIRED, 'Nextcloud userid') + ->addArgument('account', InputArgument::REQUIRED, 'Account to follow') + ->addOption('local', '', InputOption::VALUE_NONE, 'account is local') + ->addOption('unfollow', '', InputOption::VALUE_NONE, 'unfollow') + ->setDescription('Following a new account'); } /** diff --git a/lib/Command/CacheRefresh.php b/lib/Command/CacheRefresh.php index 4679b4ac..99149fe8 100644 --- a/lib/Command/CacheRefresh.php +++ b/lib/Command/CacheRefresh.php @@ -27,7 +27,7 @@ class CacheRefresh extends Base { public function __construct( AccountService $accountService, CacheActorService $cacheActorService, - DocumentService $documentService, HashtagService $hashtagService + DocumentService $documentService, HashtagService $hashtagService, ) { parent::__construct(); @@ -40,7 +40,7 @@ class CacheRefresh extends Base { protected function configure() { parent::configure(); $this->setName('social:cache:refresh') - ->setDescription('Update the cache') + ->setDescription('Update the cache') ->addOption('force', 'f', InputOption::VALUE_NONE, 'enforce update of cached account'); } diff --git a/lib/Command/CheckInstall.php b/lib/Command/CheckInstall.php index cb041719..713b03f8 100644 --- a/lib/Command/CheckInstall.php +++ b/lib/Command/CheckInstall.php @@ -44,7 +44,7 @@ class CheckInstall extends Base { IUserManager $userManager, StreamRequest $streamRequest, StreamDestRequest $streamDestRequest, StreamTagsRequest $streamTagsRequest, CacheActorService $cacheActorService, CheckService $checkService, ConfigService $configService, PushService $pushService, - MiscService $miscService + MiscService $miscService, ) { parent::__construct(); @@ -62,13 +62,13 @@ class CheckInstall extends Base { protected function configure() { parent::configure(); $this->setName('social:check:install') - ->addOption('index', '', InputOption::VALUE_NONE, 'regenerate your index') + ->addOption('index', '', InputOption::VALUE_NONE, 'regenerate your index') // ->addOption( // 'push', '', InputOption::VALUE_REQUIRED, // 'a local account used to test integration to Nextcloud Push', // '' // ) - ->setDescription('Check the integrity of the installation'); + ->setDescription('Check the integrity of the installation'); } diff --git a/lib/Command/ExtendedBase.php b/lib/Command/ExtendedBase.php index eff0dbb5..350c7328 100644 --- a/lib/Command/ExtendedBase.php +++ b/lib/Command/ExtendedBase.php @@ -57,13 +57,13 @@ class ExtendedBase extends Base { if ($objectId !== '' && $cache->hasItem($objectId)) { try { $cachedObject = $cache->getItem($objectId) - ->getObject(); + ->getObject(); /** @var Stream $cachedItem */ $cachedItem = AP::$activityPub->getItemFromData($cachedObject); $content = $cachedItem->getContent(); $author = $cachedItem->getActor() - ->getAccount(); + ->getAccount(); } catch (CacheItemNotFoundException $e) { } catch (ItemUnknownException $e) { } catch (RedundancyLimitException $e) { @@ -72,7 +72,7 @@ class ExtendedBase extends Base { } else { $content = $item->getContent(); $author = $item->getActor() - ->getAccount(); + ->getAccount(); } $content = ($this->crop) ? substr($content, 0, $this->crop) : $content; @@ -82,7 +82,7 @@ class ExtendedBase extends Base { $item->getNid(), '' . $item->getId() . '', '' . $item->getActor() - ->getAccount() . '', + ->getAccount() . '', $item->getType(), '' . $author . '', $content, diff --git a/lib/Command/Fediverse.php b/lib/Command/Fediverse.php index 9bf47905..f0728e52 100644 --- a/lib/Command/Fediverse.php +++ b/lib/Command/Fediverse.php @@ -35,13 +35,13 @@ class Fediverse extends Base { protected function configure() { parent::configure(); $this->setName('social:fediverse') - ->addOption( - 'type', 't', InputArgument::OPTIONAL, - 'Change the type of access management', '' - ) - ->addArgument('action', InputArgument::OPTIONAL, 'add/remove/test address', '') - ->addArgument('address', InputArgument::OPTIONAL, 'address/host', '') - ->setDescription('Allow or deny access to the fediverse'); + ->addOption( + 'type', 't', InputArgument::OPTIONAL, + 'Change the type of access management', '' + ) + ->addArgument('action', InputArgument::OPTIONAL, 'add/remove/test address', '') + ->addArgument('address', InputArgument::OPTIONAL, 'address/host', '') + ->setDescription('Allow or deny access to the fediverse'); } /** diff --git a/lib/Command/NoteBoost.php b/lib/Command/NoteBoost.php index 53c0f128..882beeaa 100644 --- a/lib/Command/NoteBoost.php +++ b/lib/Command/NoteBoost.php @@ -32,7 +32,7 @@ class NoteBoost extends Base { public function __construct( AccountService $accountService, StreamService $streamService, - BoostService $boostService + BoostService $boostService, ) { parent::__construct(); @@ -48,10 +48,10 @@ class NoteBoost extends Base { protected function configure() { parent::configure(); $this->setName('social:note:boost') - ->addArgument('user_id', InputArgument::REQUIRED, 'userId of the author') - ->addArgument('note_id', InputArgument::REQUIRED, 'Note to boost') - ->addOption('unboost', '', InputOption::VALUE_NONE, 'Unboost') - ->setDescription('Boost a note'); + ->addArgument('user_id', InputArgument::REQUIRED, 'userId of the author') + ->addArgument('note_id', InputArgument::REQUIRED, 'Note to boost') + ->addOption('unboost', '', InputOption::VALUE_NONE, 'Unboost') + ->setDescription('Boost a note'); } diff --git a/lib/Command/NoteCreate.php b/lib/Command/NoteCreate.php index d2094611..9942c09f 100644 --- a/lib/Command/NoteCreate.php +++ b/lib/Command/NoteCreate.php @@ -54,7 +54,7 @@ class NoteCreate extends Base { */ public function __construct( ActivityService $activityService, AccountService $accountService, PostService $postService, - CurlService $curlService, ConfigService $configService, MiscService $miscService + CurlService $curlService, ConfigService $configService, MiscService $miscService, ) { parent::__construct(); @@ -73,23 +73,23 @@ class NoteCreate extends Base { protected function configure() { parent::configure(); $this->setName('social:note:create') - ->addOption( - 'replyTo', 'r', InputOption::VALUE_OPTIONAL, 'in reply to an existing thread' - ) - ->addOption( - 'to', 't', InputOption::VALUE_OPTIONAL, 'mentioning people' - ) - ->addOption( - 'type', 'y', InputOption::VALUE_OPTIONAL, - 'type: public (default), followers, unlisted, direct' - ) - ->addOption( - 'hashtag', 'g', InputOption::VALUE_OPTIONAL, - 'hashtag, without the leading #' - ) - ->addArgument('user_id', InputArgument::REQUIRED, 'userId of the author') - ->addArgument('content', InputArgument::REQUIRED, 'content of the post') - ->setDescription('Create a new note'); + ->addOption( + 'replyTo', 'r', InputOption::VALUE_OPTIONAL, 'in reply to an existing thread' + ) + ->addOption( + 'to', 't', InputOption::VALUE_OPTIONAL, 'mentioning people' + ) + ->addOption( + 'type', 'y', InputOption::VALUE_OPTIONAL, + 'type: public (default), followers, unlisted, direct' + ) + ->addOption( + 'hashtag', 'g', InputOption::VALUE_OPTIONAL, + 'hashtag, without the leading #' + ) + ->addArgument('user_id', InputArgument::REQUIRED, 'userId of the author') + ->addArgument('content', InputArgument::REQUIRED, 'content of the post') + ->setDescription('Create a new note'); } diff --git a/lib/Command/NoteLike.php b/lib/Command/NoteLike.php index eac675b4..5116e7bd 100644 --- a/lib/Command/NoteLike.php +++ b/lib/Command/NoteLike.php @@ -45,7 +45,7 @@ class NoteLike extends Base { */ public function __construct( AccountService $accountService, StreamService $streamService, LikeService $likeService, - MiscService $miscService + MiscService $miscService, ) { parent::__construct(); @@ -62,10 +62,10 @@ class NoteLike extends Base { protected function configure() { parent::configure(); $this->setName('social:note:like') - ->addArgument('user_id', InputArgument::REQUIRED, 'userId of the author') - ->addArgument('note_id', InputArgument::REQUIRED, 'Note to like') - ->addOption('unlike', '', InputOption::VALUE_NONE, 'Unlike') - ->setDescription('Like a note'); + ->addArgument('user_id', InputArgument::REQUIRED, 'userId of the author') + ->addArgument('note_id', InputArgument::REQUIRED, 'Note to like') + ->addOption('unlike', '', InputOption::VALUE_NONE, 'Unlike') + ->setDescription('Like a note'); } diff --git a/lib/Command/QueueProcess.php b/lib/Command/QueueProcess.php index 164a0bb3..c57dd35d 100644 --- a/lib/Command/QueueProcess.php +++ b/lib/Command/QueueProcess.php @@ -39,7 +39,7 @@ class QueueProcess extends Base { public function __construct( ActivityService $activityService, RequestQueueService $requestQueueService, StreamQueueService $streamQueueService, ConfigService $configService, - MiscService $miscService + MiscService $miscService, ) { parent::__construct(); @@ -57,7 +57,7 @@ class QueueProcess extends Base { protected function configure() { parent::configure(); $this->setName('social:queue:process') - ->setDescription('Process the request queue'); + ->setDescription('Process the request queue'); } diff --git a/lib/Command/QueueStatus.php b/lib/Command/QueueStatus.php index 32b4772b..71f67a4a 100644 --- a/lib/Command/QueueStatus.php +++ b/lib/Command/QueueStatus.php @@ -34,7 +34,7 @@ class QueueStatus extends Base { * @param MiscService $miscService */ public function __construct( - RequestQueueService $requestQueueService, ConfigService $configService, MiscService $miscService + RequestQueueService $requestQueueService, ConfigService $configService, MiscService $miscService, ) { parent::__construct(); @@ -50,10 +50,10 @@ class QueueStatus extends Base { protected function configure() { parent::configure(); $this->setName('social:queue:status') - ->addOption( - 'token', 't', InputOption::VALUE_OPTIONAL, 'token of a request' - ) - ->setDescription('Return status on the request queue'); + ->addOption( + 'token', 't', InputOption::VALUE_OPTIONAL, 'token of a request' + ) + ->setDescription('Return status on the request queue'); } diff --git a/lib/Command/Reset.php b/lib/Command/Reset.php index 23e28240..b0bd1d45 100644 --- a/lib/Command/Reset.php +++ b/lib/Command/Reset.php @@ -41,7 +41,7 @@ class Reset extends Base { */ public function __construct( CoreRequestBuilder $coreRequestBuilder, CheckService $checkService, ConfigService $configService, - MiscService $miscService + MiscService $miscService, ) { parent::__construct(); @@ -58,8 +58,8 @@ class Reset extends Base { protected function configure() { parent::configure(); $this->setName('social:reset') - ->addOption('uninstall', '', InputOption::VALUE_NONE, 'full removing of the app') - ->setDescription('Reset ALL data related to the Social App'); + ->addOption('uninstall', '', InputOption::VALUE_NONE, 'full removing of the app') + ->setDescription('Reset ALL data related to the Social App'); } diff --git a/lib/Command/StreamDetails.php b/lib/Command/StreamDetails.php index b317060a..8d5fec18 100644 --- a/lib/Command/StreamDetails.php +++ b/lib/Command/StreamDetails.php @@ -42,7 +42,7 @@ class StreamDetails extends ExtendedBase { * @param MiscService $miscService */ public function __construct( - StreamService $streamService, DetailsService $detailsService, MiscService $miscService + StreamService $streamService, DetailsService $detailsService, MiscService $miscService, ) { parent::__construct(); @@ -58,9 +58,9 @@ class StreamDetails extends ExtendedBase { protected function configure() { parent::configure(); $this->setName('social:details') - ->addArgument('streamId', InputArgument::REQUIRED, 'Id of the Stream item') - ->addOption('json', '', InputOption::VALUE_NONE, 'return JSON format') - ->setDescription('Get details about a Stream item'); + ->addArgument('streamId', InputArgument::REQUIRED, 'Id of the Stream item') + ->addOption('json', '', InputOption::VALUE_NONE, 'return JSON format') + ->setDescription('Get details about a Stream item'); } diff --git a/lib/Command/Timeline.php b/lib/Command/Timeline.php index 87430254..b8e248c8 100644 --- a/lib/Command/Timeline.php +++ b/lib/Command/Timeline.php @@ -51,7 +51,7 @@ class Timeline extends ExtendedBase { StreamRequest $streamRequest, AccountService $accountService, CacheActorService $cacheActorService, - ConfigService $configService + ConfigService $configService, ) { parent::__construct(); @@ -69,16 +69,16 @@ class Timeline extends ExtendedBase { protected function configure() { parent::configure(); $this->setName('social:timeline') - ->addArgument('userId', InputArgument::REQUIRED, 'viewer') - ->addArgument('timeline', InputArgument::REQUIRED, 'timeline') - ->addOption('local', '', InputOption::VALUE_NONE, 'public') - ->addOption('min_id', '', InputOption::VALUE_REQUIRED, 'min_id', 0) - ->addOption('max_id', '', InputOption::VALUE_REQUIRED, 'max_id', 0) - ->addOption('since', '', InputOption::VALUE_REQUIRED, 'since', 0) - ->addOption('limit', '', InputOption::VALUE_REQUIRED, 'limit', 5) - ->addOption('account', '', InputOption::VALUE_REQUIRED, 'account', '') - ->addOption('crop', '', InputOption::VALUE_REQUIRED, 'crop', 0) - ->setDescription('Get stream by timeline and viewer'); + ->addArgument('userId', InputArgument::REQUIRED, 'viewer') + ->addArgument('timeline', InputArgument::REQUIRED, 'timeline') + ->addOption('local', '', InputOption::VALUE_NONE, 'public') + ->addOption('min_id', '', InputOption::VALUE_REQUIRED, 'min_id', 0) + ->addOption('max_id', '', InputOption::VALUE_REQUIRED, 'max_id', 0) + ->addOption('since', '', InputOption::VALUE_REQUIRED, 'since', 0) + ->addOption('limit', '', InputOption::VALUE_REQUIRED, 'limit', 5) + ->addOption('account', '', InputOption::VALUE_REQUIRED, 'account', '') + ->addOption('crop', '', InputOption::VALUE_REQUIRED, 'crop', 0) + ->setDescription('Get stream by timeline and viewer'); } @@ -111,9 +111,9 @@ class Timeline extends ExtendedBase { $options = new ProbeOptions(); $options->setFormat(Stream::FORMAT_LOCAL); $options->setLimit(intval($input->getOption('limit'))) - ->setMinId(intval($input->getOption('min_id'))) - ->setMaxId(intval($input->getOption('max_id'))) - ->setSince(intval($input->getOption('since'))); + ->setMinId(intval($input->getOption('min_id'))) + ->setMaxId(intval($input->getOption('max_id'))) + ->setSince(intval($input->getOption('since'))); if ($input->getOption('local')) { $options->setLocal(true); @@ -122,7 +122,7 @@ class Timeline extends ExtendedBase { $timeline = $input->getArgument('timeline'); if (str_starts_with($timeline, '#')) { $options->setProbe(ProbeOptions::HASHTAG) - ->setArgument(substr($timeline, 1)); + ->setArgument(substr($timeline, 1)); } else { $options->setProbe($timeline); } diff --git a/lib/Controller/ActivityPubController.php b/lib/Controller/ActivityPubController.php index 8f8c80e5..71f3841a 100644 --- a/lib/Controller/ActivityPubController.php +++ b/lib/Controller/ActivityPubController.php @@ -66,7 +66,7 @@ class ActivityPubController extends Controller { FollowService $followService, StreamService $streamService, ConfigService $configService, - LoggerInterface $logger + LoggerInterface $logger, ) { parent::__construct(Application::APP_ID, $request); diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php index 87c4a2b0..21d80c51 100644 --- a/lib/Controller/ApiController.php +++ b/lib/Controller/ApiController.php @@ -90,7 +90,7 @@ class ApiController extends Controller { StreamService $streamService, ActionService $actionService, PostService $postService, - ConfigService $configService + ConfigService $configService, ) { parent::__construct(Application::APP_ID, $request); @@ -111,7 +111,7 @@ class ApiController extends Controller { $authHeader = trim($this->request->getHeader('Authorization')); if (strpos($authHeader, ' ')) { - list($authType, $authToken) = explode(' ', $authHeader); + [$authType, $authToken] = explode(' ', $authHeader); if (strtolower($authType) === 'bearer') { $this->bearer = $authToken; } @@ -370,7 +370,7 @@ class ApiController extends Controller { /** * @param string $ext - * only support image actually + * only support image actually * * @return string */ @@ -401,7 +401,7 @@ class ApiController extends Controller { int $limit = 20, int $max_id = 0, int $min_id = 0, - int $since_id = 0 + int $since_id = 0, ): DataResponse { try { $this->initViewer(true); @@ -422,11 +422,11 @@ class ApiController extends Controller { $options = new ProbeOptions($this->request); $options->setFormat(ACore::FORMAT_LOCAL); $options->setProbe($timeline) - ->setLocal($local) - ->setLimit($limit) - ->setMaxId($max_id) - ->setMinId($min_id) - ->setSince($since_id); + ->setLocal($local) + ->setLimit($limit) + ->setMaxId($max_id) + ->setMinId($min_id) + ->setSince($since_id); $posts = $this->streamService->getTimeline($options); @@ -538,7 +538,7 @@ class ApiController extends Controller { int $limit = 20, int $max_id = 0, int $min_id = 0, - int $since_id = 0 + int $since_id = 0, ): DataResponse { try { $this->initViewer(true); @@ -548,11 +548,11 @@ class ApiController extends Controller { $options = new ProbeOptions($this->request); $options->setFormat(ACore::FORMAT_LOCAL); $options->setProbe(ProbeOptions::ACCOUNT) - ->setAccountId($local->getId()) - ->setLimit($limit) - ->setMaxId($max_id) - ->setMinId($min_id) - ->setSince($since_id); + ->setAccountId($local->getId()) + ->setLimit($limit) + ->setMaxId($max_id) + ->setMinId($min_id) + ->setSince($since_id); $posts = $this->streamService->getTimeline($options); @@ -576,7 +576,7 @@ class ApiController extends Controller { int $limit = 20, int $max_id = 0, int $min_id = 0, - int $since = 0 + int $since = 0, ): DataResponse { try { $this->initViewer(true); @@ -585,11 +585,11 @@ class ApiController extends Controller { $options = new ProbeOptions($this->request); $options->setFormat(ACore::FORMAT_LOCAL); $options->setProbe(ProbeOptions::FOLLOWING) - ->setAccountId($local->getId()) - ->setLimit($limit) - ->setMaxId($max_id) - ->setMinId($min_id) - ->setSince($since); + ->setAccountId($local->getId()) + ->setLimit($limit) + ->setMaxId($max_id) + ->setMinId($min_id) + ->setSince($since); return new DataResponse($this->cacheActorService->probeActors($options), Http::STATUS_OK); } catch (Exception $e) { @@ -611,7 +611,7 @@ class ApiController extends Controller { int $limit = 20, int $max_id = 0, int $min_id = 0, - int $since = 0 + int $since = 0, ): DataResponse { try { $this->initViewer(true); @@ -621,11 +621,11 @@ class ApiController extends Controller { $options = new ProbeOptions($this->request); $options->setFormat(ACore::FORMAT_LOCAL); $options->setProbe(ProbeOptions::FOLLOWERS) - ->setAccountId($local->getId()) - ->setLimit($limit) - ->setMaxId($max_id) - ->setMinId($min_id) - ->setSince($since); + ->setAccountId($local->getId()) + ->setLimit($limit) + ->setMaxId($max_id) + ->setMinId($min_id) + ->setSince($since); return new DataResponse($this->cacheActorService->probeActors($options), Http::STATUS_OK); } catch (Exception $e) { @@ -649,7 +649,7 @@ class ApiController extends Controller { int $limit = 20, int $max_id = 0, int $min_id = 0, - int $since_id = 0 + int $since_id = 0, ): DataResponse { try { $this->initViewer(true); @@ -657,10 +657,10 @@ class ApiController extends Controller { $options = new ProbeOptions($this->request); $options->setFormat(ACore::FORMAT_LOCAL); $options->setProbe(ProbeOptions::FAVOURITES) - ->setLimit($limit) - ->setMaxId($max_id) - ->setMinId($min_id) - ->setSince($since_id); + ->setLimit($limit) + ->setMaxId($max_id) + ->setMinId($min_id) + ->setSince($since_id); $posts = $this->streamService->getTimeline($options); @@ -684,7 +684,7 @@ class ApiController extends Controller { int $since_id = 0, array $types = [], array $exclude_types = [], - string $accountId = '' + string $accountId = '', ): DataResponse { try { $this->initViewer(true); @@ -692,13 +692,13 @@ class ApiController extends Controller { $options = new ProbeOptions($this->request); $options->setFormat(ACore::FORMAT_LOCAL); $options->setProbe(ProbeOptions::NOTIFICATIONS) - ->setLimit($limit) - ->setMaxId($max_id) - ->setMinId($min_id) - ->setSince($since_id) - ->setTypes($types) - ->setExcludeTypes($exclude_types) - ->setAccountId($accountId); + ->setLimit($limit) + ->setMaxId($max_id) + ->setMinId($min_id) + ->setSince($since_id) + ->setTypes($types) + ->setExcludeTypes($exclude_types) + ->setAccountId($accountId); $posts = $this->streamService->getTimeline($options); @@ -722,7 +722,7 @@ class ApiController extends Controller { int $min_id = 0, int $since_id = 0, bool $local = false, - bool $only_media = false + bool $only_media = false, ): DataResponse { try { $this->initViewer(true); @@ -730,13 +730,13 @@ class ApiController extends Controller { $options = new ProbeOptions($this->request); $options->setFormat(ACore::FORMAT_LOCAL); $options->setProbe('hashtag') - ->setLimit($limit) - ->setMaxId($max_id) - ->setMinId($min_id) - ->setSince($since_id) - ->setLocal($local) - ->setOnlyMedia($only_media) - ->setArgument($hashtag); + ->setLimit($limit) + ->setMaxId($max_id) + ->setMinId($min_id) + ->setSince($since_id) + ->setLocal($local) + ->setOnlyMedia($only_media) + ->setArgument($hashtag); $posts = $this->streamService->getTimeline($options); diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php index 4ef3e37c..2b827fa0 100644 --- a/lib/Controller/ConfigController.php +++ b/lib/Controller/ConfigController.php @@ -30,7 +30,7 @@ class ConfigController extends Controller { public function __construct( string $appName, IRequest $request, TestService $testService, - ConfigService $configService, MiscService $miscService + ConfigService $configService, MiscService $miscService, ) { parent::__construct($appName, $request); diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php index 40eb9953..e79ea3ff 100644 --- a/lib/Controller/LocalController.php +++ b/lib/Controller/LocalController.php @@ -67,7 +67,7 @@ class LocalController extends Controller { FollowService $followService, PostService $postService, StreamService $streamService, SearchService $searchService, BoostService $boostService, LikeService $likeService, DocumentService $documentService, - MiscService $miscService + MiscService $miscService, ) { parent::__construct(Application::APP_ID, $request); @@ -103,7 +103,7 @@ class LocalController extends Controller { * * @NoAdminRequired */ - public function postCreate(string $content = '', array $to = [], string $type = null, ?string $replyTo = null, $attachments = null, array $hashtags = []): DataResponse { + public function postCreate(string $content = '', array $to = [], ?string $type = null, ?string $replyTo = null, $attachments = null, array $hashtags = []): DataResponse { $content = $content ?: ''; $replyTo = $replyTo ?? ''; $type = $type ?? Stream::TYPE_PUBLIC; diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php index c4563882..1e2bd179 100644 --- a/lib/Controller/NavigationController.php +++ b/lib/Controller/NavigationController.php @@ -66,7 +66,7 @@ class NavigationController extends Controller { DocumentService $documentService, ConfigService $configService, CheckService $checkService, - MiscService $miscService + MiscService $miscService, ) { parent::__construct(Application::APP_ID, $request); @@ -99,7 +99,7 @@ class NavigationController extends Controller { 'firstrun' => false, 'setup' => false, 'isAdmin' => Server::get(IGroupManager::class) - ->isAdmin($this->userId), + ->isAdmin($this->userId), 'cliUrl' => $this->getCliUrl() ]; diff --git a/lib/Controller/OAuthController.php b/lib/Controller/OAuthController.php index 80c30b57..330d80a3 100644 --- a/lib/Controller/OAuthController.php +++ b/lib/Controller/OAuthController.php @@ -49,7 +49,7 @@ class OAuthController extends Controller { ClientService $clientService, ConfigService $configService, LoggerInterface $logger, - IInitialState $initialState + IInitialState $initialState, ) { parent::__construct(Application::APP_ID, $request); @@ -87,17 +87,17 @@ class OAuthController extends Controller { } $nodeInfo = [ - "version" => "2.0", - "software" => [ - "name" => $name, - "version" => $version + 'version' => '2.0', + 'software' => [ + 'name' => $name, + 'version' => $version ], - "protocols" => [ - "activitypub" + 'protocols' => [ + 'activitypub' ], - "rootUrl" => rtrim($this->urlGenerator->linkToRouteAbsolute('social.Navigation.navigate'), '/'), - "usage" => $usage, - "openRegistrations" => $openReg + 'rootUrl' => rtrim($this->urlGenerator->linkToRouteAbsolute('social.Navigation.navigate'), '/'), + 'usage' => $usage, + 'openRegistrations' => $openReg ]; return new DataResponse($nodeInfo, Http::STATUS_OK); @@ -116,7 +116,7 @@ class OAuthController extends Controller { string $client_name = '', $redirect_uris = '', string $website = '', - string $scopes = 'read' + string $scopes = 'read', ): DataResponse { // TODO: manage array from request if (!is_array($redirect_uris)) { @@ -152,7 +152,7 @@ class OAuthController extends Controller { string $client_id, string $redirect_uri, string $response_type, - string $scope = 'read' + string $scope = 'read', ): Response { $user = $this->userSession->getUser(); @@ -186,7 +186,7 @@ class OAuthController extends Controller { string $client_id, string $redirect_uri, string $response_type, - string $scope = 'read' + string $scope = 'read', ): DataResponse { try { $user = $this->userSession->getUser(); @@ -240,7 +240,7 @@ class OAuthController extends Controller { string $redirect_uri, string $grant_type, string $scope = 'read', - string $code = '' + string $code = '', ): DataResponse { try { $client = $this->clientService->getFromClientId($client_id); @@ -276,10 +276,10 @@ class OAuthController extends Controller { return new DataResponse( [ - "access_token" => $client->getToken(), - "token_type" => 'Bearer', - "scope" => $scope, - "created_at" => $client->getCreation() + 'access_token' => $client->getToken(), + 'token_type' => 'Bearer', + 'scope' => $scope, + 'created_at' => $client->getCreation() ], Http::STATUS_OK ); } catch (ClientNotFoundException $e) { diff --git a/lib/Controller/OStatusController.php b/lib/Controller/OStatusController.php index b4affcd8..d467ef3c 100644 --- a/lib/Controller/OStatusController.php +++ b/lib/Controller/OStatusController.php @@ -40,7 +40,7 @@ class OStatusController extends Controller { public function __construct( IRequest $request, IInitialStateService $initialStateService, CacheActorService $cacheActorService, AccountService $accountService, - CurlService $curlService, MiscService $miscService, IUserSession $userSession + CurlService $curlService, MiscService $miscService, IUserSession $userSession, ) { parent::__construct(Application::APP_ID, $request); diff --git a/lib/Controller/QueueController.php b/lib/Controller/QueueController.php index c2f1d0f4..141e6fe7 100644 --- a/lib/Controller/QueueController.php +++ b/lib/Controller/QueueController.php @@ -33,7 +33,7 @@ class QueueController extends Controller { public function __construct( IRequest $request, RequestQueueService $requestQueueService, ActivityService $activityService, - MiscService $miscService + MiscService $miscService, ) { parent::__construct(Application::APP_ID, $request); diff --git a/lib/Controller/SocialPubController.php b/lib/Controller/SocialPubController.php index 73d70091..b6ca9f40 100644 --- a/lib/Controller/SocialPubController.php +++ b/lib/Controller/SocialPubController.php @@ -50,7 +50,7 @@ class SocialPubController extends Controller { public function __construct( ?string $userId, IInitialStateService $initialStateService, IRequest $request, IL10N $l10n, NavigationController $navigationController, CacheActorService $cacheActorService, AccountService $accountService, StreamService $streamService, - ConfigService $configService + ConfigService $configService, ) { parent::__construct(Application::APP_ID, $request); @@ -157,7 +157,7 @@ class SocialPubController extends Controller { } catch (AccountDoesNotExistException $e) { } -// $postId = $this->configService->getSocialUrl() . '@' . $username . '/' . $token; + // $postId = $this->configService->getSocialUrl() . '@' . $username . '/' . $token; $stream = $this->streamService->getStreamByNid($token); if (strtolower($stream->getActor()->getDisplayName()) !== strtolower($username)) { diff --git a/lib/Dashboard/SocialWidget.php b/lib/Dashboard/SocialWidget.php index a4ef6c5a..2198c874 100644 --- a/lib/Dashboard/SocialWidget.php +++ b/lib/Dashboard/SocialWidget.php @@ -17,7 +17,7 @@ class SocialWidget implements IWidget { public function __construct( IL10N $l10n, - IURLGenerator $urlGenerator + IURLGenerator $urlGenerator, ) { $this->l10n = $l10n; $this->urlGenerator = $urlGenerator; diff --git a/lib/Db/ActionsRequest.php b/lib/Db/ActionsRequest.php index b0789e44..e18e72a1 100644 --- a/lib/Db/ActionsRequest.php +++ b/lib/Db/ActionsRequest.php @@ -31,12 +31,12 @@ class ActionsRequest extends ActionsRequestBuilder { public function save(ACore $like): void { $qb = $this->getActionsInsertSql(); $qb->setValue('id', $qb->createNamedParameter($like->getId())) - ->setValue('id_prim', $qb->createNamedParameter($qb->prim($like->getId()))) - ->setValue('actor_id', $qb->createNamedParameter($like->getActorId())) - ->setValue('actor_id_prim', $qb->createNamedParameter($qb->prim($like->getActorId()))) - ->setValue('type', $qb->createNamedParameter($like->getType())) - ->setValue('object_id', $qb->createNamedParameter($like->getObjectId())) - ->setValue('object_id_prim', $qb->createNamedParameter($qb->prim($like->getObjectId()))); + ->setValue('id_prim', $qb->createNamedParameter($qb->prim($like->getId()))) + ->setValue('actor_id', $qb->createNamedParameter($like->getActorId())) + ->setValue('actor_id_prim', $qb->createNamedParameter($qb->prim($like->getActorId()))) + ->setValue('type', $qb->createNamedParameter($like->getType())) + ->setValue('object_id', $qb->createNamedParameter($like->getObjectId())) + ->setValue('object_id_prim', $qb->createNamedParameter($qb->prim($like->getObjectId()))); try { $qb->setValue( @@ -142,7 +142,7 @@ class ActionsRequest extends ActionsRequestBuilder { public function moveAccount(string $actorId, string $newId): void { $qb = $this->getActionsUpdateSql(); $qb->set('actor_id', $qb->createNamedParameter($newId)) - ->set('actor_id_prim', $qb->createNamedParameter($qb->prim($newId))); + ->set('actor_id_prim', $qb->createNamedParameter($qb->prim($newId))); $qb->limitToDBField('actor_id_prim', $qb->prim($actorId)); diff --git a/lib/Db/ActionsRequestBuilder.php b/lib/Db/ActionsRequestBuilder.php index 13825ddf..445c9687 100644 --- a/lib/Db/ActionsRequestBuilder.php +++ b/lib/Db/ActionsRequestBuilder.php @@ -50,7 +50,7 @@ class ActionsRequestBuilder extends CoreRequestBuilder { /** @noinspection PhpMethodParametersCountMismatchInspection */ $qb->select('a.id', 'a.type', 'a.actor_id', 'a.object_id', 'a.creation') - ->from(self::TABLE_ACTIONS, 'a'); + ->from(self::TABLE_ACTIONS, 'a'); $this->defaultSelectAlias = 'a'; $qb->setDefaultSelectAlias('a'); @@ -67,7 +67,7 @@ class ActionsRequestBuilder extends CoreRequestBuilder { protected function countActionsSelectSql(): SocialQueryBuilder { $qb = $this->getQueryBuilder(); $qb->selectAlias($qb->createFunction('COUNT(*)'), 'count') - ->from(self::TABLE_ACTIONS, 'a'); + ->from(self::TABLE_ACTIONS, 'a'); $this->defaultSelectAlias = 'a'; $qb->setDefaultSelectAlias('a'); @@ -84,7 +84,7 @@ class ActionsRequestBuilder extends CoreRequestBuilder { protected function getActionsDeleteSql(): SocialQueryBuilder { $qb = $this->getQueryBuilder(); $qb->delete(self::TABLE_ACTIONS) - ->setDefaultSelectAlias('a'); + ->setDefaultSelectAlias('a'); return $qb; } diff --git a/lib/Db/ActorsRequest.php b/lib/Db/ActorsRequest.php index ae155e13..98362caa 100644 --- a/lib/Db/ActorsRequest.php +++ b/lib/Db/ActorsRequest.php @@ -27,20 +27,20 @@ class ActorsRequest extends ActorsRequestBuilder { $qb = $this->getActorsInsertSql(); $qb->setValue('id', $qb->createNamedParameter($actor->getId())) - ->setValue('id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))) - ->setValue('user_id', $qb->createNamedParameter($actor->getUserId())) - ->setValue('name', $qb->createNamedParameter($actor->getName())) - ->setValue('summary', $qb->createNamedParameter($actor->getSummary())) - ->setValue('avatar_version', $qb->createNamedParameter($actor->getAvatarVersion())) - ->setValue( - 'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername()) - ) - ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey())) - ->setValue('private_key', $qb->createNamedParameter($actor->getPrivateKey())) - ->setValue( - 'creation', - $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE) - ); + ->setValue('id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))) + ->setValue('user_id', $qb->createNamedParameter($actor->getUserId())) + ->setValue('name', $qb->createNamedParameter($actor->getName())) + ->setValue('summary', $qb->createNamedParameter($actor->getSummary())) + ->setValue('avatar_version', $qb->createNamedParameter($actor->getAvatarVersion())) + ->setValue( + 'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername()) + ) + ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey())) + ->setValue('private_key', $qb->createNamedParameter($actor->getPrivateKey())) + ->setValue( + 'creation', + $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE) + ); $qb->executeStatement(); } @@ -56,7 +56,7 @@ class ActorsRequest extends ActorsRequestBuilder { public function refreshKeys(Person $actor): void { $qb = $this->getActorsUpdateSql(); $qb->set('public_key', $qb->createNamedParameter($actor->getPublicKey())) - ->set('private_key', $qb->createNamedParameter($actor->getPrivateKey())); + ->set('private_key', $qb->createNamedParameter($actor->getPrivateKey())); try { $qb->set( diff --git a/lib/Db/ActorsRequestBuilder.php b/lib/Db/ActorsRequestBuilder.php index 97feb183..8084fc9f 100644 --- a/lib/Db/ActorsRequestBuilder.php +++ b/lib/Db/ActorsRequestBuilder.php @@ -56,7 +56,7 @@ class ActorsRequestBuilder extends CoreRequestBuilder { 'a.id', 'a.id_prim', 'a.user_id', 'a.preferred_username', 'a.name', 'a.summary', 'a.public_key', 'a.avatar_version', 'a.private_key', 'a.creation', 'a.deleted' ) - ->from(self::TABLE_ACTORS, 'a'); + ->from(self::TABLE_ACTORS, 'a'); $this->defaultSelectAlias = 'a'; $qb->setDefaultSelectAlias('a'); @@ -91,18 +91,18 @@ class ActorsRequestBuilder extends CoreRequestBuilder { $actor->importFromDatabase($data); $actor->setType('Person'); $actor->setInbox($actor->getId() . '/inbox') - ->setOutbox($actor->getId() . '/outbox') - ->setUserId($this->get('user_id', $data, '')) - ->setFollowers($actor->getId() . '/followers') - ->setFollowing($actor->getId() . '/following') - ->setSharedInbox($root . 'inbox') - ->setLocal(true) - ->setAvatarVersion($this->getInt('avatar_version', $data, -1)) - ->setAccount( - $actor->getPreferredUsername() . '@' . $this->configService->getSocialAddress() - ); + ->setOutbox($actor->getId() . '/outbox') + ->setUserId($this->get('user_id', $data, '')) + ->setFollowers($actor->getId() . '/followers') + ->setFollowing($actor->getId() . '/following') + ->setSharedInbox($root . 'inbox') + ->setLocal(true) + ->setAvatarVersion($this->getInt('avatar_version', $data, -1)) + ->setAccount( + $actor->getPreferredUsername() . '@' . $this->configService->getSocialAddress() + ); $actor->setUrlSocial($root) - ->setUrl($actor->getId()); + ->setUrl($actor->getId()); return $actor; } diff --git a/lib/Db/CacheActorsRequest.php b/lib/Db/CacheActorsRequest.php index f48712e4..fe3187ce 100644 --- a/lib/Db/CacheActorsRequest.php +++ b/lib/Db/CacheActorsRequest.php @@ -30,25 +30,25 @@ class CacheActorsRequest extends CacheActorsRequestBuilder { public function save(Person $actor): void { $qb = $this->getCacheActorsInsertSql(); $qb->setValue('id', $qb->createNamedParameter($actor->getId())) - ->setValue('id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))) - ->setValue('account', $qb->createNamedParameter($actor->getAccount())) - ->setValue('type', $qb->createNamedParameter($actor->getType())) - ->setValue('local', $qb->createNamedParameter(($actor->isLocal()) ? '1' : '0')) - ->setValue('following', $qb->createNamedParameter($actor->getFollowing())) - ->setValue('followers', $qb->createNamedParameter($actor->getFollowers())) - ->setValue('inbox', $qb->createNamedParameter($actor->getInbox())) - ->setValue('shared_inbox', $qb->createNamedParameter($actor->getSharedInbox())) - ->setValue('outbox', $qb->createNamedParameter($actor->getOutbox())) - ->setValue('featured', $qb->createNamedParameter($actor->getFeatured())) - ->setValue('url', $qb->createNamedParameter($actor->getUrl())) - ->setValue( - 'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername()) - ) - ->setValue('name', $qb->createNamedParameter($actor->getName())) - ->setValue('summary', $qb->createNamedParameter($actor->getSummary())) - ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey())) - ->setValue('source', $qb->createNamedParameter($actor->getSource())) - ->setValue('details', $qb->createNamedParameter(json_encode($actor->getDetailsAll()))); + ->setValue('id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))) + ->setValue('account', $qb->createNamedParameter($actor->getAccount())) + ->setValue('type', $qb->createNamedParameter($actor->getType())) + ->setValue('local', $qb->createNamedParameter(($actor->isLocal()) ? '1' : '0')) + ->setValue('following', $qb->createNamedParameter($actor->getFollowing())) + ->setValue('followers', $qb->createNamedParameter($actor->getFollowers())) + ->setValue('inbox', $qb->createNamedParameter($actor->getInbox())) + ->setValue('shared_inbox', $qb->createNamedParameter($actor->getSharedInbox())) + ->setValue('outbox', $qb->createNamedParameter($actor->getOutbox())) + ->setValue('featured', $qb->createNamedParameter($actor->getFeatured())) + ->setValue('url', $qb->createNamedParameter($actor->getUrl())) + ->setValue( + 'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername()) + ) + ->setValue('name', $qb->createNamedParameter($actor->getName())) + ->setValue('summary', $qb->createNamedParameter($actor->getSummary())) + ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey())) + ->setValue('source', $qb->createNamedParameter($actor->getSource())) + ->setValue('details', $qb->createNamedParameter(json_encode($actor->getDetailsAll()))); try { if ($actor->getCreation() > 0) { @@ -67,7 +67,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder { if ($actor->hasIcon()) { $iconId = $actor->getIcon() - ->getId(); + ->getId(); } else { $iconId = $actor->getIconId(); } @@ -85,20 +85,20 @@ class CacheActorsRequest extends CacheActorsRequestBuilder { public function update(Person $actor): int { $qb = $this->getCacheActorsUpdateSql(); $qb->set('following', $qb->createNamedParameter($actor->getFollowing())) - ->set('followers', $qb->createNamedParameter($actor->getFollowers())) - ->set('inbox', $qb->createNamedParameter($actor->getInbox())) - ->set('shared_inbox', $qb->createNamedParameter($actor->getSharedInbox())) - ->set('outbox', $qb->createNamedParameter($actor->getOutbox())) - ->set('featured', $qb->createNamedParameter($actor->getFeatured())) - ->set('url', $qb->createNamedParameter($actor->getUrl())) - ->set( - 'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername()) - ) - ->set('name', $qb->createNamedParameter($actor->getName())) - ->set('summary', $qb->createNamedParameter($actor->getSummary())) - ->set('public_key', $qb->createNamedParameter($actor->getPublicKey())) - ->set('source', $qb->createNamedParameter($actor->getSource())) - ->set('details', $qb->createNamedParameter(json_encode($actor->getDetailsAll()))); + ->set('followers', $qb->createNamedParameter($actor->getFollowers())) + ->set('inbox', $qb->createNamedParameter($actor->getInbox())) + ->set('shared_inbox', $qb->createNamedParameter($actor->getSharedInbox())) + ->set('outbox', $qb->createNamedParameter($actor->getOutbox())) + ->set('featured', $qb->createNamedParameter($actor->getFeatured())) + ->set('url', $qb->createNamedParameter($actor->getUrl())) + ->set( + 'preferred_username', $qb->createNamedParameter($actor->getPreferredUsername()) + ) + ->set('name', $qb->createNamedParameter($actor->getName())) + ->set('summary', $qb->createNamedParameter($actor->getSummary())) + ->set('public_key', $qb->createNamedParameter($actor->getPublicKey())) + ->set('source', $qb->createNamedParameter($actor->getSource())) + ->set('details', $qb->createNamedParameter(json_encode($actor->getDetailsAll()))); try { if ($actor->getCreation() > 0) { @@ -116,7 +116,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder { if ($actor->hasIcon()) { $iconId = $actor->getIcon() - ->getId(); + ->getId(); } else { $iconId = $actor->getIconId(); } @@ -266,7 +266,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder { public function getSharedInboxes(): array { $qb = $this->getQueryBuilder(); $qb->selectDistinct('shared_inbox') - ->from(self::TABLE_CACHE_ACTORS); + ->from(self::TABLE_CACHE_ACTORS); $inbox = []; $cursor = $qb->execute(); while ($data = $cursor->fetch()) { diff --git a/lib/Db/CacheActorsRequestBuilder.php b/lib/Db/CacheActorsRequestBuilder.php index 6097fc98..de533217 100644 --- a/lib/Db/CacheActorsRequestBuilder.php +++ b/lib/Db/CacheActorsRequestBuilder.php @@ -62,7 +62,7 @@ class CacheActorsRequestBuilder extends CoreRequestBuilder { 'ca.name', 'ca.summary', 'ca.public_key', 'ca.local', 'ca.details', 'ca.source', 'ca.creation', 'ca.details_update' ) - ->from(self::TABLE_CACHE_ACTORS, 'ca'); + ->from(self::TABLE_CACHE_ACTORS, 'ca'); $qb->setDefaultSelectAlias('ca'); @@ -152,7 +152,7 @@ class CacheActorsRequestBuilder extends CoreRequestBuilder { $link = Person::LINK_LOCAL; if ($qb->hasViewer() && $qb->getViewer() - ->getId() === $actor->getId()) { + ->getId() === $actor->getId()) { $link = Person::LINK_VIEWER; } } else { diff --git a/lib/Db/CacheDocumentsRequest.php b/lib/Db/CacheDocumentsRequest.php index 0e11e72f..8d0a48d6 100644 --- a/lib/Db/CacheDocumentsRequest.php +++ b/lib/Db/CacheDocumentsRequest.php @@ -21,20 +21,20 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder { public function save(Document $document): void { $qb = $this->getCacheDocumentsInsertSql(); $qb->setValue('id', $qb->createNamedParameter($document->getId())) - ->setValue('id_prim', $qb->createNamedParameter($qb->prim($document->getId()))) - ->setValue('account', $qb->createNamedParameter($document->getAccount())) - ->setValue('type', $qb->createNamedParameter($document->getType())) - ->setValue('url', $qb->createNamedParameter($document->getUrl())) - ->setValue('media_type', $qb->createNamedParameter($document->getMediaType())) - ->setValue('mime_type', $qb->createNamedParameter($document->getMimeType())) - ->setValue('error', $qb->createNamedParameter($document->getError())) - ->setValue('local_copy', $qb->createNamedParameter($document->getLocalCopy())) - ->setValue('resized_copy', $qb->createNamedParameter($document->getResizedCopy())) - ->setValue('blurhash', $qb->createNamedParameter($document->getBlurHash())) - ->setValue('description', $qb->createNamedParameter($document->getDescription())) - ->setValue('parent_id', $qb->createNamedParameter($document->getParentId())) - ->setValue('parent_id_prim', $qb->createNamedParameter($qb->prim($document->getParentId()))) - ->setValue('public', $qb->createNamedParameter(($document->isPublic()) ? '1' : '0')); + ->setValue('id_prim', $qb->createNamedParameter($qb->prim($document->getId()))) + ->setValue('account', $qb->createNamedParameter($document->getAccount())) + ->setValue('type', $qb->createNamedParameter($document->getType())) + ->setValue('url', $qb->createNamedParameter($document->getUrl())) + ->setValue('media_type', $qb->createNamedParameter($document->getMediaType())) + ->setValue('mime_type', $qb->createNamedParameter($document->getMimeType())) + ->setValue('error', $qb->createNamedParameter($document->getError())) + ->setValue('local_copy', $qb->createNamedParameter($document->getLocalCopy())) + ->setValue('resized_copy', $qb->createNamedParameter($document->getResizedCopy())) + ->setValue('blurhash', $qb->createNamedParameter($document->getBlurHash())) + ->setValue('description', $qb->createNamedParameter($document->getDescription())) + ->setValue('parent_id', $qb->createNamedParameter($document->getParentId())) + ->setValue('parent_id_prim', $qb->createNamedParameter($qb->prim($document->getParentId()))) + ->setValue('public', $qb->createNamedParameter(($document->isPublic()) ? '1' : '0')); // generate Meta $document->convertToMediaAttachment(); @@ -61,17 +61,17 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder { public function update(Document $document): void { $qb = $this->getCacheDocumentsUpdateSql(); $qb->set('type', $qb->createNamedParameter($document->getType())) - ->set('url', $qb->createNamedParameter($document->getUrl())) - ->set('media_type', $qb->createNamedParameter($document->getMediaType())) - ->set('mime_type', $qb->createNamedParameter($document->getMimeType())) - ->set('error', $qb->createNamedParameter($document->getError())) - ->set('local_copy', $qb->createNamedParameter($document->getLocalCopy())) - ->set('resized_copy', $qb->createNamedParameter($document->getResizedCopy())) - ->set('blurhash', $qb->createNamedParameter($document->getBlurHash())) - ->set('description', $qb->createNamedParameter($document->getDescription())) - ->set('parent_id', $qb->createNamedParameter($document->getParentId())) - ->set('parent_id_prim', $qb->createNamedParameter($qb->prim($document->getParentId()))) - ->set('public', $qb->createNamedParameter(($document->isPublic()) ? '1' : '0')); + ->set('url', $qb->createNamedParameter($document->getUrl())) + ->set('media_type', $qb->createNamedParameter($document->getMediaType())) + ->set('mime_type', $qb->createNamedParameter($document->getMimeType())) + ->set('error', $qb->createNamedParameter($document->getError())) + ->set('local_copy', $qb->createNamedParameter($document->getLocalCopy())) + ->set('resized_copy', $qb->createNamedParameter($document->getResizedCopy())) + ->set('blurhash', $qb->createNamedParameter($document->getBlurHash())) + ->set('description', $qb->createNamedParameter($document->getDescription())) + ->set('parent_id', $qb->createNamedParameter($document->getParentId())) + ->set('parent_id_prim', $qb->createNamedParameter($qb->prim($document->getParentId()))) + ->set('public', $qb->createNamedParameter(($document->isPublic()) ? '1' : '0')); try { $qb->set( @@ -262,7 +262,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder { public function moveAccount(string $actorId, string $newId): void { $qb = $this->getCacheDocumentsUpdateSql(); $qb->set('parent_id', $qb->createNamedParameter($newId)) - ->set('parent_id_prim', $qb->createNamedParameter($qb->prim($newId))); + ->set('parent_id_prim', $qb->createNamedParameter($qb->prim($newId))); $qb->limitToDBField('parent_id_prim', $qb->prim($actorId)); @@ -300,7 +300,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder { public function updateCopies(Document $document): void { $qb = $this->getCacheDocumentsUpdateSql(); $qb->set('local_copy', $qb->createNamedParameter($document->getLocalCopy())) - ->set('resized_copy', $qb->createNamedParameter($document->getResizedCopy())); + ->set('resized_copy', $qb->createNamedParameter($document->getResizedCopy())); $qb->limitToIdPrim($qb->prim($document->getId())); $qb->executeStatement(); diff --git a/lib/Db/CacheDocumentsRequestBuilder.php b/lib/Db/CacheDocumentsRequestBuilder.php index 447e26fc..47f3179f 100644 --- a/lib/Db/CacheDocumentsRequestBuilder.php +++ b/lib/Db/CacheDocumentsRequestBuilder.php @@ -44,7 +44,7 @@ class CacheDocumentsRequestBuilder extends CoreRequestBuilder { 'cd.error', 'cd.creation', 'cd.caching', 'cd.resized_copy', 'cd.meta', 'cd.blurhash', 'cd.description' ) - ->from(self::TABLE_CACHE_DOCUMENTS, 'cd'); + ->from(self::TABLE_CACHE_DOCUMENTS, 'cd'); $this->defaultSelectAlias = 'cd'; $qb->setDefaultSelectAlias('cd'); diff --git a/lib/Db/ClientRequest.php b/lib/Db/ClientRequest.php index 2d0206fb..fe86fff6 100644 --- a/lib/Db/ClientRequest.php +++ b/lib/Db/ClientRequest.php @@ -32,13 +32,13 @@ class ClientRequest extends ClientRequestBuilder { public function saveApp(SocialClient $client): void { $qb = $this->getClientInsertSql(); $qb->setValue('app_name', $qb->createNamedParameter($client->getAppName())) - ->setValue('app_website', $qb->createNamedParameter($client->getAppWebsite())) - ->setValue( - 'app_redirect_uris', $qb->createNamedParameter(json_encode($client->getAppRedirectUris())) - ) - ->setValue('app_client_id', $qb->createNamedParameter($client->getAppClientId())) - ->setValue('app_client_secret', $qb->createNamedParameter($client->getAppClientSecret())) - ->setValue('app_scopes', $qb->createNamedParameter(json_encode($client->getAppScopes()))); + ->setValue('app_website', $qb->createNamedParameter($client->getAppWebsite())) + ->setValue( + 'app_redirect_uris', $qb->createNamedParameter(json_encode($client->getAppRedirectUris())) + ) + ->setValue('app_client_id', $qb->createNamedParameter($client->getAppClientId())) + ->setValue('app_client_secret', $qb->createNamedParameter($client->getAppClientSecret())) + ->setValue('app_scopes', $qb->createNamedParameter(json_encode($client->getAppScopes()))); try { $dt = new DateTime('now'); diff --git a/lib/Db/ClientRequestBuilder.php b/lib/Db/ClientRequestBuilder.php index 73817be6..39a6ef61 100644 --- a/lib/Db/ClientRequestBuilder.php +++ b/lib/Db/ClientRequestBuilder.php @@ -64,7 +64,7 @@ class ClientRequestBuilder extends CoreRequestBuilder { 'cl.app_client_secret', 'cl.app_scopes', 'cl.auth_scopes', 'cl.auth_account', 'cl.auth_user_id', 'cl.auth_code', 'cl.token', 'cl.last_update', 'cl.creation' ) - ->from(self::TABLE_CLIENT, 'cl'); + ->from(self::TABLE_CLIENT, 'cl'); $this->defaultSelectAlias = 'cl'; $qb->setDefaultSelectAlias('cl'); diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php index 71fd8717..75519ede 100644 --- a/lib/Db/CoreRequestBuilder.php +++ b/lib/Db/CoreRequestBuilder.php @@ -254,7 +254,7 @@ class CoreRequestBuilder { LoggerInterface $logger, IURLGenerator $urlGenerator, ConfigService $configService, - MiscService $miscService + MiscService $miscService, ) { $this->dbConnection = $connection; $this->logger = $logger; @@ -689,14 +689,14 @@ class CoreRequestBuilder { * @param string $alias */ protected function limitToDBField( - IQueryBuilder &$qb, string $field, string $value, bool $cs = true, string $alias = '' + IQueryBuilder &$qb, string $field, string $value, bool $cs = true, string $alias = '', ) { $expr = $this->exprLimitToDBField($qb, $field, $value, true, $cs, $alias); $qb->andWhere($expr); } protected function filterDBField( - IQueryBuilder &$qb, string $field, string $value, bool $cs = true, string $alias = '' + IQueryBuilder &$qb, string $field, string $value, bool $cs = true, string $alias = '', ) { $expr = $this->exprLimitToDBField($qb, $field, $value, false, $cs, $alias); $qb->andWhere($expr); @@ -704,7 +704,7 @@ class CoreRequestBuilder { protected function exprLimitToDBField( IQueryBuilder &$qb, string $field, string $value, bool $eq = true, bool $cs = true, - string $alias = '' + string $alias = '', ): string { $expr = $qb->expr(); @@ -731,14 +731,14 @@ class CoreRequestBuilder { } protected function limitToDBFieldInt( - IQueryBuilder &$qb, string $field, int $value, string $alias = '' + IQueryBuilder &$qb, string $field, int $value, string $alias = '', ): void { $expr = $this->exprLimitToDBFieldInt($qb, $field, $value, $alias); $qb->andWhere($expr); } protected function exprLimitToDBFieldInt( - IQueryBuilder &$qb, string $field, int $value, string $alias = '' + IQueryBuilder &$qb, string $field, int $value, string $alias = '', ): string { $expr = $qb->expr(); @@ -773,7 +773,7 @@ class CoreRequestBuilder { * @param bool $orNull */ protected function limitToDBFieldDateTime( - IQueryBuilder &$qb, string $field, DateTime $date, bool $orNull = false + IQueryBuilder &$qb, string $field, DateTime $date, bool $orNull = false, ) { $expr = $qb->expr(); $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->defaultSelectAlias . '.' : ''; @@ -854,7 +854,7 @@ class CoreRequestBuilder { * @deprecated - use SocialCrossQueryBuilder:leftJoinCacheActor */ protected function leftJoinCacheActors( - IQueryBuilder &$qb, string $fieldActorId, Person $author = null, string $alias = '' + IQueryBuilder &$qb, string $fieldActorId, ?Person $author = null, string $alias = '', ) { if ($qb->getType() !== QueryBuilder::SELECT) { return; @@ -866,22 +866,22 @@ class CoreRequestBuilder { $pf = ($alias === '') ? $this->defaultSelectAlias : $alias; $qb->selectAlias('ca.id', 'cacheactor_id') - ->selectAlias('ca.type', 'cacheactor_type') - ->selectAlias('ca.account', 'cacheactor_account') - ->selectAlias('ca.following', 'cacheactor_following') - ->selectAlias('ca.followers', 'cacheactor_followers') - ->selectAlias('ca.inbox', 'cacheactor_inbox') - ->selectAlias('ca.shared_inbox', 'cacheactor_shared_inbox') - ->selectAlias('ca.outbox', 'cacheactor_outbox') - ->selectAlias('ca.featured', 'cacheactor_featured') - ->selectAlias('ca.url', 'cacheactor_url') - ->selectAlias('ca.preferred_username', 'cacheactor_preferred_username') - ->selectAlias('ca.name', 'cacheactor_name') - ->selectAlias('ca.summary', 'cacheactor_summary') - ->selectAlias('ca.public_key', 'cacheactor_public_key') - ->selectAlias('ca.source', 'cacheactor_source') - ->selectAlias('ca.creation', 'cacheactor_creation') - ->selectAlias('ca.local', 'cacheactor_local'); + ->selectAlias('ca.type', 'cacheactor_type') + ->selectAlias('ca.account', 'cacheactor_account') + ->selectAlias('ca.following', 'cacheactor_following') + ->selectAlias('ca.followers', 'cacheactor_followers') + ->selectAlias('ca.inbox', 'cacheactor_inbox') + ->selectAlias('ca.shared_inbox', 'cacheactor_shared_inbox') + ->selectAlias('ca.outbox', 'cacheactor_outbox') + ->selectAlias('ca.featured', 'cacheactor_featured') + ->selectAlias('ca.url', 'cacheactor_url') + ->selectAlias('ca.preferred_username', 'cacheactor_preferred_username') + ->selectAlias('ca.name', 'cacheactor_name') + ->selectAlias('ca.summary', 'cacheactor_summary') + ->selectAlias('ca.public_key', 'cacheactor_public_key') + ->selectAlias('ca.source', 'cacheactor_source') + ->selectAlias('ca.creation', 'cacheactor_creation') + ->selectAlias('ca.local', 'cacheactor_local'); $orX = $expr->orX(); $orX->add($expr->eq($func->lower($pf . '.' . $fieldActorId), $func->lower('ca.id'))); @@ -910,7 +910,7 @@ class CoreRequestBuilder { * @param string $fieldActorId * @param string $alias */ - protected function leftJoinAccounts(IQueryBuilder &$qb, string $fieldActorId, string $alias = '' + protected function leftJoinAccounts(IQueryBuilder &$qb, string $fieldActorId, string $alias = '', ) { if ($qb->getType() !== QueryBuilder::SELECT) { return; @@ -922,11 +922,11 @@ class CoreRequestBuilder { $pf = ($alias === '') ? $this->defaultSelectAlias : $alias; $qb->selectAlias('lja.id', 'accounts_id') - ->selectAlias('lja.user_id', 'accounts_user_id') - ->selectAlias('lja.preferred_username', 'accounts_preferred_username') - ->selectAlias('lja.name', 'accounts_name') - ->selectAlias('lja.summary', 'accounts_summary') - ->selectAlias('lja.public_key', 'accounts_public_key'); + ->selectAlias('lja.user_id', 'accounts_user_id') + ->selectAlias('lja.preferred_username', 'accounts_preferred_username') + ->selectAlias('lja.name', 'accounts_name') + ->selectAlias('lja.summary', 'accounts_summary') + ->selectAlias('lja.public_key', 'accounts_public_key'); $on = $expr->eq( $func->lower($pf . '.' . $fieldActorId), @@ -978,11 +978,11 @@ class CoreRequestBuilder { $expr = $qb->expr(); $qb->selectAlias('sa.id', 'streamaction_id') - ->selectAlias('sa.actor_id', 'streamaction_actor_id') - ->selectAlias('sa.stream_id', 'streamaction_stream_id') - ->selectAlias('sa.liked', 'streamaction_liked') - ->selectAlias('sa.boosted', 'streamaction_boosted') - ->selectAlias('sa.replied', 'streamaction_replied'); + ->selectAlias('sa.actor_id', 'streamaction_actor_id') + ->selectAlias('sa.stream_id', 'streamaction_stream_id') + ->selectAlias('sa.liked', 'streamaction_liked') + ->selectAlias('sa.boosted', 'streamaction_boosted') + ->selectAlias('sa.replied', 'streamaction_replied'); $orX = $expr->orX(); $orX->add($expr->eq('sa.stream_id_prim', $pf . '.id_prim')); @@ -1043,9 +1043,9 @@ class CoreRequestBuilder { $pf = $this->defaultSelectAlias; $qb->selectAlias('a.id', 'action_id') - ->selectAlias('a.actor_id', 'action_actor_id') - ->selectAlias('a.object_id', 'action_object_id') - ->selectAlias('a.type', 'action_type'); + ->selectAlias('a.actor_id', 'action_actor_id') + ->selectAlias('a.object_id', 'action_object_id') + ->selectAlias('a.type', 'action_type'); $andX = $expr->andX(); $andX->add($expr->eq($func->lower($pf . '.id'), $func->lower('a.object_id'))); @@ -1090,7 +1090,7 @@ class CoreRequestBuilder { */ protected function leftJoinFollowAsViewer( IQueryBuilder &$qb, string $fieldActorId, bool $asFollower = true, - string $prefix = 'follow', string $pf = '' + string $prefix = 'follow', string $pf = '', ) { if ($qb->getType() !== QueryBuilder::SELECT) { return; @@ -1135,15 +1135,15 @@ class CoreRequestBuilder { } $qb->selectAlias($prefix . '_f.id', $prefix . '_id') - ->selectAlias($prefix . '_f.type', $prefix . '_type') - ->selectAlias($prefix . '_f.actor_id', $prefix . '_actor_id') - ->selectAlias($prefix . '_f.object_id', $prefix . '_object_id') - ->selectAlias($prefix . '_f.follow_id', $prefix . '_follow_id') - ->selectAlias($prefix . '_f.creation', $prefix . '_creation') - ->leftJoin( - $this->defaultSelectAlias, CoreRequestBuilder::TABLE_FOLLOWS, $prefix . '_f', - $andX - ); + ->selectAlias($prefix . '_f.type', $prefix . '_type') + ->selectAlias($prefix . '_f.actor_id', $prefix . '_actor_id') + ->selectAlias($prefix . '_f.object_id', $prefix . '_object_id') + ->selectAlias($prefix . '_f.follow_id', $prefix . '_follow_id') + ->selectAlias($prefix . '_f.creation', $prefix . '_creation') + ->leftJoin( + $this->defaultSelectAlias, CoreRequestBuilder::TABLE_FOLLOWS, $prefix . '_f', + $andX + ); } diff --git a/lib/Db/FollowsRequest.php b/lib/Db/FollowsRequest.php index 700ba202..b9eb26c1 100644 --- a/lib/Db/FollowsRequest.php +++ b/lib/Db/FollowsRequest.php @@ -34,14 +34,14 @@ class FollowsRequest extends FollowsRequestBuilder { public function save(Follow $follow) { $qb = $this->getFollowsInsertSql(); $qb->setValue('id', $qb->createNamedParameter($follow->getId())) - ->setValue('actor_id', $qb->createNamedParameter($follow->getActorId())) - ->setValue('type', $qb->createNamedParameter($follow->getType())) - ->setValue('object_id', $qb->createNamedParameter($follow->getObjectId())) - ->setValue('follow_id', $qb->createNamedParameter($follow->getFollowId())) - ->setValue('accepted', $qb->createNamedParameter(($follow->isAccepted()) ? '1' : '0')) - ->setValue('actor_id_prim', $qb->createNamedParameter($qb->prim($follow->getActorId()))) - ->setValue('object_id_prim', $qb->createNamedParameter($qb->prim($follow->getObjectId()))) - ->setValue('follow_id_prim', $qb->createNamedParameter($qb->prim($follow->getFollowId()))); + ->setValue('actor_id', $qb->createNamedParameter($follow->getActorId())) + ->setValue('type', $qb->createNamedParameter($follow->getType())) + ->setValue('object_id', $qb->createNamedParameter($follow->getObjectId())) + ->setValue('follow_id', $qb->createNamedParameter($follow->getFollowId())) + ->setValue('accepted', $qb->createNamedParameter(($follow->isAccepted()) ? '1' : '0')) + ->setValue('actor_id_prim', $qb->createNamedParameter($qb->prim($follow->getActorId()))) + ->setValue('object_id_prim', $qb->createNamedParameter($qb->prim($follow->getObjectId()))) + ->setValue('follow_id_prim', $qb->createNamedParameter($qb->prim($follow->getFollowId()))); try { $qb->setValue( @@ -59,14 +59,14 @@ class FollowsRequest extends FollowsRequestBuilder { public function generateLoopbackAccount(Person $actor) { $qb = $this->getFollowsInsertSql(); $qb->setValue('id', $qb->createNamedParameter($actor->getId())) - ->setValue('actor_id', $qb->createNamedParameter($actor->getId())) - ->setValue('type', $qb->createNamedParameter('Loopback')) - ->setValue('object_id', $qb->createNamedParameter($actor->getId())) - ->setValue('follow_id', $qb->createNamedParameter($actor->getId())) - ->setValue('accepted', $qb->createNamedParameter('1')) - ->setValue('actor_id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))) - ->setValue('object_id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))) - ->setValue('follow_id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))); + ->setValue('actor_id', $qb->createNamedParameter($actor->getId())) + ->setValue('type', $qb->createNamedParameter('Loopback')) + ->setValue('object_id', $qb->createNamedParameter($actor->getId())) + ->setValue('follow_id', $qb->createNamedParameter($actor->getId())) + ->setValue('accepted', $qb->createNamedParameter('1')) + ->setValue('actor_id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))) + ->setValue('object_id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))) + ->setValue('follow_id_prim', $qb->createNamedParameter($qb->prim($actor->getId()))); try { $qb->setValue( @@ -290,9 +290,9 @@ class FollowsRequest extends FollowsRequestBuilder { public function moveAccountFollowers(string $actorId, Person $new): void { $qb = $this->getFollowsUpdateSql(); $qb->set('object_id', $qb->createNamedParameter($new->getId())) - ->set('object_id_prim', $qb->createNamedParameter($qb->prim($new->getId()))) - ->set('follow_id', $qb->createNamedParameter($new->getFollowers())) - ->set('follow_id_prim', $qb->createNamedParameter($qb->prim($new->getFollowers()))); + ->set('object_id_prim', $qb->createNamedParameter($qb->prim($new->getId()))) + ->set('follow_id', $qb->createNamedParameter($new->getFollowers())) + ->set('follow_id_prim', $qb->createNamedParameter($qb->prim($new->getFollowers()))); $qb->limitToObjectIdPrim($qb->prim($actorId)); @@ -307,7 +307,7 @@ class FollowsRequest extends FollowsRequestBuilder { public function moveAccountFollowing(string $actorId, Person $new): void { $qb = $this->getFollowsUpdateSql(); $qb->set('actor_id', $qb->createNamedParameter($new->getId())) - ->set('actor_id_prim', $qb->createNamedParameter($qb->prim($new->getId()))); + ->set('actor_id_prim', $qb->createNamedParameter($qb->prim($new->getId()))); $qb->limitToActorIdPrim($qb->prim($actorId)); diff --git a/lib/Db/FollowsRequestBuilder.php b/lib/Db/FollowsRequestBuilder.php index 6e301ca8..c2df7792 100644 --- a/lib/Db/FollowsRequestBuilder.php +++ b/lib/Db/FollowsRequestBuilder.php @@ -62,7 +62,7 @@ class FollowsRequestBuilder extends CoreRequestBuilder { $qb->select( 'f.id', 'f.type', 'f.actor_id', 'f.object_id', 'f.follow_id', 'f.accepted', 'f.creation' ) - ->from(self::TABLE_FOLLOWS, 'f'); + ->from(self::TABLE_FOLLOWS, 'f'); $this->defaultSelectAlias = 'f'; $qb->setDefaultSelectAlias('f'); @@ -79,7 +79,7 @@ class FollowsRequestBuilder extends CoreRequestBuilder { protected function countFollowsSelectSql(): SocialQueryBuilder { $qb = $this->getQueryBuilder(); $qb->selectAlias($qb->createFunction('COUNT(*)'), 'count') - ->from(self::TABLE_FOLLOWS, 'f'); + ->from(self::TABLE_FOLLOWS, 'f'); $qb->setDefaultSelectAlias('f'); $this->defaultSelectAlias = 'f'; diff --git a/lib/Db/HashtagsRequest.php b/lib/Db/HashtagsRequest.php index 9548c0b9..85983385 100644 --- a/lib/Db/HashtagsRequest.php +++ b/lib/Db/HashtagsRequest.php @@ -30,7 +30,7 @@ class HashtagsRequest extends HashtagsRequestBuilder { public function save(string $hashtag, array $trend) { $qb = $this->getHashtagsInsertSql(); $qb->setValue('hashtag', $qb->createNamedParameter($hashtag)) - ->setValue('trend', $qb->createNamedParameter(json_encode($trend))); + ->setValue('trend', $qb->createNamedParameter(json_encode($trend))); $qb->execute(); } diff --git a/lib/Db/HashtagsRequestBuilder.php b/lib/Db/HashtagsRequestBuilder.php index 052e19ea..1a2463cb 100644 --- a/lib/Db/HashtagsRequestBuilder.php +++ b/lib/Db/HashtagsRequestBuilder.php @@ -56,7 +56,7 @@ class HashtagsRequestBuilder extends CoreRequestBuilder { /** @noinspection PhpMethodParametersCountMismatchInspection */ $qb->select('h.hashtag', 'h.trend') - ->from(self::TABLE_HASHTAGS, 'h'); + ->from(self::TABLE_HASHTAGS, 'h'); $this->defaultSelectAlias = 'h'; $qb->setDefaultSelectAlias('h'); diff --git a/lib/Db/InstancesRequest.php b/lib/Db/InstancesRequest.php index bc5ef624..db1cd74d 100644 --- a/lib/Db/InstancesRequest.php +++ b/lib/Db/InstancesRequest.php @@ -26,7 +26,7 @@ class InstancesRequest extends InstancesRequestBuilder { /** * @param Instance $instance - * TODO: store instance in db + * TODO: store instance in db */ public function save(Instance $instance) { // $now = new DateTime('now'); diff --git a/lib/Db/InstancesRequestBuilder.php b/lib/Db/InstancesRequestBuilder.php index 85d276cf..01f01fad 100644 --- a/lib/Db/InstancesRequestBuilder.php +++ b/lib/Db/InstancesRequestBuilder.php @@ -63,7 +63,7 @@ class InstancesRequestBuilder extends CoreRequestBuilder { 'i.local', 'i.uri', 'i.title', 'i.version', 'i.short_description', 'i.description', 'i.email', 'i.urls', 'i.stats', 'i.usage', 'i.image', 'i.languages', 'i.contact', 'i.account_prim' ) - ->from(self::TABLE_INSTANCE, 'i'); + ->from(self::TABLE_INSTANCE, 'i'); $qb->setDefaultSelectAlias('i'); diff --git a/lib/Db/RequestQueueRequest.php b/lib/Db/RequestQueueRequest.php index 3485f490..ed35bfcb 100644 --- a/lib/Db/RequestQueueRequest.php +++ b/lib/Db/RequestQueueRequest.php @@ -42,17 +42,17 @@ class RequestQueueRequest extends RequestQueueRequestBuilder { public function create(RequestQueue $queue): void { $qb = $this->getRequestQueueInsertSql(); $qb->setValue('token', $qb->createNamedParameter($queue->getToken())) - ->setValue('author', $qb->createNamedParameter($queue->getAuthor())) - ->setValue('author_prim', $qb->createNamedParameter($qb->prim($queue->getAuthor()))) - ->setValue('activity', $qb->createNamedParameter($queue->getActivity())) - ->setValue( - 'instance', $qb->createNamedParameter( - json_encode($queue->getInstance(), JSON_UNESCAPED_SLASHES) - ) - ) - ->setValue('priority', $qb->createNamedParameter($queue->getPriority())) - ->setValue('status', $qb->createNamedParameter($queue->getStatus())) - ->setValue('tries', $qb->createNamedParameter($queue->getTries())); + ->setValue('author', $qb->createNamedParameter($queue->getAuthor())) + ->setValue('author_prim', $qb->createNamedParameter($qb->prim($queue->getAuthor()))) + ->setValue('activity', $qb->createNamedParameter($queue->getActivity())) + ->setValue( + 'instance', $qb->createNamedParameter( + json_encode($queue->getInstance(), JSON_UNESCAPED_SLASHES) + ) + ) + ->setValue('priority', $qb->createNamedParameter($queue->getPriority())) + ->setValue('status', $qb->createNamedParameter($queue->getStatus())) + ->setValue('tries', $qb->createNamedParameter($queue->getTries())); $qb->executeStatement(); } @@ -112,10 +112,10 @@ class RequestQueueRequest extends RequestQueueRequestBuilder { public function setAsRunning(RequestQueue &$queue): void { $qb = $this->getRequestQueueUpdateSql(); $qb->set('status', $qb->createNamedParameter(RequestQueue::STATUS_RUNNING)) - ->set( - 'last', - $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE) - ); + ->set( + 'last', + $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE) + ); $this->limitToId($qb, $queue->getId()); $this->limitToStatus($qb, RequestQueue::STATUS_STANDBY); @@ -157,7 +157,7 @@ class RequestQueueRequest extends RequestQueueRequestBuilder { $expr = $qb->expr(); $qb->set('status', $qb->createNamedParameter(RequestQueue::STATUS_STANDBY)) - ->set('tries', $func->add('tries', $expr->literal(1))); + ->set('tries', $func->add('tries', $expr->literal(1))); $this->limitToId($qb, $queue->getId()); $this->limitToStatus($qb, RequestQueue::STATUS_RUNNING); diff --git a/lib/Db/RequestQueueRequestBuilder.php b/lib/Db/RequestQueueRequestBuilder.php index eac61935..7eeee83f 100644 --- a/lib/Db/RequestQueueRequestBuilder.php +++ b/lib/Db/RequestQueueRequestBuilder.php @@ -55,7 +55,7 @@ class RequestQueueRequestBuilder extends CoreRequestBuilder { 'rq.id', 'rq.token', 'rq.author', 'rq.activity', 'rq.instance', 'rq.priority', 'rq.status', 'rq.tries', 'rq.last' ) - ->from(self::TABLE_REQUEST_QUEUE, 'rq'); + ->from(self::TABLE_REQUEST_QUEUE, 'rq'); $this->defaultSelectAlias = 'rq'; $qb->setDefaultSelectAlias('rq'); diff --git a/lib/Db/SocialCoreQueryBuilder.php b/lib/Db/SocialCoreQueryBuilder.php index 2b9f94f6..5b5d3ca8 100644 --- a/lib/Db/SocialCoreQueryBuilder.php +++ b/lib/Db/SocialCoreQueryBuilder.php @@ -22,15 +22,15 @@ use Psr\Log\LoggerInterface; * @package OCA\Social\Db */ class SocialCoreQueryBuilder extends ExtendedQueryBuilder { - protected IURLGenerator $urlGenerator; private ?Person $viewer = null; public function __construct( - IDBConnection $connection, SystemConfig $systemConfig, LoggerInterface $logger, IURLGenerator $urlGenerator + IDBConnection $connection, + SystemConfig $systemConfig, + LoggerInterface $logger, + protected IURLGenerator $urlGenerator, ) { parent::__construct($connection, $systemConfig, $logger); - - $this->urlGenerator = $urlGenerator; } diff --git a/lib/Db/SocialCrossQueryBuilder.php b/lib/Db/SocialCrossQueryBuilder.php index 638c0895..5da722e7 100644 --- a/lib/Db/SocialCrossQueryBuilder.php +++ b/lib/Db/SocialCrossQueryBuilder.php @@ -88,25 +88,25 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { } $this->selectAlias($pf . '.id', 'cacheactor_id') - ->selectAlias($pf . '.nid', 'cacheactor_nid') - ->selectAlias($pf . '.type', 'cacheactor_type') - ->selectAlias($pf . '.icon_id', 'cacheactor_icon_id') - ->selectAlias($pf . '.account', 'cacheactor_account') - ->selectAlias($pf . '.following', 'cacheactor_following') - ->selectAlias($pf . '.followers', 'cacheactor_followers') - ->selectAlias($pf . '.inbox', 'cacheactor_inbox') - ->selectAlias($pf . '.shared_inbox', 'cacheactor_shared_inbox') - ->selectAlias($pf . '.outbox', 'cacheactor_outbox') - ->selectAlias($pf . '.featured', 'cacheactor_featured') - ->selectAlias($pf . '.url', 'cacheactor_url') - ->selectAlias($pf . '.preferred_username', 'cacheactor_preferred_username') - ->selectAlias($pf . '.name', 'cacheactor_name') - ->selectAlias($pf . '.summary', 'cacheactor_summary') - ->selectAlias($pf . '.public_key', 'cacheactor_public_key') - ->selectAlias($pf . '.source', 'cacheactor_source') - ->selectAlias($pf . '.details', 'cacheactor_details') - ->selectAlias($pf . '.creation', 'cacheactor_creation') - ->selectAlias($pf . '.local', 'cacheactor_local'); + ->selectAlias($pf . '.nid', 'cacheactor_nid') + ->selectAlias($pf . '.type', 'cacheactor_type') + ->selectAlias($pf . '.icon_id', 'cacheactor_icon_id') + ->selectAlias($pf . '.account', 'cacheactor_account') + ->selectAlias($pf . '.following', 'cacheactor_following') + ->selectAlias($pf . '.followers', 'cacheactor_followers') + ->selectAlias($pf . '.inbox', 'cacheactor_inbox') + ->selectAlias($pf . '.shared_inbox', 'cacheactor_shared_inbox') + ->selectAlias($pf . '.outbox', 'cacheactor_outbox') + ->selectAlias($pf . '.featured', 'cacheactor_featured') + ->selectAlias($pf . '.url', 'cacheactor_url') + ->selectAlias($pf . '.preferred_username', 'cacheactor_preferred_username') + ->selectAlias($pf . '.name', 'cacheactor_name') + ->selectAlias($pf . '.summary', 'cacheactor_summary') + ->selectAlias($pf . '.public_key', 'cacheactor_public_key') + ->selectAlias($pf . '.source', 'cacheactor_source') + ->selectAlias($pf . '.details', 'cacheactor_details') + ->selectAlias($pf . '.creation', 'cacheactor_creation') + ->selectAlias($pf . '.local', 'cacheactor_local'); $this->leftJoinCacheDocuments('icon_id', $pf, 'cacheactor_cachedocument_', 'cacd'); } @@ -122,7 +122,7 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { public function parseLeftJoinStream( array $data, string $prefix = '', - int $exportFormat = 0 + int $exportFormat = 0, ): Stream { $new = []; foreach ($data as $k => $v) { @@ -155,7 +155,7 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { public function parseLeftJoinCacheActors( array $data, string $prefix = '', - int $exportFormat = 0 + int $exportFormat = 0, ): Person { $new = []; @@ -199,7 +199,7 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { string $linkField, string $linkAlias = '', string $prefix = 'cachedocument_', - string $alias = 'cd' + string $alias = 'cd', ) { if ($this->getType() !== QueryBuilder::SELECT) { return; @@ -209,20 +209,20 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { $pf = (($linkAlias === '') ? $this->getDefaultSelectAlias() : $linkAlias); $this->selectAlias($alias . '.id', $prefix . 'id') - ->selectAlias($alias . '.type', $prefix . 'type') - ->selectAlias($alias . '.mime_type', $prefix . 'mime_type') - ->selectAlias($alias . '.media_type', $prefix . 'media_type') - ->selectAlias($alias . '.url', $prefix . 'url') - ->selectAlias($alias . '.local_copy', $prefix . 'local_copy') - ->selectAlias($alias . '.resized_copy', $prefix . 'resized_copy') - ->selectAlias($alias . '.caching', $prefix . 'caching') - ->selectAlias($alias . '.public', $prefix . 'public') - ->selectAlias($alias . '.error', $prefix . 'error') - ->selectAlias($alias . '.creation', $prefix . 'creation') - ->leftJoin( - $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_CACHE_DOCUMENTS, $alias, - $expr->eq($pf . '.' . $linkField, $alias . '.id_prim') - ); + ->selectAlias($alias . '.type', $prefix . 'type') + ->selectAlias($alias . '.mime_type', $prefix . 'mime_type') + ->selectAlias($alias . '.media_type', $prefix . 'media_type') + ->selectAlias($alias . '.url', $prefix . 'url') + ->selectAlias($alias . '.local_copy', $prefix . 'local_copy') + ->selectAlias($alias . '.resized_copy', $prefix . 'resized_copy') + ->selectAlias($alias . '.caching', $prefix . 'caching') + ->selectAlias($alias . '.public', $prefix . 'public') + ->selectAlias($alias . '.error', $prefix . 'error') + ->selectAlias($alias . '.creation', $prefix . 'creation') + ->leftJoin( + $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_CACHE_DOCUMENTS, $alias, + $expr->eq($pf . '.' . $linkField, $alias . '.id_prim') + ); } @@ -259,7 +259,7 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { public function leftJoinObjectStatus( string $link = 'object_id_prim', string $alias = '', - string $leftAlias = 'os' + string $leftAlias = 'os', ) { if ($this->getType() !== QueryBuilder::SELECT) { return; @@ -299,7 +299,7 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { string $alias = '', string $leftAlias = 'ca', string $prefix = '', - ?Person $author = null + ?Person $author = null, ) { if ($this->getType() !== QueryBuilder::SELECT) { return; @@ -361,11 +361,11 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { $pf = (($alias === '') ? $this->getDefaultSelectAlias() : $alias); $this->from(CoreRequestBuilder::TABLE_STREAM_ACTIONS, $pf); $this->selectAlias('sa.id', 'streamaction_id') - ->selectAlias('sa.actor_id', 'streamaction_actor_id') - ->selectAlias('sa.stream_id', 'streamaction_stream_id') - ->selectAlias('sa.liked', 'streamaction_liked') - ->selectAlias('sa.boosted', 'streamaction_boosted') - ->selectAlias('sa.replied', 'streamaction_replied'); + ->selectAlias('sa.actor_id', 'streamaction_actor_id') + ->selectAlias('sa.stream_id', 'streamaction_stream_id') + ->selectAlias('sa.liked', 'streamaction_liked') + ->selectAlias('sa.boosted', 'streamaction_boosted') + ->selectAlias('sa.replied', 'streamaction_replied'); } @@ -381,11 +381,11 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { $expr = $this->expr(); $this->selectAlias($alias . '.id', 'streamaction_id') - ->selectAlias($alias . '.actor_id', 'streamaction_actor_id') - ->selectAlias($alias . '.stream_id', 'streamaction_stream_id') - ->selectAlias($alias . '.liked', 'streamaction_liked') - ->selectAlias($alias . '.boosted', 'streamaction_boosted') - ->selectAlias($alias . '.replied', 'streamaction_replied'); + ->selectAlias($alias . '.actor_id', 'streamaction_actor_id') + ->selectAlias($alias . '.stream_id', 'streamaction_stream_id') + ->selectAlias($alias . '.liked', 'streamaction_liked') + ->selectAlias($alias . '.boosted', 'streamaction_boosted') + ->selectAlias($alias . '.replied', 'streamaction_replied'); $orX = $expr->orX(); $orX->add($expr->eq($alias . '.stream_id_prim', $pf . '.id_prim')); @@ -411,7 +411,7 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { * @param string $alias */ public function innerJoinStreamDest( - string $type, string $field = 'id_prim', string $aliasDest = 'sd', string $alias = '' + string $type, string $field = 'id_prim', string $aliasDest = 'sd', string $alias = '', ) { $this->andWhere($this->exprInnerJoinStreamDest($type, $field, $aliasDest, $alias)); } @@ -426,7 +426,7 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { * @return ICompositeExpression */ public function exprInnerJoinStreamDest( - string $type, string $field = 'id_prim', string $aliasDest = 'sd', string $alias = '' + string $type, string $field = 'id_prim', string $aliasDest = 'sd', string $alias = '', ): ICompositeExpression { $expr = $this->expr(); $andX = $expr->andX(); @@ -448,7 +448,7 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { */ public function innerJoinStreamDestFollowing( string $actorId, string $type, string $field = 'id_prim', string $aliasDest = 'sd', - string $aliasFollowing = 'f', string $alias = '' + string $aliasFollowing = 'f', string $alias = '', ) { $this->andWhere( $this->exprInnerJoinStreamDestFollowing( @@ -470,7 +470,7 @@ class SocialCrossQueryBuilder extends SocialCoreQueryBuilder { */ public function exprInnerJoinStreamDestFollowing( string $actorId, string $type, string $field = 'id_prim', string $aliasDest = 'sd', - string $aliasFollowing = 'f', string $alias = '' + string $aliasFollowing = 'f', string $alias = '', ): ICompositeExpression { $expr = $this->expr(); $andX = $expr->andX(); diff --git a/lib/Db/SocialLimitsQueryBuilder.php b/lib/Db/SocialLimitsQueryBuilder.php index aed7868e..372a49c6 100644 --- a/lib/Db/SocialLimitsQueryBuilder.php +++ b/lib/Db/SocialLimitsQueryBuilder.php @@ -387,7 +387,7 @@ class SocialLimitsQueryBuilder extends SocialCrossQueryBuilder { * * @return ICompositeExpression */ - public function exprLimitToDest(string $actorId, string $type, string $subType = '', string $alias = 'sd' + public function exprLimitToDest(string $actorId, string $type, string $subType = '', string $alias = 'sd', ): ICompositeExpression { $expr = $this->expr(); $andX = $expr->andX(); @@ -414,7 +414,7 @@ class SocialLimitsQueryBuilder extends SocialCrossQueryBuilder { */ public function limitToViewer( string $aliasDest = 'sd', string $aliasFollowing = 'f', bool $allowPublic = false, - bool $allowDirect = false + bool $allowDirect = false, ) { if (!$this->hasViewer()) { $this->selectDestFollowing($aliasDest); diff --git a/lib/Db/StreamActionsRequest.php b/lib/Db/StreamActionsRequest.php index 1c794a03..ec704145 100644 --- a/lib/Db/StreamActionsRequest.php +++ b/lib/Db/StreamActionsRequest.php @@ -30,12 +30,12 @@ class StreamActionsRequest extends StreamActionsRequestBuilder { $replied = $this->getBool(StreamAction::REPLIED, $values, false); $qb->setValue('actor_id', $qb->createNamedParameter($action->getActorId())) - ->setValue('actor_id_prim', $qb->createNamedParameter($qb->prim($action->getActorId()))) - ->setValue('stream_id', $qb->createNamedParameter($action->getStreamId())) - ->setValue('stream_id_prim', $qb->createNamedParameter($qb->prim($action->getStreamId()))) - ->setValue('liked', $qb->createNamedParameter(($liked) ? 1 : 0)) - ->setValue('boosted', $qb->createNamedParameter(($boosted) ? 1 : 0)) - ->setValue('replied', $qb->createNamedParameter(($replied) ? 1 : 0)); + ->setValue('actor_id_prim', $qb->createNamedParameter($qb->prim($action->getActorId()))) + ->setValue('stream_id', $qb->createNamedParameter($action->getStreamId())) + ->setValue('stream_id_prim', $qb->createNamedParameter($qb->prim($action->getStreamId()))) + ->setValue('liked', $qb->createNamedParameter(($liked) ? 1 : 0)) + ->setValue('boosted', $qb->createNamedParameter(($boosted) ? 1 : 0)) + ->setValue('replied', $qb->createNamedParameter(($replied) ? 1 : 0)); $qb->executeStatement(); } @@ -46,7 +46,7 @@ class StreamActionsRequest extends StreamActionsRequestBuilder { // update entry/field in database, based only on affected action // to avoid race condition on 2 different actions - foreach($action->getAffected() as $entry) { + foreach ($action->getAffected() as $entry) { $field = match ($entry) { StreamAction::LIKED => 'liked', StreamAction::BOOSTED => 'boosted', diff --git a/lib/Db/StreamActionsRequestBuilder.php b/lib/Db/StreamActionsRequestBuilder.php index 031411ad..7f6ec9fc 100644 --- a/lib/Db/StreamActionsRequestBuilder.php +++ b/lib/Db/StreamActionsRequestBuilder.php @@ -60,7 +60,7 @@ class StreamActionsRequestBuilder extends CoreRequestBuilder { 'sa.id', 'sa.actor_id', 'sa.stream_id', 'sa.boosted', 'sa.liked', 'sa.replied' ) - ->from(self::TABLE_STREAM_ACTIONS, 'sa'); + ->from(self::TABLE_STREAM_ACTIONS, 'sa'); $this->defaultSelectAlias = 'sa'; $qb->setDefaultSelectAlias('sa'); diff --git a/lib/Db/StreamDestRequest.php b/lib/Db/StreamDestRequest.php index d90e8d25..20eee0f9 100644 --- a/lib/Db/StreamDestRequest.php +++ b/lib/Db/StreamDestRequest.php @@ -36,7 +36,7 @@ class StreamDestRequest extends StreamDestRequestBuilder { public function __construct( IDBConnection $connection, LoggerInterface $logger, IURLGenerator $urlGenerator, CacheActorService $cacheActorService, - ConfigService $configService, MiscService $miscService + ConfigService $configService, MiscService $miscService, ) { parent::__construct($connection, $logger, $urlGenerator, $configService, $miscService); diff --git a/lib/Db/StreamDestRequestBuilder.php b/lib/Db/StreamDestRequestBuilder.php index e702540e..4309ef95 100644 --- a/lib/Db/StreamDestRequestBuilder.php +++ b/lib/Db/StreamDestRequestBuilder.php @@ -57,7 +57,7 @@ class StreamDestRequestBuilder extends CoreRequestBuilder { /** @noinspection PhpMethodParametersCountMismatchInspection */ $qb->select('sd.actor_id', 'sd.stream_id', 'sd.type', 'sd.subtype') - ->from(self::TABLE_STREAM_DEST, 'sd'); + ->from(self::TABLE_STREAM_DEST, 'sd'); $this->defaultSelectAlias = 'sd'; $qb->setDefaultSelectAlias('sd'); @@ -87,7 +87,7 @@ class StreamDestRequestBuilder extends CoreRequestBuilder { protected function countStreamDestSelectSql(): SocialQueryBuilder { $qb = $this->getQueryBuilder(); $qb->selectAlias($qb->createFunction('COUNT(*)'), 'count') - ->from(self::TABLE_STREAM_DEST, 'sd'); + ->from(self::TABLE_STREAM_DEST, 'sd'); $this->defaultSelectAlias = 'sd'; $qb->setDefaultSelectAlias('sd'); diff --git a/lib/Db/StreamQueueRequest.php b/lib/Db/StreamQueueRequest.php index ac963225..21cb6b0f 100644 --- a/lib/Db/StreamQueueRequest.php +++ b/lib/Db/StreamQueueRequest.php @@ -28,10 +28,10 @@ class StreamQueueRequest extends StreamQueueRequestBuilder { public function create(StreamQueue $queue) { $qb = $this->getStreamQueueInsertSql(); $qb->setValue('token', $qb->createNamedParameter($queue->getToken())) - ->setValue('stream_id', $qb->createNamedParameter($queue->getStreamId())) - ->setValue('type', $qb->createNamedParameter($queue->getType())) - ->setValue('status', $qb->createNamedParameter($queue->getStatus())) - ->setValue('tries', $qb->createNamedParameter($queue->getTries())); + ->setValue('stream_id', $qb->createNamedParameter($queue->getStreamId())) + ->setValue('type', $qb->createNamedParameter($queue->getType())) + ->setValue('status', $qb->createNamedParameter($queue->getStatus())) + ->setValue('tries', $qb->createNamedParameter($queue->getTries())); $qb->execute(); } @@ -87,10 +87,10 @@ class StreamQueueRequest extends StreamQueueRequestBuilder { public function setAsRunning(StreamQueue &$queue) { $qb = $this->getStreamQueueUpdateSql(); $qb->set('status', $qb->createNamedParameter(StreamQueue::STATUS_RUNNING)) - ->set( - 'last', - $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE) - ); + ->set( + 'last', + $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE) + ); $this->limitToId($qb, $queue->getId()); $this->limitToStatus($qb, StreamQueue::STATUS_STANDBY); @@ -136,7 +136,7 @@ class StreamQueueRequest extends StreamQueueRequestBuilder { $expr = $qb->expr(); $qb->set('status', $qb->createNamedParameter(StreamQueue::STATUS_STANDBY)) - ->set('tries', $func->add('tries', $expr->literal(1))); + ->set('tries', $func->add('tries', $expr->literal(1))); $this->limitToId($qb, $queue->getId()); $this->limitToStatus($qb, StreamQueue::STATUS_RUNNING); diff --git a/lib/Db/StreamQueueRequestBuilder.php b/lib/Db/StreamQueueRequestBuilder.php index d6402634..f0599374 100644 --- a/lib/Db/StreamQueueRequestBuilder.php +++ b/lib/Db/StreamQueueRequestBuilder.php @@ -54,7 +54,7 @@ class StreamQueueRequestBuilder extends CoreRequestBuilder { $qb->select( 'qs.id', 'qs.token', 'qs.stream_id', 'qs.type', 'qs.status', 'qs.tries', 'qs.last' ) - ->from(self::TABLE_STREAM_QUEUE, 'qs'); + ->from(self::TABLE_STREAM_QUEUE, 'qs'); $this->defaultSelectAlias = 'qs'; $qb->setDefaultSelectAlias('qs'); diff --git a/lib/Db/StreamRequest.php b/lib/Db/StreamRequest.php index 66784405..5c564fe3 100644 --- a/lib/Db/StreamRequest.php +++ b/lib/Db/StreamRequest.php @@ -42,7 +42,7 @@ class StreamRequest extends StreamRequestBuilder { public function __construct( IDBConnection $connection, LoggerInterface $logger, IURLGenerator $urlGenerator, StreamDestRequest $streamDestRequest, StreamTagsRequest $streamTagsRequest, - ConfigService $configService, MiscService $miscService + ConfigService $configService, MiscService $miscService, ) { parent::__construct($connection, $logger, $urlGenerator, $configService, $miscService); @@ -61,10 +61,10 @@ class StreamRequest extends StreamRequestBuilder { } $qb->setValue('hashtags', $qb->createNamedParameter(json_encode($stream->getHashtags()))) - ->setValue( - 'attachments', $qb->createNamedParameter(json_encode($attachments, JSON_UNESCAPED_SLASHES) - ) - ); + ->setValue( + 'attachments', $qb->createNamedParameter(json_encode($attachments, JSON_UNESCAPED_SLASHES) + ) + ); } try { @@ -194,7 +194,7 @@ class StreamRequest extends StreamRequestBuilder { public function getStreamById( string $id, bool $asViewer = false, - int $format = ACore::FORMAT_ACTIVITYPUB + int $format = ACore::FORMAT_ACTIVITYPUB, ): Stream { if ($id === '') { throw new StreamNotFoundException(); @@ -262,7 +262,7 @@ class StreamRequest extends StreamRequestBuilder { * @throws StreamNotFoundException * @throws DateTimeException */ - public function getRepliesByParentId(string $id, int $since = 0, int $limit = 5, bool $asViewer = false + public function getRepliesByParentId(string $id, int $since = 0, int $limit = 5, bool $asViewer = false, ): array { if ($id === '') { throw new StreamNotFoundException(); @@ -309,7 +309,7 @@ class StreamRequest extends StreamRequestBuilder { * @return Stream * @throws StreamNotFoundException */ - public function getStreamByObjectId(string $objectId, string $type, string $subType = '' + public function getStreamByObjectId(string $objectId, string $type, string $subType = '', ): Stream { if ($objectId === '') { throw new StreamNotFoundException('missing objectId'); @@ -593,7 +593,7 @@ class StreamRequest extends StreamRequestBuilder { * @deprecated - use getTimelineHome() */ public function getTimelineHome_dep( - int $since = 0, int $limit = 5, int $format = Stream::FORMAT_ACTIVITYPUB + int $since = 0, int $limit = 5, int $format = Stream::FORMAT_ACTIVITYPUB, ): array { $qb = $this->getStreamSelectSql($format); @@ -739,7 +739,7 @@ class StreamRequest extends StreamRequestBuilder { * @throws DateTimeException * @deprecated - use getTimelinePublic() */ - public function getTimelineGlobal_dep(int $since = 0, int $limit = 5, bool $localOnly = true + public function getTimelineGlobal_dep(int $since = 0, int $limit = 5, bool $localOnly = true, ): array { $qb = $this->getStreamSelectSql(); $qb->limitPaginate($since, $limit); @@ -873,7 +873,7 @@ class StreamRequest extends StreamRequestBuilder { public function updateAuthor(string $actorId, string $newId) { $qb = $this->getStreamUpdateSql(); $qb->set('attributed_to', $qb->createNamedParameter($newId)) - ->set('attributed_to_prim', $qb->createNamedParameter($qb->prim($newId))); + ->set('attributed_to_prim', $qb->createNamedParameter($qb->prim($newId))); $qb->limitToAttributedTo($actorId, true); $qb->executeStatement(); @@ -902,7 +902,7 @@ class StreamRequest extends StreamRequestBuilder { $attributedTo = $stream->getAttributedTo(); if ($attributedTo === '' && $stream->isLocal()) { $attributedTo = $stream->getActor() - ->getId(); + ->getId(); } if ($stream->getNid() === 0) { @@ -911,49 +911,49 @@ class StreamRequest extends StreamRequestBuilder { $qb = $this->getStreamInsertSql(); $qb->setValue('nid', $qb->createNamedParameter($stream->getNid())) - ->setValue('id', $qb->createNamedParameter($stream->getId())) - ->setValue('visibility', $qb->createNamedParameter($stream->getVisibility())) - ->setValue('type', $qb->createNamedParameter($stream->getType())) - ->setValue('subtype', $qb->createNamedParameter($stream->getSubType())) - ->setValue('to', $qb->createNamedParameter($stream->getTo())) - ->setValue( - 'to_array', $qb->createNamedParameter( - json_encode($stream->getToArray(), JSON_UNESCAPED_SLASHES) - ) - ) - ->setValue( - 'cc', $qb->createNamedParameter( - json_encode($stream->getCcArray(), JSON_UNESCAPED_SLASHES) - ) - ) - ->setValue( - 'bcc', $qb->createNamedParameter( - json_encode($stream->getBccArray(), JSON_UNESCAPED_SLASHES) - ) - ) - ->setValue('content', $qb->createNamedParameter($stream->getContent())) - ->setValue('summary', $qb->createNamedParameter($stream->getSummary())) - ->setValue('published', $qb->createNamedParameter($stream->getPublished())) - ->setValue('attributed_to', $qb->createNamedParameter($attributedTo)) - ->setValue('attributed_to_prim', $qb->createNamedParameter($qb->prim($attributedTo))) - ->setValue('in_reply_to', $qb->createNamedParameter($stream->getInReplyTo())) - ->setValue('in_reply_to_prim', $qb->createNamedParameter($qb->prim($stream->getInReplyTo()))) - ->setValue('source', $qb->createNamedParameter($stream->getSource())) - ->setValue('activity_id', $qb->createNamedParameter($stream->getActivityId())) - ->setValue('object_id', $qb->createNamedParameter($stream->getObjectId())) - ->setValue('object_id_prim', $qb->createNamedParameter($qb->prim($stream->getObjectId()))) - ->setValue('details', $qb->createNamedParameter(json_encode($stream->getDetailsAll()))) - ->setValue('cache', $qb->createNamedParameter($cache)) - ->setValue( - 'filter_duplicate', - $qb->createNamedParameter(($stream->isFilterDuplicate()) ? '1' : '0') - ) - ->setValue( - 'instances', $qb->createNamedParameter( - json_encode($stream->getInstancePaths(), JSON_UNESCAPED_SLASHES) - ) - ) - ->setValue('local', $qb->createNamedParameter(($stream->isLocal()) ? '1' : '0')); + ->setValue('id', $qb->createNamedParameter($stream->getId())) + ->setValue('visibility', $qb->createNamedParameter($stream->getVisibility())) + ->setValue('type', $qb->createNamedParameter($stream->getType())) + ->setValue('subtype', $qb->createNamedParameter($stream->getSubType())) + ->setValue('to', $qb->createNamedParameter($stream->getTo())) + ->setValue( + 'to_array', $qb->createNamedParameter( + json_encode($stream->getToArray(), JSON_UNESCAPED_SLASHES) + ) + ) + ->setValue( + 'cc', $qb->createNamedParameter( + json_encode($stream->getCcArray(), JSON_UNESCAPED_SLASHES) + ) + ) + ->setValue( + 'bcc', $qb->createNamedParameter( + json_encode($stream->getBccArray(), JSON_UNESCAPED_SLASHES) + ) + ) + ->setValue('content', $qb->createNamedParameter($stream->getContent())) + ->setValue('summary', $qb->createNamedParameter($stream->getSummary())) + ->setValue('published', $qb->createNamedParameter($stream->getPublished())) + ->setValue('attributed_to', $qb->createNamedParameter($attributedTo)) + ->setValue('attributed_to_prim', $qb->createNamedParameter($qb->prim($attributedTo))) + ->setValue('in_reply_to', $qb->createNamedParameter($stream->getInReplyTo())) + ->setValue('in_reply_to_prim', $qb->createNamedParameter($qb->prim($stream->getInReplyTo()))) + ->setValue('source', $qb->createNamedParameter($stream->getSource())) + ->setValue('activity_id', $qb->createNamedParameter($stream->getActivityId())) + ->setValue('object_id', $qb->createNamedParameter($stream->getObjectId())) + ->setValue('object_id_prim', $qb->createNamedParameter($qb->prim($stream->getObjectId()))) + ->setValue('details', $qb->createNamedParameter(json_encode($stream->getDetailsAll()))) + ->setValue('cache', $qb->createNamedParameter($cache)) + ->setValue( + 'filter_duplicate', + $qb->createNamedParameter(($stream->isFilterDuplicate()) ? '1' : '0') + ) + ->setValue( + 'instances', $qb->createNamedParameter( + json_encode($stream->getInstancePaths(), JSON_UNESCAPED_SLASHES) + ) + ) + ->setValue('local', $qb->createNamedParameter(($stream->isLocal()) ? '1' : '0')); try { $dTime = new DateTime(); @@ -961,10 +961,10 @@ class StreamRequest extends StreamRequestBuilder { $qb->setValue( 'published_time', $qb->createNamedParameter($dTime, IQueryBuilder::PARAM_DATE) ) - ->setValue( - 'creation', - $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE) - ); + ->setValue( + 'creation', + $qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE) + ); } catch (Exception $e) { } diff --git a/lib/Db/StreamRequestBuilder.php b/lib/Db/StreamRequestBuilder.php index 4abbc657..a183f6ec 100644 --- a/lib/Db/StreamRequestBuilder.php +++ b/lib/Db/StreamRequestBuilder.php @@ -69,7 +69,7 @@ class StreamRequestBuilder extends CoreRequestBuilder { $qb->setFormat($format); $qb->selectDistinct('s.id') - ->from(self::TABLE_STREAM, 's'); + ->from(self::TABLE_STREAM, 's'); foreach (self::$tables[self::TABLE_STREAM] as $field) { if ($field === 'id') { continue; @@ -91,7 +91,7 @@ class StreamRequestBuilder extends CoreRequestBuilder { protected function countNotesSelectSql(): SocialQueryBuilder { $qb = $this->getQueryBuilder(); $qb->selectAlias($qb->createFunction('COUNT(*)'), 'count') - ->from(self::TABLE_STREAM, 's'); + ->from(self::TABLE_STREAM, 's'); $qb->setDefaultSelectAlias('s'); @@ -118,7 +118,7 @@ class StreamRequestBuilder extends CoreRequestBuilder { * @param string $aliasFollow */ protected function timelineHomeLinkCacheActor( - SocialQueryBuilder $qb, string $alias = 'ca', string $aliasFollow = 'f' + SocialQueryBuilder $qb, string $alias = 'ca', string $aliasFollow = 'f', ) { $qb->linkToCacheActors($alias, 's.attributed_to_prim'); diff --git a/lib/Db/StreamTagsRequest.php b/lib/Db/StreamTagsRequest.php index bb3e817e..85de7c14 100644 --- a/lib/Db/StreamTagsRequest.php +++ b/lib/Db/StreamTagsRequest.php @@ -39,7 +39,7 @@ class StreamTagsRequest extends StreamTagsRequestBuilder { $qb->executeStatement(); } catch (DBException $e) { Server::get(LoggerInterface::class) - ->log(1, 'Social - Duplicate hashtag on Stream ' . json_encode($stream)); + ->log(1, 'Social - Duplicate hashtag on Stream ' . json_encode($stream)); } } } diff --git a/lib/Db/StreamTagsRequestBuilder.php b/lib/Db/StreamTagsRequestBuilder.php index 1f256e17..3771b655 100644 --- a/lib/Db/StreamTagsRequestBuilder.php +++ b/lib/Db/StreamTagsRequestBuilder.php @@ -57,7 +57,7 @@ class StreamTagsRequestBuilder extends CoreRequestBuilder { /** @noinspection PhpMethodParametersCountMismatchInspection */ $qb->select('st.stream_id', 'st.hashtag') - ->from(self::TABLE_STREAM_TAGS, 'st'); + ->from(self::TABLE_STREAM_TAGS, 'st'); $this->defaultSelectAlias = 'st'; $qb->setDefaultSelectAlias('st'); diff --git a/lib/Interfaces/Activity/MoveInterface.php b/lib/Interfaces/Activity/MoveInterface.php index 0a2ae21e..a34b7bbd 100644 --- a/lib/Interfaces/Activity/MoveInterface.php +++ b/lib/Interfaces/Activity/MoveInterface.php @@ -36,7 +36,7 @@ class MoveInterface extends AbstractActivityPubInterface implements IActivityPub FollowsRequest $followsRequest, StreamRequest $streamRequest, StreamDestRequest $streamDestRequest, - CacheActorService $cacheActorService + CacheActorService $cacheActorService, ) { $this->actionsRequest = $actionsRequest; $this->cacheDocumentsRequest = $cacheDocumentsRequest; diff --git a/lib/Interfaces/Actor/PersonInterface.php b/lib/Interfaces/Actor/PersonInterface.php index f553b1e6..9840d11e 100644 --- a/lib/Interfaces/Actor/PersonInterface.php +++ b/lib/Interfaces/Actor/PersonInterface.php @@ -57,7 +57,7 @@ class PersonInterface extends AbstractActivityPubInterface implements IActivityP StreamRequest $streamRequest, StreamDestRequest $streamDestRequest, ActorService $actorService, - ConfigService $configService + ConfigService $configService, ) { $this->actionsRequest = $actionsRequest; $this->cacheActorsRequest = $cacheActorsRequest; diff --git a/lib/Interfaces/Internal/SocialAppNotificationInterface.php b/lib/Interfaces/Internal/SocialAppNotificationInterface.php index 16750915..162f92a8 100644 --- a/lib/Interfaces/Internal/SocialAppNotificationInterface.php +++ b/lib/Interfaces/Internal/SocialAppNotificationInterface.php @@ -33,7 +33,7 @@ class SocialAppNotificationInterface extends AbstractActivityPubInterface implem return; } - $notification->setPublished(date("c")); + $notification->setPublished(date('c')); $notification->convertPublished(); $this->miscService->log( diff --git a/lib/Interfaces/Object/AnnounceInterface.php b/lib/Interfaces/Object/AnnounceInterface.php index 353518c3..dc150932 100644 --- a/lib/Interfaces/Object/AnnounceInterface.php +++ b/lib/Interfaces/Object/AnnounceInterface.php @@ -61,7 +61,7 @@ class AnnounceInterface extends AbstractActivityPubInterface implements IActivit public function __construct( StreamRequest $streamRequest, ActionsRequest $actionsRequest, StreamQueueService $streamQueueService, CacheActorService $cacheActorService, - MiscService $miscService + MiscService $miscService, ) { $this->streamRequest = $streamRequest; $this->actionsRequest = $actionsRequest; @@ -213,7 +213,7 @@ class AnnounceInterface extends AbstractActivityPubInterface implements IActivit $objectId = $item->getObjectId(); try { $cachedItem = $item->getCache() - ->getItem($objectId); + ->getItem($objectId); } catch (CacheItemNotFoundException $e) { return; } @@ -296,12 +296,12 @@ class AnnounceInterface extends AbstractActivityPubInterface implements IActivit $notification->setDetailItem('post', $post); $notification->addDetail('accounts', $author->getAccount()); $notification->setAttributedTo($author->getId()) - ->setSubType(Announce::TYPE) - ->setId($post->getId() . '/notification+boost') - ->setSummary('{accounts} boosted your post') - ->setObjectId($post->getId()) - ->setTo($post->getAttributedTo()) - ->setLocal(true); + ->setSubType(Announce::TYPE) + ->setId($post->getId() . '/notification+boost') + ->setSummary('{accounts} boosted your post') + ->setObjectId($post->getId()) + ->setTo($post->getAttributedTo()) + ->setLocal(true); $notificationInterface->save($notification); } diff --git a/lib/Interfaces/Object/DocumentInterface.php b/lib/Interfaces/Object/DocumentInterface.php index 24fa5c09..1bd6096b 100644 --- a/lib/Interfaces/Object/DocumentInterface.php +++ b/lib/Interfaces/Object/DocumentInterface.php @@ -25,7 +25,7 @@ class DocumentInterface extends AbstractActivityPubInterface implements IActivit public function __construct( CacheDocumentService $cacheDocumentService, - CacheDocumentsRequest $cacheDocumentsRequest + CacheDocumentsRequest $cacheDocumentsRequest, ) { $this->cacheDocumentService = $cacheDocumentService; $this->cacheDocumentsRequest = $cacheDocumentsRequest; @@ -45,7 +45,7 @@ class DocumentInterface extends AbstractActivityPubInterface implements IActivit if (!$item->isRoot()) { $item->setParentId( $item->getParent() - ->getId() + ->getId() ); } diff --git a/lib/Interfaces/Object/FollowInterface.php b/lib/Interfaces/Object/FollowInterface.php index 9494a012..f31615d9 100644 --- a/lib/Interfaces/Object/FollowInterface.php +++ b/lib/Interfaces/Object/FollowInterface.php @@ -55,7 +55,7 @@ class FollowInterface extends AbstractActivityPubInterface implements IActivityP public function __construct( FollowsRequest $followsRequest, CacheActorService $cacheActorService, AccountService $accountService, ActivityService $activityService, - MiscService $miscService + MiscService $miscService, ) { $this->followsRequest = $followsRequest; $this->cacheActorService = $cacheActorService; @@ -177,12 +177,12 @@ class FollowInterface extends AbstractActivityPubInterface implements IActivityP $notification->setDetail('account', $follower->getAccount()); $notification->setDetailItem('actor', $follower); $notification->setAttributedTo($follow->getActorId()) - ->setId($follow->getId() . '/notification') - ->setSubType(Follow::TYPE) - ->setActorId($follower->getId()) - ->setSummary('{account} is following you') - ->setTo($follow->getObjectId()) - ->setLocal(true); + ->setId($follow->getId() . '/notification') + ->setSubType(Follow::TYPE) + ->setActorId($follower->getId()) + ->setSummary('{account} is following you') + ->setTo($follow->getObjectId()) + ->setLocal(true); $notificationInterface->save($notification); } diff --git a/lib/Interfaces/Object/ImageInterface.php b/lib/Interfaces/Object/ImageInterface.php index 2f05ca5a..4d642e43 100644 --- a/lib/Interfaces/Object/ImageInterface.php +++ b/lib/Interfaces/Object/ImageInterface.php @@ -23,7 +23,7 @@ class ImageInterface extends DocumentInterface implements IActivityPubInterface */ public function __construct( CacheDocumentsRequest $cacheDocumentsRequest, - CacheDocumentService $cacheDocumentService + CacheDocumentService $cacheDocumentService, ) { parent::__construct($cacheDocumentService, $cacheDocumentsRequest); } diff --git a/lib/Interfaces/Object/LikeInterface.php b/lib/Interfaces/Object/LikeInterface.php index 455c3fa2..c1dc8d75 100644 --- a/lib/Interfaces/Object/LikeInterface.php +++ b/lib/Interfaces/Object/LikeInterface.php @@ -43,7 +43,7 @@ class LikeInterface extends AbstractActivityPubInterface implements IActivityPub public function __construct( ActionsRequest $actionsRequest, StreamRequest $streamRequest, - CacheActorService $cacheActorService + CacheActorService $cacheActorService, ) { $this->actionsRequest = $actionsRequest; $this->streamRequest = $streamRequest; @@ -187,12 +187,12 @@ class LikeInterface extends AbstractActivityPubInterface implements IActivityPub $notification->setDetailItem('post', $post); $notification->addDetail('accounts', $author->getAccount()); $notification->setAttributedTo($author->getId()) - ->setSubType(Like::TYPE) - ->setId($post->getId() . '/notification+like') - ->setSummary('{accounts} liked your post') - ->setObjectId($post->getId()) - ->setTo($post->getAttributedTo()) - ->setLocal(true); + ->setSubType(Like::TYPE) + ->setId($post->getId() . '/notification+like') + ->setSummary('{accounts} liked your post') + ->setObjectId($post->getId()) + ->setTo($post->getAttributedTo()) + ->setLocal(true); $notificationInterface->save($notification); } diff --git a/lib/Interfaces/Object/NoteInterface.php b/lib/Interfaces/Object/NoteInterface.php index 9a29a91d..01d887be 100644 --- a/lib/Interfaces/Object/NoteInterface.php +++ b/lib/Interfaces/Object/NoteInterface.php @@ -39,7 +39,7 @@ class NoteInterface extends AbstractActivityPubInterface implements IActivityPub public function __construct( StreamRequest $streamRequest, CacheActorsRequest $cacheActorsRequest, - PushService $pushService + PushService $pushService, ) { $this->streamRequest = $streamRequest; $this->cacheActorsRequest = $cacheActorsRequest; @@ -135,12 +135,12 @@ class NoteInterface extends AbstractActivityPubInterface implements IActivityPub $notification->setDetailItem('post', $post); $notification->addDetail('account', $post->getActor()->getAccount()); $notification->setAttributedTo($recipient->getId()) - ->setSubType(Mention::TYPE) - ->setId($post->getId() . '/notification+mention') - ->setSummary('{account} mentioned you in a post') - ->setObjectId($post->getId()) - ->setTo($recipient->getId()) - ->setLocal(true); + ->setSubType(Mention::TYPE) + ->setId($post->getId() . '/notification+mention') + ->setSummary('{account} mentioned you in a post') + ->setObjectId($post->getId()) + ->setTo($recipient->getId()) + ->setLocal(true); $notificationInterface->save($notification); } diff --git a/lib/Listeners/UserAccountListener.php b/lib/Listeners/UserAccountListener.php index e5c27826..a1568c34 100644 --- a/lib/Listeners/UserAccountListener.php +++ b/lib/Listeners/UserAccountListener.php @@ -21,7 +21,7 @@ use Psr\Log\LoggerInterface; class UserAccountListener implements IEventListener { public function __construct( private AccountService $accountService, - private LoggerInterface $logger + private LoggerInterface $logger, ) { } diff --git a/lib/Migration/RenameDocumentLocalCopy.php b/lib/Migration/RenameDocumentLocalCopy.php index 95d105e2..db2506e4 100644 --- a/lib/Migration/RenameDocumentLocalCopy.php +++ b/lib/Migration/RenameDocumentLocalCopy.php @@ -23,7 +23,7 @@ class RenameDocumentLocalCopy implements IRepairStep { public function __construct( ConfigService $configService, - CacheDocumentsRequest $cacheDocumentsRequest + CacheDocumentsRequest $cacheDocumentsRequest, ) { $this->configService = $configService; $this->cacheDocumentsRequest = $cacheDocumentsRequest; diff --git a/lib/Model/ActivityPub/ACore.php b/lib/Model/ActivityPub/ACore.php index d61d143c..28b88afa 100644 --- a/lib/Model/ActivityPub/ACore.php +++ b/lib/Model/ActivityPub/ACore.php @@ -79,7 +79,7 @@ class ACore extends Item implements JsonSerializable, IQueryRow { return $this->requestToken; } else { return $this->getRoot() - ->getRequestToken(); + ->getRequestToken(); } } @@ -150,7 +150,7 @@ class ACore extends Item implements JsonSerializable, IQueryRow { public function getObjectId(): string { if ($this->hasObject()) { return $this->getObject() - ->getId(); + ->getId(); } return parent::getObjectId(); @@ -278,7 +278,7 @@ class ACore extends Item implements JsonSerializable, IQueryRow { public function checkOrigin(string $id) { $host = parse_url($id, PHP_URL_HOST); $origin = $this->getRoot() - ->getOrigin(); + ->getOrigin(); if ($id !== '' && $origin === $host && $host !== '') { return; @@ -335,7 +335,7 @@ class ACore extends Item implements JsonSerializable, IQueryRow { } return $this->getParent() - ->getRoot($chain); + ->getRoot($chain); } @@ -691,7 +691,7 @@ class ACore extends Item implements JsonSerializable, IQueryRow { if ($this->hasActor()) { $this->addEntry( 'actor', $this->getActor() - ->getId() + ->getId() ); if ($this->isCompleteDetails()) { $this->addEntryItem('actor_info', $this->getActor()); diff --git a/lib/Model/ActivityPub/Actor/Person.php b/lib/Model/ActivityPub/Actor/Person.php index 259b1dd8..36f7b285 100644 --- a/lib/Model/ActivityPub/Actor/Person.php +++ b/lib/Model/ActivityPub/Actor/Person.php @@ -166,7 +166,7 @@ class Person extends ACore implements IQueryRow, JsonSerializable { public function getAvatar(): string { if ($this->hasIcon()) { return $this->getIcon() - ->getUrl(); + ->getUrl(); } return $this->avatar; @@ -600,15 +600,15 @@ class Person extends ACore implements IQueryRow, JsonSerializable { public function import(array $data) { parent::import($data); $this->setPreferredUsername($this->validate(ACore::AS_USERNAME, 'preferredUsername', $data, '')) - ->setPublicKey($this->get('publicKey.publicKeyPem', $data)) - ->setSharedInbox($this->validate(ACore::AS_URL, 'endpoints.sharedInbox', $data)) - ->setName($this->validate(ACore::AS_USERNAME, 'name', $data, '')) - ->setAccount($this->validate(ACore::AS_ACCOUNT, 'account', $data, '')) - ->setInbox($this->validate(ACore::AS_URL, 'inbox', $data, '')) - ->setOutbox($this->validate(ACore::AS_URL, 'outbox', $data, '')) - ->setFollowers($this->validate(ACore::AS_URL, 'followers', $data, '')) - ->setFollowing($this->validate(ACore::AS_URL, 'following', $data, '')) - ->setFeatured($this->validate(ACore::AS_URL, 'featured', $data, '')); + ->setPublicKey($this->get('publicKey.publicKeyPem', $data)) + ->setSharedInbox($this->validate(ACore::AS_URL, 'endpoints.sharedInbox', $data)) + ->setName($this->validate(ACore::AS_USERNAME, 'name', $data, '')) + ->setAccount($this->validate(ACore::AS_ACCOUNT, 'account', $data, '')) + ->setInbox($this->validate(ACore::AS_URL, 'inbox', $data, '')) + ->setOutbox($this->validate(ACore::AS_URL, 'outbox', $data, '')) + ->setFollowers($this->validate(ACore::AS_URL, 'followers', $data, '')) + ->setFollowing($this->validate(ACore::AS_URL, 'following', $data, '')) + ->setFeatured($this->validate(ACore::AS_URL, 'featured', $data, '')); /** @var Image $icon */ $icon = AP::$activityPub->getItemFromType(Image::TYPE); @@ -668,19 +668,19 @@ class Person extends ACore implements IQueryRow, JsonSerializable { public function importFromDatabase(array $data) { parent::importFromDatabase($data); $this->setPreferredUsername($this->validate(self::AS_USERNAME, 'preferred_username', $data, '')) - ->setUserId($this->get('user_id', $data, '')) - ->setName($this->validate(self::AS_USERNAME, 'name', $data, '')) - ->setDescription($this->validate(self::AS_CONTENT, 'summary', $data)) - ->setAccount($this->validate(self::AS_ACCOUNT, 'account', $data, '')) - ->setPublicKey($this->get('public_key', $data, '')) - ->setPrivateKey($this->get('private_key', $data, '')) - ->setInbox($this->validate(self::AS_URL, 'inbox', $data, '')) - ->setOutbox($this->validate(self::AS_URL, 'outbox', $data, '')) - ->setFollowers($this->validate(self::AS_URL, 'followers', $data, '')) - ->setFollowing($this->validate(self::AS_URL, 'following', $data, '')) - ->setSharedInbox($this->validate(self::AS_URL, 'shared_inbox', $data, '')) - ->setFeatured($this->validate(self::AS_URL, 'featured', $data, '')) - ->setDetailsAll($this->getArray('details', $data, [])); + ->setUserId($this->get('user_id', $data, '')) + ->setName($this->validate(self::AS_USERNAME, 'name', $data, '')) + ->setDescription($this->validate(self::AS_CONTENT, 'summary', $data)) + ->setAccount($this->validate(self::AS_ACCOUNT, 'account', $data, '')) + ->setPublicKey($this->get('public_key', $data, '')) + ->setPrivateKey($this->get('private_key', $data, '')) + ->setInbox($this->validate(self::AS_URL, 'inbox', $data, '')) + ->setOutbox($this->validate(self::AS_URL, 'outbox', $data, '')) + ->setFollowers($this->validate(self::AS_URL, 'followers', $data, '')) + ->setFollowing($this->validate(self::AS_URL, 'following', $data, '')) + ->setSharedInbox($this->validate(self::AS_URL, 'shared_inbox', $data, '')) + ->setFeatured($this->validate(self::AS_URL, 'featured', $data, '')) + ->setDetailsAll($this->getArray('details', $data, [])); try { $cTime = new DateTime($this->get('creation', $data, 'yesterday')); diff --git a/lib/Model/ActivityPub/Item.php b/lib/Model/ActivityPub/Item.php index 68559428..5c226172 100644 --- a/lib/Model/ActivityPub/Item.php +++ b/lib/Model/ActivityPub/Item.php @@ -189,7 +189,7 @@ class Item { public function getActorId(): string { if ($this->hasActor()) { return $this->getActor() - ->getId(); + ->getId(); } return $this->actorId; diff --git a/lib/Model/ActivityPub/Object/Document.php b/lib/Model/ActivityPub/Object/Document.php index f93808e1..fcffaa2d 100644 --- a/lib/Model/ActivityPub/Object/Document.php +++ b/lib/Model/ActivityPub/Object/Document.php @@ -371,11 +371,11 @@ class Document extends ACore implements JsonSerializable { */ public function convertToMediaAttachment( ?IURLGenerator $urlGenerator = null, - int $exportFormat = self::FORMAT_LOCAL + int $exportFormat = self::FORMAT_LOCAL, ): MediaAttachment { $media = new MediaAttachment(); $media->setId((string)$this->getNid()) - ->setExportFormat($exportFormat); + ->setExportFormat($exportFormat); $mime = ''; if (strpos($this->getMediaType(), '/')) { @@ -393,15 +393,15 @@ class Document extends ACore implements JsonSerializable { if ($this->getMeta() === null) { $meta = new AttachmentMeta(); $meta->setOriginal(new AttachmentMetaDim($this->getLocalCopySize())) - ->setSmall(new AttachmentMetaDim($this->getResizedCopySize())) - ->setFocus(new AttachmentMetaFocus(0, 0)); + ->setSmall(new AttachmentMetaDim($this->getResizedCopySize())) + ->setFocus(new AttachmentMetaFocus(0, 0)); $this->setMeta($meta); } $media->setMeta($this->getMeta()) - ->setDescription($this->getDescription()) - ->setBlurHash($this->getBlurHash()); + ->setDescription($this->getDescription()) + ->setBlurHash($this->getBlurHash()); return $media; } diff --git a/lib/Model/ActivityPub/Object/Mention.php b/lib/Model/ActivityPub/Object/Mention.php index d980d528..4193e37e 100644 --- a/lib/Model/ActivityPub/Object/Mention.php +++ b/lib/Model/ActivityPub/Object/Mention.php @@ -16,7 +16,7 @@ use OCA\Social\Model\ActivityPub\Stream; class Mention extends Stream implements JsonSerializable { public const TYPE = 'Mention'; - public function __construct(ACore $parent = null) { + public function __construct(?ACore $parent = null) { parent::__construct($parent); $this->setType(self::TYPE); diff --git a/lib/Model/ActivityPub/Object/Note.php b/lib/Model/ActivityPub/Object/Note.php index 919f94ba..3dcd0173 100644 --- a/lib/Model/ActivityPub/Object/Note.php +++ b/lib/Model/ActivityPub/Object/Note.php @@ -22,7 +22,7 @@ class Note extends Stream implements JsonSerializable { private array $hashtags = []; - public function __construct(ACore $parent = null) { + public function __construct(?ACore $parent = null) { parent::__construct($parent); $this->setType(self::TYPE); diff --git a/lib/Model/ActivityPub/OrderedCollection.php b/lib/Model/ActivityPub/OrderedCollection.php index 8f3dfa2a..e19eec82 100644 --- a/lib/Model/ActivityPub/OrderedCollection.php +++ b/lib/Model/ActivityPub/OrderedCollection.php @@ -57,8 +57,8 @@ class OrderedCollection extends ACore implements JsonSerializable { public function import(array $data): self { parent::import($data); $this->setFirst($this->validate(ACore::AS_USERNAME, 'first', $data, '')) - ->setLast($this->validate(ACore::AS_USERNAME, 'last', $data, '')) - ->setTotalItems($this->getInt('totalItems', $data)); + ->setLast($this->validate(ACore::AS_USERNAME, 'last', $data, '')) + ->setTotalItems($this->getInt('totalItems', $data)); return $this; } diff --git a/lib/Model/ActivityPub/Stream.php b/lib/Model/ActivityPub/Stream.php index bdae17ed..c47a53ee 100644 --- a/lib/Model/ActivityPub/Stream.php +++ b/lib/Model/ActivityPub/Stream.php @@ -340,7 +340,7 @@ class Stream extends ACore implements IQueryRow, JsonSerializable { } $this->getCache() - ->addItem($cacheItem); + ->addItem($cacheItem); return $this; } @@ -518,15 +518,15 @@ class Stream extends ACore implements IQueryRow, JsonSerializable { } catch (Exception $e) { } -// "in_reply_to_id" => null, -// "in_reply_to_account_id" => null, -// 'replies_count' => 0, -// 'reblogs_count' => 0, -// 'favourites_count' => 0, -// 'muted' => false, -// 'bookmarked' => false, -// "reblog" => null, -// 'noindex' => false + // "in_reply_to_id" => null, + // "in_reply_to_account_id" => null, + // 'replies_count' => 0, + // 'reblogs_count' => 0, + // 'favourites_count' => 0, + // 'muted' => false, + // 'bookmarked' => false, + // "reblog" => null, + // 'noindex' => false $attachments = []; foreach ($this->getArray('media_attachments', $data) as $dataAttachment) { @@ -602,14 +602,14 @@ class Stream extends ACore implements IQueryRow, JsonSerializable { } } $result = [ - "local" => $this->isLocal(), - "content" => $this->getContent(), - "sensitive" => $this->isSensitive(), - "spoiler_text" => $this->getSpoilerText(), + 'local' => $this->isLocal(), + 'content' => $this->getContent(), + 'sensitive' => $this->isSensitive(), + 'spoiler_text' => $this->getSpoilerText(), 'visibility' => $this->getVisibility(), - "language" => $this->getLanguage(), - "in_reply_to_id" => null, - "in_reply_to_account_id" => null, + 'language' => $this->getLanguage(), + 'in_reply_to_id' => null, + 'in_reply_to_account_id' => null, 'mentions' => $this->getMentions(), 'replies_count' => $this->getDetailInt('replies'), 'reblogs_count' => $this->getDetailInt('boosts'), @@ -620,9 +620,9 @@ class Stream extends ACore implements IQueryRow, JsonSerializable { 'bookmarked' => false, 'uri' => $this->getId(), 'url' => $this->getId(), - "reblog" => null, + 'reblog' => null, 'media_attachments' => $this->getAttachments(), - "created_at" => date('Y-m-d\TH:i:s', $this->getPublishedTime()) . '.000Z', + 'created_at' => date('Y-m-d\TH:i:s', $this->getPublishedTime()) . '.000Z', 'noindex' => false ]; diff --git a/lib/Model/Client/AttachmentMetaDim.php b/lib/Model/Client/AttachmentMetaDim.php index 92dfe764..6767b2e6 100644 --- a/lib/Model/Client/AttachmentMetaDim.php +++ b/lib/Model/Client/AttachmentMetaDim.php @@ -111,12 +111,12 @@ class AttachmentMetaDim implements JsonSerializable { public function import(array $data): self { $this->setWidth($this->getInt('width', $data)) - ->setHeight($this->getInt('height', $data)) - ->setSize($this->get('size', $data)) - ->setAspect($this->getFloat('aspect', $data)) - ->setDuration($this->getInt('duration', $data)) - ->setBitrate($this->getInt('bitrate', $data)) - ->setFrameRate($this->getFloat('frame_rate', $data)); + ->setHeight($this->getInt('height', $data)) + ->setSize($this->get('size', $data)) + ->setAspect($this->getFloat('aspect', $data)) + ->setDuration($this->getInt('duration', $data)) + ->setBitrate($this->getInt('bitrate', $data)) + ->setFrameRate($this->getFloat('frame_rate', $data)); return $this; } diff --git a/lib/Model/Client/MediaAttachment.php b/lib/Model/Client/MediaAttachment.php index 1b8b21bf..c49908ba 100644 --- a/lib/Model/Client/MediaAttachment.php +++ b/lib/Model/Client/MediaAttachment.php @@ -164,7 +164,7 @@ class MediaAttachment implements JsonSerializable { 'remote_url' => $this->getRemoteUrl(), 'meta' => $this->getMeta(), 'description' => $this->getDescription(), - "blurhash" => $this->getBlurHash() + 'blurhash' => $this->getBlurHash() ] ); } diff --git a/lib/Model/Client/Options/ProbeOptions.php b/lib/Model/Client/Options/ProbeOptions.php index d33a7241..a40b6abb 100644 --- a/lib/Model/Client/Options/ProbeOptions.php +++ b/lib/Model/Client/Options/ProbeOptions.php @@ -52,7 +52,7 @@ class ProbeOptions extends CoreOptions implements JsonSerializable { * * @param IRequest|null $request */ - public function __construct(IRequest $request = null) { + public function __construct(?IRequest $request = null) { if ($request !== null) { $this->fromArray($request->getParams()); } diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php index 8db46dca..3af5ad40 100644 --- a/lib/Notification/Notifier.php +++ b/lib/Notification/Notifier.php @@ -38,7 +38,7 @@ class Notifier implements INotifier { public function __construct( IL10N $l10n, IFactory $factory, IManager $contactsManager, IURLGenerator $url, - ICloudIdManager $cloudIdManager + ICloudIdManager $cloudIdManager, ) { $this->l10n = $l10n; $this->factory = $factory; @@ -106,7 +106,7 @@ class Notifier implements INotifier { switch ($action->getLabel()) { case 'help': $action->setParsedLabel($l10n->t('Help')) - ->setPrimary(true); + ->setPrimary(true); break; } diff --git a/lib/Providers/ContactsMenuProvider.php b/lib/Providers/ContactsMenuProvider.php index 9036984c..7d049cb4 100644 --- a/lib/Providers/ContactsMenuProvider.php +++ b/lib/Providers/ContactsMenuProvider.php @@ -49,7 +49,7 @@ class ContactsMenuProvider implements IProvider { */ public function __construct( IActionFactory $actionFactory, IURLGenerator $urlGenerator, IUserManager $userManager, IL10N $l10n, - AccountService $accountService + AccountService $accountService, ) { $this->actionFactory = $actionFactory; $this->urlGenerator = $urlGenerator; diff --git a/lib/Search/UnifiedSearchProvider.php b/lib/Search/UnifiedSearchProvider.php index ef4fda28..b18f935e 100644 --- a/lib/Search/UnifiedSearchProvider.php +++ b/lib/Search/UnifiedSearchProvider.php @@ -73,7 +73,7 @@ class UnifiedSearchProvider implements IProvider { AccountService $accountService, SearchService $searchService, ConfigService $configService, - LoggerInterface $logger + LoggerInterface $logger, ) { $this->l10n = $l10n; $this->urlGenerator = $urlGenerator; @@ -180,7 +180,7 @@ class UnifiedSearchProvider implements IProvider { $result = []; foreach ($accounts as $account) { $icon = ($account->hasIcon()) ? $account->getIcon() - ->getUrl() : ''; + ->getUrl() : ''; $result[] = new UnifiedSearchResult( $icon, $account->getPreferredUsername(), diff --git a/lib/Search/UnifiedSearchResult.php b/lib/Search/UnifiedSearchResult.php index 49680957..61ea9ad4 100644 --- a/lib/Search/UnifiedSearchResult.php +++ b/lib/Search/UnifiedSearchResult.php @@ -30,7 +30,7 @@ class UnifiedSearchResult extends SearchResultEntry { public function __construct( string $thumbnailUrl = '', string $title = '', string $subline = '', string $resourceUrl = '', string $icon = '', - bool $rounded = false + bool $rounded = false, ) { parent::__construct($thumbnailUrl, $title, $subline, $resourceUrl, $icon, $rounded); } diff --git a/lib/Service/AccountService.php b/lib/Service/AccountService.php index 8aec82f8..1656cbfb 100644 --- a/lib/Service/AccountService.php +++ b/lib/Service/AccountService.php @@ -71,7 +71,7 @@ class AccountService { DocumentService $documentService, SignatureService $signatureService, ConfigService $configService, - LoggerInterface $logger + LoggerInterface $logger, ) { $this->userManager = $userManager; $this->userSession = $userSession; @@ -278,7 +278,7 @@ class AccountService { try { $iconId = $this->documentService->cacheLocalAvatarByUsername($actor); $actor->setIconId($iconId); - } catch (ItemUnknownException | ItemAlreadyExistsException $e) { + } catch (ItemUnknownException|ItemAlreadyExistsException $e) { } $this->addLocalActorDetailCount($actor); diff --git a/lib/Service/ActionService.php b/lib/Service/ActionService.php index 2209cf0f..8e4c2f5b 100644 --- a/lib/Service/ActionService.php +++ b/lib/Service/ActionService.php @@ -53,7 +53,7 @@ class ActionService { StreamService $streamService, BoostService $boostService, LikeService $likeService, - StreamActionService $streamActionService + StreamActionService $streamActionService, ) { $this->streamService = $streamService; $this->boostService = $boostService; diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php index 5b8f628e..ce00aa74 100644 --- a/lib/Service/ActivityService.php +++ b/lib/Service/ActivityService.php @@ -71,7 +71,7 @@ class ActivityService { RequestQueueService $requestQueueService, CurlService $curlService, ConfigService $configService, - LoggerInterface $logger + LoggerInterface $logger, ) { $this->streamRequest = $streamRequest; $this->followsRequest = $followsRequest; @@ -92,7 +92,7 @@ class ActivityService { * @return string * @throws SocialAppConfigException */ - public function createActivity(Person $actor, ACore $item, ACore &$activity = null): string { + public function createActivity(Person $actor, ACore $item, ?ACore &$activity = null): string { $activity = new Create(); $item->setParent($activity); @@ -212,7 +212,7 @@ class ActivityService { */ public function manageRequest(RequestQueue $queue) { $host = $queue->getInstance() - ->getAddress(); + ->getAddress(); if (in_array($host, $this->failInstances)) { return; } @@ -220,7 +220,7 @@ class ActivityService { try { $this->requestQueueService->initRequest($queue); } catch (QueueStatusException $e) { - $this->logger->error("Error while trying to init request", [ + $this->logger->error('Error while trying to init request', [ 'exception' => $e, ]); @@ -233,15 +233,15 @@ class ActivityService { $this->signatureService->signRequest($request, $queue); $this->curlService->retrieveJson($request); $this->requestQueueService->endRequest($queue, true); - } catch (UnauthorizedFediverseException | RequestResultNotJsonException $e) { + } catch (UnauthorizedFediverseException|RequestResultNotJsonException $e) { $this->requestQueueService->endRequest($queue, true); - } catch (ActorDoesNotExistException | RequestContentException | RequestResultSizeException $e) { + } catch (ActorDoesNotExistException|RequestContentException|RequestResultSizeException $e) { $this->logger->notice( 'Error while managing request: ' . json_encode($request) . ' ' . get_class($e) . ': ' . $e->getMessage() ); $this->requestQueueService->deleteRequest($queue); - } catch (RequestNetworkException | RequestServerException $e) { + } catch (RequestNetworkException|RequestServerException $e) { $this->logger->notice( 'Temporary error while managing request: RequestServerException - ' . json_encode($request) . ' - ' . get_class($e) . ': ' . $e->getMessage() @@ -298,7 +298,7 @@ class ActivityService { } $sharedInbox = $follow->getActor() - ->getSharedInbox(); + ->getSharedInbox(); if (in_array($sharedInbox, $sharedInboxes)) { continue; } @@ -361,7 +361,7 @@ class ActivityService { private function getAuthorFromItem(Acore $activity): string { if ($activity->hasActor()) { return $activity->getActor() - ->getId(); + ->getId(); } return $activity->getActorId(); diff --git a/lib/Service/ActorService.php b/lib/Service/ActorService.php index c7deea94..68cb9892 100644 --- a/lib/Service/ActorService.php +++ b/lib/Service/ActorService.php @@ -50,7 +50,7 @@ class ActorService { CacheActorsRequest $cacheActorsRequest, CacheDocumentsRequest $cacheDocumentsRequest, CurlService $curlService, ConfigService $configService, - MiscService $miscService + MiscService $miscService, ) { $this->cacheActorsRequest = $cacheActorsRequest; $this->cacheDocumentsRequest = $cacheDocumentsRequest; diff --git a/lib/Service/BoostService.php b/lib/Service/BoostService.php index e53a5f1c..8f3c6e52 100644 --- a/lib/Service/BoostService.php +++ b/lib/Service/BoostService.php @@ -42,7 +42,7 @@ class BoostService { public function __construct( StreamRequest $streamRequest, StreamService $streamService, SignatureService $signatureService, ActivityService $activityService, StreamActionService $streamActionService, - StreamQueueService $streamQueueService + StreamQueueService $streamQueueService, ) { $this->streamRequest = $streamRequest; $this->streamService = $streamService; diff --git a/lib/Service/CacheActorService.php b/lib/Service/CacheActorService.php index 63a69aa5..5ec561b1 100644 --- a/lib/Service/CacheActorService.php +++ b/lib/Service/CacheActorService.php @@ -63,7 +63,7 @@ class CacheActorService { CurlService $curlService, FediverseService $fediverseService, ConfigService $configService, - LoggerInterface $logger + LoggerInterface $logger, ) { $this->urlGenerator = $urlGenerator; $this->actorsRequest = $actorsRequest; @@ -164,7 +164,7 @@ class CacheActorService { $instance = ''; $account = ltrim($account, '@'); if (strrpos($account, '@')) { - list($account, $instance) = explode('@', $account, 2); + [$account, $instance] = explode('@', $account, 2); } if ($instance !== '' diff --git a/lib/Service/CacheDocumentService.php b/lib/Service/CacheDocumentService.php index b7b6374b..83e6d99a 100644 --- a/lib/Service/CacheDocumentService.php +++ b/lib/Service/CacheDocumentService.php @@ -48,7 +48,7 @@ class CacheDocumentService { IAppData $appData, CurlService $curlService, BlurService $blurService, - ConfigService $configService + ConfigService $configService, ) { $this->appData = $appData; $this->curlService = $curlService; @@ -243,7 +243,7 @@ class CacheDocumentService { try { return $this->appData->getFolder($this->generatePath($filename)) - ->getFile($filename); + ->getFile($filename); } catch (Exception $e) { throw new CacheContentException(); } @@ -253,7 +253,7 @@ class CacheDocumentService { public function getFromUuid(string $uuid): ISimpleFile { try { return $this->appData->getFolder($this->generatePath($uuid)) - ->getFile($uuid); + ->getFile($uuid); } catch (NotFoundException $e) { throw new NotFoundException('document not found'); } diff --git a/lib/Service/CheckService.php b/lib/Service/CheckService.php index 2f77a575..391ae27b 100644 --- a/lib/Service/CheckService.php +++ b/lib/Service/CheckService.php @@ -63,7 +63,7 @@ class CheckService { IRequest $request, IURLGenerator $urlGenerator, FollowsRequest $followRequest, CacheActorsRequest $cacheActorsRequest, StreamDestRequest $streamDestRequest, StreamRequest $streamRequest, AccountService $accountService, ConfigService $configService, - MiscService $miscService + MiscService $miscService, ) { $this->userManager = $userManager; $this->cache = $cache; @@ -250,7 +250,7 @@ class CheckService { $options['verify'] = $this->config->getSystemValue('social.checkssl', true); $response = $this->clientService->newClient() - ->get($url, $options); + ->get($url, $options); if ($response->getStatusCode() === Http::STATUS_OK) { $this->cache->set(self::CACHE_PREFIX . 'wellknown', 'true', 3600); diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php index a1a96520..97e0d896 100644 --- a/lib/Service/ConfigService.php +++ b/lib/Service/ConfigService.php @@ -71,7 +71,7 @@ class ConfigService { public function __construct( ?string $userId, IConfig $config, IRequest $request, IURLGenerator $urlGenerator, - MiscService $miscService + MiscService $miscService, ) { $this->userId = $userId; $this->config = $config; diff --git a/lib/Service/CurlService.php b/lib/Service/CurlService.php index a5dc2368..3afab11e 100644 --- a/lib/Service/CurlService.php +++ b/lib/Service/CurlService.php @@ -58,7 +58,7 @@ class CurlService { public function __construct( ConfigService $configService, FediverseService $fediverseService, - LoggerInterface $logger + LoggerInterface $logger, ) { $this->configService = $configService; $this->fediverseService = $fediverseService; @@ -113,7 +113,7 @@ class CurlService { $this->logger->notice('webfingerAccount, request result', ['request' => $request]); $subject = $this->get('subject', $result, ''); - list($type, $temp) = explode(':', $subject, 2); + [$type, $temp] = explode(':', $subject, 2); if ($type === 'acct') { $account = $temp; } diff --git a/lib/Service/DetailsService.php b/lib/Service/DetailsService.php index 9dfb747c..64286f52 100644 --- a/lib/Service/DetailsService.php +++ b/lib/Service/DetailsService.php @@ -39,7 +39,7 @@ class DetailsService { */ public function __construct( StreamService $streamService, AccountService $accountService, - FollowService $followService, CacheActorService $cacheActorService + FollowService $followService, CacheActorService $cacheActorService, ) { $this->streamService = $streamService; $this->accountService = $accountService; diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php index 19f5789b..3d06fe97 100644 --- a/lib/Service/DocumentService.php +++ b/lib/Service/DocumentService.php @@ -71,7 +71,7 @@ class DocumentService { public function __construct( IUrlGenerator $urlGenerator, CacheDocumentsRequest $cacheDocumentsRequest, ActorsRequest $actorRequest, StreamRequest $streamRequest, - CacheDocumentService $cacheService, ConfigService $configService, MiscService $miscService + CacheDocumentService $cacheService, ConfigService $configService, MiscService $miscService, ) { $this->urlGenerator = $urlGenerator; $this->cacheDocumentsRequest = $cacheDocumentsRequest; @@ -187,7 +187,7 @@ class DocumentService { * @throws SocialAppConfigException */ public function getFromCache( - string $id, string &$mimeType = '', bool $public = false + string $id, string &$mimeType = '', bool $public = false, ): ISimpleFile { $document = $this->cacheRemoteDocument($id, $public); $mimeType = $document->getMimeType(); diff --git a/lib/Service/FediverseService.php b/lib/Service/FediverseService.php index fa4edd63..6252182f 100644 --- a/lib/Service/FediverseService.php +++ b/lib/Service/FediverseService.php @@ -31,7 +31,7 @@ class FediverseService { * @param MiscService $miscService */ public function __construct( - ConfigService $configService, MiscService $miscService + ConfigService $configService, MiscService $miscService, ) { $this->configService = $configService; $this->miscService = $miscService; diff --git a/lib/Service/FollowService.php b/lib/Service/FollowService.php index fb41a277..e88bc65e 100644 --- a/lib/Service/FollowService.php +++ b/lib/Service/FollowService.php @@ -66,7 +66,7 @@ class FollowService { ActivityService $activityService, CacheActorService $cacheActorService, ConfigService $configService, - LoggerInterface $logger + LoggerInterface $logger, ) { $this->urlGenerator = $urlGenerator; $this->followsRequest = $followsRequest; diff --git a/lib/Service/HashtagService.php b/lib/Service/HashtagService.php index c6dd8bb8..baaa7148 100644 --- a/lib/Service/HashtagService.php +++ b/lib/Service/HashtagService.php @@ -49,7 +49,7 @@ class HashtagService { public function __construct( HashtagsRequest $hashtagsRequest, StreamRequest $streamRequest, ConfigService $configService, - MiscService $miscService + MiscService $miscService, ) { $this->hashtagsRequest = $hashtagsRequest; $this->streamRequest = $streamRequest; diff --git a/lib/Service/InstanceService.php b/lib/Service/InstanceService.php index 298aafc0..7877bfd4 100644 --- a/lib/Service/InstanceService.php +++ b/lib/Service/InstanceService.php @@ -29,7 +29,7 @@ class InstanceService { InstancesRequest $instancesRequest, ConfigService $configService, MiscService $miscService, - IConfig $config + IConfig $config, ) { $this->instancesRequest = $instancesRequest; $this->configService = $configService; diff --git a/lib/Service/LikeService.php b/lib/Service/LikeService.php index 8bb56db0..df668d6e 100644 --- a/lib/Service/LikeService.php +++ b/lib/Service/LikeService.php @@ -64,7 +64,7 @@ class LikeService { public function __construct( StreamRequest $streamRequest, StreamService $streamService, SignatureService $signatureService, ActivityService $activityService, StreamActionService $streamActionService, - StreamQueueService $streamQueueService, MiscService $miscService + StreamQueueService $streamQueueService, MiscService $miscService, ) { $this->streamRequest = $streamRequest; $this->streamService = $streamService; diff --git a/lib/Service/MiscService.php b/lib/Service/MiscService.php index cc428957..0349bcbb 100644 --- a/lib/Service/MiscService.php +++ b/lib/Service/MiscService.php @@ -35,10 +35,10 @@ class MiscService { * @param int $level */ public function log(string $message, $level = 2) { - $data = array( + $data = [ 'app' => Application::APP_ID, 'level' => $level - ); + ]; $this->logger->log($level, $message, $data); } diff --git a/lib/Service/PostService.php b/lib/Service/PostService.php index d365af20..83a6b67d 100644 --- a/lib/Service/PostService.php +++ b/lib/Service/PostService.php @@ -45,7 +45,7 @@ class PostService { public function __construct( StreamService $streamService, AccountService $accountService, ActivityService $activityService, - CacheDocumentService $cacheDocumentService, ConfigService $configService, MiscService $miscService, LoggerInterface $logger + CacheDocumentService $cacheDocumentService, ConfigService $configService, MiscService $miscService, LoggerInterface $logger, ) { $this->streamService = $streamService; $this->accountService = $accountService; @@ -127,8 +127,8 @@ class PostService { } } else { try { - $tmp_name = $_FILES["attachments"]["tmp_name"]; - $name = basename($_FILES["attachments"]["name"]); + $tmp_name = $_FILES['attachments']['tmp_name']; + $name = basename($_FILES['attachments']['name']); $tmpFile = tmpfile(); $tmpPath = stream_get_meta_data($tmpFile)['uri']; if (move_uploaded_file($tmp_name, $tmpPath)) { @@ -167,8 +167,8 @@ class PostService { * @throws UrlCloudException */ private function generateDocumentFromAttachment(Note $note, int $key): Document { - $tmp_name = $_FILES["attachments"]["tmp_name"][$key]; - $name = basename($_FILES["attachments"]["name"][$key]); + $tmp_name = $_FILES['attachments']['tmp_name'][$key]; + $name = basename($_FILES['attachments']['name'][$key]); $tmpFile = tmpfile(); $tmpPath = stream_get_meta_data($tmpFile)['uri']; if (move_uploaded_file($tmp_name, $tmpPath)) { diff --git a/lib/Service/PushService.php b/lib/Service/PushService.php index f3f10c79..c25c6438 100644 --- a/lib/Service/PushService.php +++ b/lib/Service/PushService.php @@ -39,7 +39,7 @@ class PushService { * PushService constructor. */ public function __construct( - DetailsService $detailsService, StreamService $streamService, MiscService $miscService + DetailsService $detailsService, StreamService $streamService, MiscService $miscService, ) { $this->detailsService = $detailsService; $this->streamService = $streamService; diff --git a/lib/Service/RequestQueueService.php b/lib/Service/RequestQueueService.php index cf754954..70f0b63d 100644 --- a/lib/Service/RequestQueueService.php +++ b/lib/Service/RequestQueueService.php @@ -38,7 +38,7 @@ class RequestQueueService { */ public function __construct( RequestQueueRequest $requestQueueRequest, ConfigService $configService, - MiscService $miscService + MiscService $miscService, ) { $this->requestQueueRequest = $requestQueueRequest; $this->configService = $configService; diff --git a/lib/Service/SearchService.php b/lib/Service/SearchService.php index 7807ba65..b42ef6fd 100644 --- a/lib/Service/SearchService.php +++ b/lib/Service/SearchService.php @@ -47,7 +47,7 @@ class SearchService { CacheActorService $cacheActorService, HashtagService $hashtagService, ConfigService $configService, - LoggerInterface $logger + LoggerInterface $logger, ) { $this->cacheActorService = $cacheActorService; $this->hashtagService = $hashtagService; diff --git a/lib/Service/SignatureService.php b/lib/Service/SignatureService.php index 876b80cd..0cfca633 100644 --- a/lib/Service/SignatureService.php +++ b/lib/Service/SignatureService.php @@ -71,7 +71,7 @@ class SignatureService { CacheActorService $cacheActorService, CurlService $curlService, ConfigService $configService, - LoggerInterface $logger + LoggerInterface $logger, ) { $this->actorsRequest = $actorsRequest; $this->cacheActorService = $cacheActorService; @@ -87,9 +87,9 @@ class SignatureService { public function generateKeys(Person &$actor) { $res = openssl_pkey_new( [ - "digest_alg" => "rsa", - "private_key_bits" => 2048, - "private_key_type" => OPENSSL_KEYTYPE_RSA, + 'digest_alg' => 'rsa', + 'private_key_bits' => 2048, + 'private_key_type' => OPENSSL_KEYTYPE_RSA, ] ); @@ -145,7 +145,7 @@ class SignatureService { foreach ($elements as $element) { $signingElements[] = $element . ': ' . $data[$element]; if ($element !== '(request-target)') { - $request->addHeader($element, (string) $data[$element]); + $request->addHeader($element, (string)$data[$element]); } } @@ -176,7 +176,7 @@ class SignatureService { * @return string */ private function generateDigest(string $data): string { - $encoded = hash("sha256", $data, true); + $encoded = hash('sha256', $data, true); return 'SHA-256=' . base64_encode($encoded); } @@ -371,7 +371,7 @@ class SignatureService { * @throws SignatureException */ private function checkRequestSignatureUsingPublicKey( - string $publicKey, array $sign, string $estimated, string $signed + string $publicKey, array $sign, string $estimated, string $signed, ) { $algorithm = $this->getAlgorithmFromSignature($sign); if ($publicKey === '' @@ -401,7 +401,7 @@ class SignatureService { $target = ''; try { - $target = strtolower($request->getMethod()) . " " . $request->getRequestUri(); + $target = strtolower($request->getMethod()) . ' ' . $request->getRequestUri(); } catch (Exception $e) { } @@ -409,7 +409,7 @@ class SignatureService { foreach ($keys as $key) { if ($key === '(request-target)') { - $estimated .= "(request-target): " . $target . "\n"; + $estimated .= '(request-target): ' . $target . "\n"; continue; } @@ -439,7 +439,7 @@ class SignatureService { continue; } - list($k, $v) = explode('=', $entry, 2); + [$k, $v] = explode('=', $entry, 2); preg_match('/"([^"]+)"/', $v, $varr); if ($varr[0] !== null) { $v = trim($varr[0], '"'); @@ -583,7 +583,7 @@ class SignatureService { * @throws NotFoundException */ private static function generateContextCacheDocument( - ISimpleFolder $folder, string $filename, string $url + ISimpleFolder $folder, string $filename, string $url, ): stdClass { try { $data = jsonld_default_document_loader($url); diff --git a/lib/Service/StreamActionService.php b/lib/Service/StreamActionService.php index 59f64e98..4374fac0 100644 --- a/lib/Service/StreamActionService.php +++ b/lib/Service/StreamActionService.php @@ -30,7 +30,7 @@ class StreamActionService { * @param StreamActionsRequest $streamActionsRequest * @param MiscService $miscService */ - public function __construct(StreamActionsRequest $streamActionsRequest, MiscService $miscService + public function __construct(StreamActionsRequest $streamActionsRequest, MiscService $miscService, ) { $this->streamActionsRequest = $streamActionsRequest; $this->miscService = $miscService; diff --git a/lib/Service/StreamQueueService.php b/lib/Service/StreamQueueService.php index c3362fb0..94de886b 100644 --- a/lib/Service/StreamQueueService.php +++ b/lib/Service/StreamQueueService.php @@ -64,7 +64,7 @@ class StreamQueueService { public function __construct( StreamRequest $streamRequest, StreamQueueRequest $streamQueueRequest, CacheActorService $cacheActorService, ImportService $importService, - CurlService $curlService, MiscService $miscService + CurlService $curlService, MiscService $miscService, ) { $this->streamRequest = $streamRequest; $this->streamQueueRequest = $streamQueueRequest; diff --git a/lib/Service/StreamService.php b/lib/Service/StreamService.php index c2793f67..1f8fbee3 100644 --- a/lib/Service/StreamService.php +++ b/lib/Service/StreamService.php @@ -51,7 +51,7 @@ class StreamService { StreamRequest $streamRequest, ActivityService $activityService, CacheActorService $cacheActorService, - ConfigService $configService + ConfigService $configService, ) { $this->urlGenerator = $urlGenerator; $this->streamRequest = $streamRequest; @@ -79,7 +79,7 @@ class StreamService { */ public function assignItem(Acore $stream, Person $actor, string $type) { $stream->setId($this->configService->generateId('@' . $actor->getPreferredUsername())); - $stream->setPublished(date("c")); + $stream->setPublished(date('c')); $this->setRecipient($stream, $actor, $type); $stream->setLocal(true); @@ -322,7 +322,7 @@ class StreamService { public function getStreamById( string $id, bool $asViewer = false, - int $format = ACore::FORMAT_ACTIVITYPUB + int $format = ACore::FORMAT_ACTIVITYPUB, ): Stream { return $this->streamRequest->getStreamById($id, $asViewer, $format); } @@ -384,7 +384,7 @@ class StreamService { string $id, int $since = 0, int $limit = 5, - bool $asViewer = false + bool $asViewer = false, ): array { return $this->streamRequest->getRepliesByParentId($id, $since, $limit, $asViewer); } @@ -402,7 +402,7 @@ class StreamService { public function getStreamHome( int $since = 0, int $limit = 5, - int $format = Stream::FORMAT_ACTIVITYPUB + int $format = Stream::FORMAT_ACTIVITYPUB, ): array { return $this->streamRequest->getTimelineHome_dep($since, $limit, $format); } diff --git a/lib/Service/TestService.php b/lib/Service/TestService.php index eba97842..3196e3b9 100644 --- a/lib/Service/TestService.php +++ b/lib/Service/TestService.php @@ -46,7 +46,7 @@ class TestService { * @param MiscService $miscService */ public function __construct( - CurlService $curlService, ConfigService $configService, MiscService $miscService + CurlService $curlService, ConfigService $configService, MiscService $miscService, ) { $this->curlService = $curlService; $this->configService = $configService; @@ -61,7 +61,7 @@ class TestService { throw new InvalidResourceException('account format is not valid'); } - list($username, $host) = explode('@', $account); + [$username, $host] = explode('@', $account); if ($username === null || $host === null) { throw new InvalidResourceException('account format should be valid'); } diff --git a/lib/Service/UpdateService.php b/lib/Service/UpdateService.php index 83cd7ee7..701271e1 100644 --- a/lib/Service/UpdateService.php +++ b/lib/Service/UpdateService.php @@ -40,7 +40,7 @@ class UpdateService { */ public function __construct( IUserManager $userManager, IGroupManager $groupManager, ITimeFactory $time, - INotificationManager $notificationManager + INotificationManager $notificationManager, ) { $this->userManager = $userManager; $this->groupManager = $groupManager; @@ -55,7 +55,7 @@ class UpdateService { foreach ($notifications as $notif) { $help = $notif->createAction(); $help->setLabel('help') - ->setLink('https://help.nextcloud.com/t/social-alpha3-how-to-upgrade/85535', 'WEB'); + ->setLink('https://help.nextcloud.com/t/social-alpha3-how-to-upgrade/85535', 'WEB'); $notif->addAction($help); $this->notificationManager->notify($notif); @@ -103,10 +103,10 @@ class UpdateService { $now = $this->time->getDateTime(); $notification = $this->notificationManager->createNotification(); $notification->setApp('social') - ->setDateTime($now) - ->setUser($userId) - ->setObject('update', 'update_' . $this->updateId) - ->setSubject($subject, $data); + ->setDateTime($now) + ->setUser($userId) + ->setObject('update', 'update_' . $this->updateId) + ->setSubject($subject, $data); return $notification; } diff --git a/lib/Tools/Db/ExtendedQueryBuilder.php b/lib/Tools/Db/ExtendedQueryBuilder.php index f3f79b7d..68fd01f1 100644 --- a/lib/Tools/Db/ExtendedQueryBuilder.php +++ b/lib/Tools/Db/ExtendedQueryBuilder.php @@ -27,9 +27,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder; * @package OCA\Social\Tools\Db */ class ExtendedQueryBuilder extends QueryBuilder implements IExtendedQueryBuilder { - /** @var string */ - private $defaultSelectAlias = ''; - + public string $defaultSelectAlias = ''; /** * @param string $alias @@ -146,14 +144,14 @@ class ExtendedQueryBuilder extends QueryBuilder implements IExtendedQueryBuilder * @param bool $cs - case sensitive * @param string $alias */ - public function filterDBField(string $field, string $value, bool $cs = true, string $alias = '' + public function filterDBField(string $field, string $value, bool $cs = true, string $alias = '', ) { $expr = $this->exprLimitToDBField($field, $value, false, $cs, $alias); $this->andWhere($expr); } public function exprLimitToDBField( - string $field, string $value, bool $eq = true, bool $cs = true, string $alias = '' + string $field, string $value, bool $eq = true, bool $cs = true, string $alias = '', ): string { $expr = $this->expr(); @@ -187,7 +185,7 @@ class ExtendedQueryBuilder extends QueryBuilder implements IExtendedQueryBuilder * @param string $alias */ public function limitToDBFieldArray( - string $field, array $values, bool $cs = true, string $alias = '' + string $field, array $values, bool $cs = true, string $alias = '', ) { $expr = $this->exprLimitToDBFieldArray($field, $values, true, $cs, $alias); $this->andWhere($expr); @@ -201,7 +199,7 @@ class ExtendedQueryBuilder extends QueryBuilder implements IExtendedQueryBuilder * @param string $alias */ public function filterDBFieldArray( - string $field, string $value, bool $cs = true, string $alias = '' + string $field, string $value, bool $cs = true, string $alias = '', ) { $expr = $this->exprLimitToDBField($field, $value, false, $cs, $alias); $this->andWhere($expr); @@ -218,7 +216,7 @@ class ExtendedQueryBuilder extends QueryBuilder implements IExtendedQueryBuilder * @return ICompositeExpression */ public function exprLimitToDBFieldArray( - string $field, array $values, bool $eq = true, bool $cs = true, string $alias = '' + string $field, array $values, bool $eq = true, bool $cs = true, string $alias = '', ): ICompositeExpression { $expr = $this->expr(); @@ -274,7 +272,7 @@ class ExtendedQueryBuilder extends QueryBuilder implements IExtendedQueryBuilder $this->andWhere($expr); } - public function exprLimitToDBFieldInt(string $field, int $value, string $alias = '', bool $eq = true + public function exprLimitToDBFieldInt(string $field, int $value, string $alias = '', bool $eq = true, ): string { $expr = $this->expr(); @@ -397,7 +395,7 @@ class ExtendedQueryBuilder extends QueryBuilder implements IExtendedQueryBuilder * @return string */ public function exprFieldWithinJsonFormat( - IQueryBuilder $qb, string $field, string $fieldRight, string $alias = '' + IQueryBuilder $qb, string $field, string $fieldRight, string $alias = '', ) { $func = $qb->func(); $expr = $qb->expr(); @@ -425,7 +423,7 @@ class ExtendedQueryBuilder extends QueryBuilder implements IExtendedQueryBuilder * @return string */ public function exprValueWithinJsonFormat( - IQueryBuilder $qb, string $field, string $value, bool $eq = true, bool $cs = true + IQueryBuilder $qb, string $field, string $value, bool $eq = true, bool $cs = true, ): string { $dbConn = $this->getConnection(); $expr = $qb->expr(); diff --git a/lib/Tools/Db/RequestBuilder.php b/lib/Tools/Db/RequestBuilder.php index b153cf4d..0ead995f 100644 --- a/lib/Tools/Db/RequestBuilder.php +++ b/lib/Tools/Db/RequestBuilder.php @@ -82,7 +82,7 @@ class RequestBuilder { * @param string $alias */ protected function limitToDBField( - IQueryBuilder $qb, string $field, string $value, bool $cs = true, string $alias = '' + IQueryBuilder $qb, string $field, string $value, bool $cs = true, string $alias = '', ) { $expr = $this->exprLimitToDBField($qb, $field, $value, true, $cs, $alias); $qb->andWhere($expr); @@ -97,7 +97,7 @@ class RequestBuilder { * @param string $alias */ protected function filterDBField( - IQueryBuilder $qb, string $field, string $value, bool $cs = true, string $alias = '' + IQueryBuilder $qb, string $field, string $value, bool $cs = true, string $alias = '', ) { $expr = $this->exprLimitToDBField($qb, $field, $value, false, $cs, $alias); $qb->andWhere($expr); @@ -115,7 +115,7 @@ class RequestBuilder { * @return string */ protected function exprLimitToDBField( - IQueryBuilder $qb, string $field, string $value, bool $eq = true, bool $cs = true, string $alias = '' + IQueryBuilder $qb, string $field, string $value, bool $eq = true, bool $cs = true, string $alias = '', ): string { $expr = $qb->expr(); @@ -149,7 +149,7 @@ class RequestBuilder { * @param string $alias */ protected function limitToDBFieldInt( - IQueryBuilder $qb, string $field, int $value, string $alias = '' + IQueryBuilder $qb, string $field, int $value, string $alias = '', ) { $expr = $this->exprLimitToDBFieldInt($qb, $field, $value, $alias, true); $qb->andWhere($expr); @@ -163,7 +163,7 @@ class RequestBuilder { * @param string $alias */ protected function filterDBFieldInt( - IQueryBuilder $qb, string $field, int $value, string $alias = '' + IQueryBuilder $qb, string $field, int $value, string $alias = '', ) { $expr = $this->exprLimitToDBFieldInt($qb, $field, $value, $alias, false); $qb->andWhere($expr); @@ -181,7 +181,7 @@ class RequestBuilder { * @return string */ protected function exprLimitToDBFieldInt( - IQueryBuilder $qb, string $field, int $value, string $alias = '', bool $eq = true + IQueryBuilder $qb, string $field, int $value, string $alias = '', bool $eq = true, ): string { $expr = $qb->expr(); @@ -233,7 +233,7 @@ class RequestBuilder { * @param bool $orNull */ protected function limitToDBFieldDateTime( - IQueryBuilder $qb, string $field, DateTime $date, bool $orNull = false + IQueryBuilder $qb, string $field, DateTime $date, bool $orNull = false, ) { $expr = $qb->expr(); $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->defaultSelectAlias . '.' : ''; diff --git a/lib/Tools/IExtendedQueryBuilder.php b/lib/Tools/IExtendedQueryBuilder.php index 51cf3fb3..48010257 100644 --- a/lib/Tools/IExtendedQueryBuilder.php +++ b/lib/Tools/IExtendedQueryBuilder.php @@ -92,7 +92,7 @@ interface IExtendedQueryBuilder extends IQueryBuilder { * @param bool $cs * @param string $alias */ - public function limitToDBField(string $field, string $value, bool $cs = true, string $alias = '' + public function limitToDBField(string $field, string $value, bool $cs = true, string $alias = '', ); @@ -104,15 +104,15 @@ interface IExtendedQueryBuilder extends IQueryBuilder { * * @return mixed */ - public function filterDBField(string $field, string $value, bool $cs = true, string $alias = '' + public function filterDBField(string $field, string $value, bool $cs = true, string $alias = '', ); public function exprLimitToDBField( - string $field, string $value, bool $eq = true, bool $cs = true, string $alias = '' + string $field, string $value, bool $eq = true, bool $cs = true, string $alias = '', ): string; public function limitToDBFieldArray( - string $field, array $values, bool $cs = true, string $alias = '' + string $field, array $values, bool $cs = true, string $alias = '', ); @@ -125,7 +125,7 @@ interface IExtendedQueryBuilder extends IQueryBuilder { * @return mixed */ public function filterDBFieldArray( - string $field, string $value, bool $cs = true, string $alias = '' + string $field, string $value, bool $cs = true, string $alias = '', ); @@ -139,7 +139,7 @@ interface IExtendedQueryBuilder extends IQueryBuilder { * @return ICompositeExpression */ public function exprLimitToDBFieldArray( - string $field, array $values, bool $eq = true, bool $cs = true, string $alias = '' + string $field, array $values, bool $eq = true, bool $cs = true, string $alias = '', ): ICompositeExpression; @@ -188,7 +188,7 @@ interface IExtendedQueryBuilder extends IQueryBuilder { * @param DateTime $date * @param bool $orNull */ - public function limitToDBFieldDateTime(string $field, DateTime $date, bool $orNull = false + public function limitToDBFieldDateTime(string $field, DateTime $date, bool $orNull = false, ); diff --git a/lib/Tools/Model/Request.php b/lib/Tools/Model/Request.php index 1739aec9..0df35d62 100644 --- a/lib/Tools/Model/Request.php +++ b/lib/Tools/Model/Request.php @@ -224,7 +224,7 @@ class Request implements JsonSerializable { return $this; } - list($host, $port) = explode(':', $instance, 2); + [$host, $port] = explode(':', $instance, 2); $this->setHost($host); if ($port !== '') { $this->setPort((int)$port); @@ -263,13 +263,13 @@ class Request implements JsonSerializable { $protocol = parse_url($url, PHP_URL_SCHEME); if ($protocol === null) { if (strpos($url, '/') > -1) { - list($address, $baseUrl) = explode('/', $url, 2); + [$address, $baseUrl] = explode('/', $url, 2); $this->setBaseUrl('/' . $baseUrl); } else { $address = $url; } if (strpos($address, ':') > -1) { - list($address, $port) = explode(':', $address, 2); + [$address, $port] = explode(':', $address, 2); $this->setPort((int)$port); } $this->setHost($address); diff --git a/lib/Tools/Traits/TArrayTools.php b/lib/Tools/Traits/TArrayTools.php index 3e21bb7e..523ef136 100644 --- a/lib/Tools/Traits/TArrayTools.php +++ b/lib/Tools/Traits/TArrayTools.php @@ -228,7 +228,7 @@ trait TArrayTools { $list = $this->getArray($k, $arr, $default); $r = []; - list($obj, $method) = $import; + [$obj, $method] = $import; foreach ($list as $item) { try { $o = new $obj(); diff --git a/lib/Tools/Traits/TNCDataResponse.php b/lib/Tools/Traits/TNCDataResponse.php index d8297f10..1ee3e72f 100644 --- a/lib/Tools/Traits/TNCDataResponse.php +++ b/lib/Tools/Traits/TNCDataResponse.php @@ -11,9 +11,9 @@ namespace OCA\Social\Tools\Traits; use Exception; use JsonSerializable; -use OC; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; +use Psr\Log\LoggerInterface; /** * Trait TNCDataResponse @@ -27,7 +27,7 @@ trait TNCDataResponse { */ protected function fail( Exception $e, array $more = [], int $status = Http::STATUS_INTERNAL_SERVER_ERROR, - bool $log = true + bool $log = true, ): DataResponse { $data = array_merge( $more, @@ -39,8 +39,7 @@ trait TNCDataResponse { ); if ($log) { - OC::$server->getLogger() - ->log(2, $status . ' - ' . json_encode($data)); + \OCP\Server::get(LoggerInterface::class)->warning($status . ' - ' . json_encode($data)); } return new DataResponse($data, $status); diff --git a/lib/Tools/Traits/TPathTools.php b/lib/Tools/Traits/TPathTools.php index 4a1b1af3..dffc2d37 100644 --- a/lib/Tools/Traits/TPathTools.php +++ b/lib/Tools/Traits/TPathTools.php @@ -36,7 +36,7 @@ trait TPathTools { * * @return string */ - protected function withoutEndSlash(string $path, bool $force = false, bool $clean = true + protected function withoutEndSlash(string $path, bool $force = false, bool $clean = true, ): string { if ($clean) { $path = str_replace('//', '/', $path); diff --git a/lib/Tools/Traits/TRequest.php b/lib/Tools/Traits/TRequest.php index 758a973d..41cb3475 100644 --- a/lib/Tools/Traits/TRequest.php +++ b/lib/Tools/Traits/TRequest.php @@ -196,7 +196,7 @@ trait TRequest { return; } - curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "PUT"); + curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT'); curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getDataBody()); } @@ -208,7 +208,7 @@ trait TRequest { return; } - curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "DELETE"); + curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE'); curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getDataBody()); } diff --git a/lib/WellKnown/JrdResponse.php b/lib/WellKnown/JrdResponse.php index 558be8e7..54882cb2 100644 --- a/lib/WellKnown/JrdResponse.php +++ b/lib/WellKnown/JrdResponse.php @@ -125,7 +125,7 @@ final class JrdResponse implements IResponse { ?string $href, ?array $titles = [], ?array $properties = [], - array $entries = [] + array $entries = [], ): self { $this->links[] = array_filter( array_merge( diff --git a/lib/WellKnown/WebfingerHandler.php b/lib/WellKnown/WebfingerHandler.php index f89c2a63..fee8c4b2 100644 --- a/lib/WellKnown/WebfingerHandler.php +++ b/lib/WellKnown/WebfingerHandler.php @@ -35,7 +35,7 @@ class WebfingerHandler implements IHandler { public function __construct( IURLGenerator $urlGenerator, CacheActorsRequest $cacheActorsRequest, CacheActorService $cacheActorService, FediverseService $fediverseService, - ConfigService $configService + ConfigService $configService, ) { $this->urlGenerator = $urlGenerator; $this->cacheActorsRequest = $cacheActorsRequest; @@ -57,7 +57,7 @@ class WebfingerHandler implements IHandler { public function handle( string $service, IRequestContext $context, - ?IResponse $previousResponse + ?IResponse $previousResponse, ): ?IResponse { try { $this->fediverseService->jailed(); diff --git a/psalm.xml b/psalm.xml index eb6d9e11..4829c769 100644 --- a/psalm.xml +++ b/psalm.xml @@ -27,6 +27,9 @@ + + + diff --git a/tests/bootstrap.php b/tests/bootstrap.php index d7bc4706..8fa874af 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -5,7 +5,7 @@ */ require_once __DIR__ . '/../../../tests/bootstrap.php'; -require_once __DIR__.'/../vendor/autoload.php'; +require_once __DIR__ . '/../vendor/autoload.php'; OC_App::loadApp('social'); OC_Hook::clear(); diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index 999bc7fe..8ce4f8c1 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -1,39 +1,36 @@ - + - - - - Acore + - ACore - ACore + + - $parent + parent]]> - $v === null + - $v === 0 - $v === 0 + + - dropTable - hasTable - hasTable + + + - Server::get(Connection::class) - Server::get(Connection::class) + + @@ -41,7 +38,7 @@ cache->get(self::CACHE_PREFIX . 'wellknown') === 'true')]]> - ClientException + @@ -59,14 +56,14 @@ - !$type - !$type - !$type + + + - $varr[0] !== null + diff --git a/tests/stub.phpstub b/tests/stub.phpstub index e0234519..1fbf2eb8 100644 --- a/tests/stub.phpstub +++ b/tests/stub.phpstub @@ -552,9 +552,12 @@ namespace OC\DB\QueryBuilder { public function createFunction($call) { } public function getLastInsertId(): int { } public function getTableName($table) { } - protected function prefixTableName($table) { } + public function prefixTableName($table): string { } public function getColumnName($column, $tableAlias = '') { } public function quoteAlias($alias) { } + public function getOutputColumns(): array { } + public function hintShardKey(string $column, mixed $value, bool $overwrite = false): self { } + public function runAcrossAllShards(): self { } } }