Update to php 7.4 type hinting

Using rector Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2022-04-15 13:01:18 +02:00 · 2022-04-15 13:01:18 +02:00 · be80ca5d0f
commit be80ca5d0f
--- a/composer.json
+++ b/composer.json
@ -11,7 +11,7 @@
  ],
  "config": {
    "platform": {
-      "php": "7.0.0"
+      "php": "7.4.0"
    },
    "optimize-autoloader": true,
    "classmap-authoritative": true,
@ -29,7 +29,8 @@
  },
  "require-dev": {
    "jakub-onderka/php-parallel-lint": "^1.0",
-    "phpunit/phpunit": "^6.4"
+    "phpunit/phpunit": "^6.4",
+    "rector/rector": "^0.12.20"
  },
  "repositories": [
    {
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "773474981fdf7ef0b2f1bcf58cf1b2ec",
+    "content-hash": "405966d6d5e0478e4540a9f1e26734fc",
    "packages": [
        {
            "name": "daita/my-small-php-tools",
@ -607,6 +607,65 @@
            ],
            "time": "2020-03-05T15:02:03+00:00"
        },
+        {
+            "name": "phpstan/phpstan",
+            "version": "1.5.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "d77a607667f29ae099c0686f99664bd451fd23df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d77a607667f29ae099c0686f99664bd451fd23df",
+                "reference": "d77a607667f29ae099c0686f99664bd451fd23df",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/1.5.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpstan",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-14T12:20:26+00:00"
+        },
        {
            "name": "phpunit/php-code-coverage",
            "version": "5.3.2",
@ -1001,6 +1060,66 @@
            "abandoned": true,
            "time": "2018-08-09T05:50:03+00:00"
        },
+        {
+            "name": "rector/rector",
+            "version": "0.12.20",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rectorphp/rector.git",
+                "reference": "cfa8d3e236a6e1a41d69712a84d434dfdf70e560"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/cfa8d3e236a6e1a41d69712a84d434dfdf70e560",
+                "reference": "cfa8d3e236a6e1a41d69712a84d434dfdf70e560",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0",
+                "phpstan/phpstan": "^1.5"
+            },
+            "conflict": {
+                "phpstan/phpdoc-parser": "<1.2",
+                "rector/rector-cakephp": "*",
+                "rector/rector-doctrine": "*",
+                "rector/rector-laravel": "*",
+                "rector/rector-nette": "*",
+                "rector/rector-phpoffice": "*",
+                "rector/rector-phpunit": "*",
+                "rector/rector-prefixed": "*",
+                "rector/rector-symfony": "*"
+            },
+            "bin": [
+                "bin/rector"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "0.12-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Instant Upgrade and Automated Refactoring of any PHP code",
+            "support": {
+                "issues": "https://github.com/rectorphp/rector/issues",
+                "source": "https://github.com/rectorphp/rector/tree/0.12.20"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/tomasvotruba",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-04-06T12:55:14+00:00"
+        },
        {
            "name": "sebastian/code-unit-reverse-lookup",
            "version": "1.0.2",
@ -1766,7 +1885,7 @@
    "platform": [],
    "platform-dev": [],
    "platform-overrides": {
-        "php": "7.0.0"
+        "php": "7.4.0"
    },
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.2.0"
 }
--- a/lib/Command/AccountCreate.php
+++ b/lib/Command/AccountCreate.php
@ -45,33 +45,12 @@ use Symfony\Component\Console\Output\OutputInterface;


 class AccountCreate extends Base {
+	private IUserManager $userManager;
+	private AccountService $accountService;
+	private CacheActorService $cacheActorService;
+	private ConfigService $configService;
+	private MiscService $miscService;

-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var CacheActorService */
-	private $cacheActorService;
-
-	/** @var ConfigService */
-	private $configService;
-
-	/** @var MiscService */
-	private $miscService;
-
-
-	/**
-	 * CacheUpdate constructor.
-	 *
-	 * @param IUserManager $userManager
-	 * @param AccountService $accountService
-	 * @param CacheActorService $cacheActorService
-	 * @param ConfigService $configService
-	 * @param MiscService $miscService
-	 */
 	public function __construct(
 		IUserManager $userManager, AccountService $accountService,
 		CacheActorService $cacheActorService, ConfigService $configService, MiscService $miscService
@ -86,10 +65,6 @@ class AccountCreate extends Base {
 		$this->miscService = $miscService;
 	}

-
-	/**
-	 *
-	 */
 	protected function configure() {
 		parent::configure();
 		$this->setName('social:account:create')
@ -98,11 +73,7 @@ class AccountCreate extends Base {
 			 ->setDescription('Create a new social account');
 	}

-
 	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 *
 	 * @throws Exception
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
@ -118,6 +89,5 @@ class AccountCreate extends Base {

 		$this->accountService->createActor($userId, $handle);
 	}
-
 }

--- a/lib/Command/AccountFollowing.php
+++ b/lib/Command/AccountFollowing.php
@ -45,33 +45,12 @@ use Symfony\Component\Console\Output\OutputInterface;


 class AccountFollowing extends Base {
+	private AccountService $accountService;
+	private CacheActorService $cacheActorService;
+	private FollowService $followService;
+	private ConfigService $configService;
+	private MiscService $miscService;

-
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var CacheActorService */
-	private $cacheActorService;
-
-	/** @var FollowService */
-	private $followService;
-
-	/** @var ConfigService */
-	private $configService;
-
-	/** @var MiscService */
-	private $miscService;
-
-
-	/**
-	 * CacheUpdate constructor.
-	 *
-	 * @param AccountService $accountService
-	 * @param CacheActorService $cacheActorService
-	 * @param FollowService $followService
-	 * @param ConfigService $configService
-	 * @param MiscService $miscService
-	 */
 	public function __construct(
 		AccountService $accountService, CacheActorService $cacheActorService,
 		FollowService $followService, ConfigService $configService, MiscService $miscService
@ -85,10 +64,6 @@ class AccountFollowing extends Base {
 		$this->miscService = $miscService;
 	}

-
-	/**
-	 *
-	 */
 	protected function configure() {
 		parent::configure();
 		$this->setName('social:account:following')
@ -99,11 +74,7 @@ class AccountFollowing extends Base {
 			 ->setDescription('Following a new account');
 	}

-
 	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 *
 	 * @throws Exception
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
--- a/lib/Command/CacheRefresh.php
+++ b/lib/Command/CacheRefresh.php
@ -44,41 +44,14 @@ use Symfony\Component\Console\Output\OutputInterface;


 class CacheRefresh extends Base {
+	private AccountService $accountService;
+	private CacheActorService $cacheActorService;
+	private DocumentService $documentService;
+	private HashtagService $hashtagService;

-
-	/** @var AccountService */
-	private $accountService;
-
-	/** @var CacheActorService */
-	private $cacheActorService;
-
-	/** @var DocumentService */
-	private $documentService;
-
-	/** @var HashtagService */
-	private $hashtagService;
-
-	/** @var ConfigService */
-	private $configService;
-
-	/** @var MiscService */
-	private $miscService;
-
-
-	/**
-	 * CacheUpdate constructor.
-	 *
-	 * @param AccountService $accountService
-	 * @param CacheActorService $cacheActorService
-	 * @param DocumentService $documentService
-	 * @param HashtagService $hashtagService
-	 * @param ConfigService $configService
-	 * @param MiscService $miscService
-	 */
 	public function __construct(
 		AccountService $accountService, CacheActorService $cacheActorService,
-		DocumentService $documentService, HashtagService $hashtagService,
-		ConfigService $configService, MiscService $miscService
+		DocumentService $documentService, HashtagService $hashtagService
 	) {
 		parent::__construct();

@ -86,25 +59,15 @@ class CacheRefresh extends Base {
 		$this->cacheActorService = $cacheActorService;
 		$this->documentService = $documentService;
 		$this->hashtagService = $hashtagService;
-		$this->configService = $configService;
-		$this->miscService = $miscService;
 	}

-
-	/**
-	 *
-	 */
 	protected function configure() {
 		parent::configure();
 		$this->setName('social:cache:refresh')
 			 ->setDescription('Update the cache');
 	}

-
 	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 *
 	 * @throws Exception
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
@ -127,6 +90,5 @@ class CacheRefresh extends Base {
 		$result = $this->hashtagService->manageHashtags();
 		$output->writeLn($result . ' hashtags updated');
 	}
-
 }

--- a/lib/Command/CheckInstall.php
+++ b/lib/Command/CheckInstall.php
@ -56,32 +56,24 @@ class CheckInstall extends Base {
 	use TArrayTools;


-	/** @var IUserManager */
-	private $userManager;
+	private IUserManager $userManager;

-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var StreamDestRequest */
-	private $streamDestRequest;
+	private StreamDestRequest $streamDestRequest;

-	/** @var StreamTagsRequest */
-	private $streamTagsRequest;
+	private StreamTagsRequest $streamTagsRequest;

-	/** @var CheckService */
-	private $checkService;
+	private CheckService $checkService;

 	/** @var */
 	private $configService;

-	/** @var PushService */
-	private $pushService;
+	private PushService $pushService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Command/ExtendedBase.php
+++ b/lib/Command/ExtendedBase.php
@ -44,11 +44,9 @@ use Symfony\Component\Console\Output\OutputInterface;

 class ExtendedBase extends Base {

-	/** @var OutputInterface */
-	protected $output;
+	protected ?OutputInterface $output = null;

-	/** @var bool */
-	protected $asJson = false;
+	protected bool $asJson = false;


 	/**
--- a/lib/Command/Fediverse.php
+++ b/lib/Command/Fediverse.php
@ -51,18 +51,14 @@ use Symfony\Component\Console\Output\OutputInterface;
 class Fediverse extends Base {


-	/** @var FediverseService */
-	private $fediverseService;
+	private FediverseService $fediverseService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


-	/** @var OutputInterface */
-	private $output;
+	private ?OutputInterface $output = null;


 	/**
--- a/lib/Command/MigrateAlpha3.php
+++ b/lib/Command/MigrateAlpha3.php
@ -53,27 +53,20 @@ class MigrateAlpha3 extends Base {
 	use TArrayTools;


-	/** @var IDBConnection */
-	private $dbConnection;
+	private IDBConnection $dbConnection;

-	/** @var CoreRequestBuilder */
-	private $coreRequestBuilder;
+	private CoreRequestBuilder $coreRequestBuilder;

-	/** @var CheckService */
-	private $checkService;
+	private CheckService $checkService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;

-	/** @var array */
-	private $done = [];
+	private array $done = [];


-	/** @var array */
-	public $tables = [
+	public array $tables = [
 		'social_a2_actions'       => [
 			['id_prim'],
 			'social_3_action',
--- a/lib/Command/NoteBoost.php
+++ b/lib/Command/NoteBoost.php
@ -50,17 +50,13 @@ use Symfony\Component\Console\Output\OutputInterface;
 */
 class NoteBoost extends Base {

-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var BoostService */
-	private $boostService;
+	private BoostService $boostService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Command/NoteCreate.php
+++ b/lib/Command/NoteCreate.php
@ -54,23 +54,17 @@ use Symfony\Component\Console\Output\OutputInterface;
 class NoteCreate extends Base {


-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var ActivityService */
-	private $activityService;
+	private ActivityService $activityService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var PostService */
-	private $postService;
+	private PostService $postService;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Command/NoteLike.php
+++ b/lib/Command/NoteLike.php
@ -51,17 +51,13 @@ use Symfony\Component\Console\Output\OutputInterface;
 class NoteLike extends Base {


-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var LikeService */
-	private $likeService;
+	private LikeService $likeService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Command/QueueProcess.php
+++ b/lib/Command/QueueProcess.php
@ -45,20 +45,15 @@ use Symfony\Component\Console\Output\OutputInterface;
 class QueueProcess extends Base {


-	/** @var ActivityService */
-	private $activityService;
+	private ActivityService $activityService;

-	/** @var StreamQueueService */
-	private $streamQueueService;
+	private StreamQueueService $streamQueueService;

-	/** @var RequestQueueService */
-	private $requestQueueService;
+	private RequestQueueService $requestQueueService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Command/QueueStatus.php
+++ b/lib/Command/QueueStatus.php
@ -43,14 +43,11 @@ use Symfony\Component\Console\Output\OutputInterface;
 class QueueStatus extends Base {


-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var RequestQueueService */
-	private $requestQueueService;
+	private RequestQueueService $requestQueueService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Command/Reset.php
+++ b/lib/Command/Reset.php
@ -47,17 +47,13 @@ use Symfony\Component\Console\Question\Question;
 class Reset extends Base {


-	/** @var CoreRequestBuilder */
-	private $coreRequestBuilder;
+	private CoreRequestBuilder $coreRequestBuilder;

-	/** @var CheckService */
-	private $checkService;
+	private CheckService $checkService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Command/StreamDetails.php
+++ b/lib/Command/StreamDetails.php
@ -52,14 +52,11 @@ use Symfony\Component\Console\Output\OutputInterface;
 class StreamDetails extends ExtendedBase {


-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var DetailsService */
-	private $detailsService;
+	private DetailsService $detailsService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Command/Timeline.php
+++ b/lib/Command/Timeline.php
@ -52,24 +52,18 @@ use Symfony\Component\Console\Output\OutputInterface;
 */
 class Timeline extends ExtendedBase {

-	/** @var IUserManager */
-	private $userManager;
+	private IUserManager $userManager;

-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


-	/** @var int */
-	private $count;
+	private ?int $count = null;


 	/**
--- a/lib/Controller/ActivityPubController.php
+++ b/lib/Controller/ActivityPubController.php
@ -69,38 +69,27 @@ class ActivityPubController extends Controller {
 use TNC20Logger;


-	/** @var SocialPubController */
-	private $socialPubController;
+	private SocialPubController $socialPubController;

-	/** @var FediverseService */
-	private $fediverseService;
+	private FediverseService $fediverseService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var SignatureService */
-	private $signatureService;
+	private SignatureService $signatureService;

-	/** @var StreamQueueService */
-	private $streamQueueService;
+	private StreamQueueService $streamQueueService;

-	/** @var ImportService */
-	private $importService;
+	private ImportService $importService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var FollowService */
-	private $followService;
+	private FollowService $followService;

-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Controller/ApiController.php
+++ b/lib/Controller/ApiController.php
@ -67,42 +67,30 @@ class ApiController extends Controller {
 	use TNCDataResponse;


-	/** @var IUserSession */
-	private $userSession;
+	private IUserSession $userSession;

-	/** @var InstanceService */
-	private $instanceService;
+	private InstanceService $instanceService;

-	/** @var ClientService */
-	private $clientService;
+	private ClientService $clientService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var FollowService */
-	private $followService;
+	private FollowService $followService;

-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


-	/** @var string */
-	private $bearer = '';
+	private string $bearer = '';

-	/** @var SocialClient */
-	private $client;
+	private ?SocialClient $client = null;

-	/** @var Person */
-	private $viewer;
+	private ?Person $viewer = null;


 	/**
--- a/lib/Controller/ConfigController.php
+++ b/lib/Controller/ConfigController.php
@ -44,14 +44,11 @@ class ConfigController extends Controller {
 	use TNCDataResponse;


-	/** @var TestService */
-	private $testService;
+	private TestService $testService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	public function __construct(
--- a/lib/Controller/LocalController.php
+++ b/lib/Controller/LocalController.php
@ -72,45 +72,32 @@ class LocalController extends Controller {
 	use TNCDataResponse;


-	/** @var string */
-	private $userId;
+	private string $userId;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var HashtagService */
-	private $hashtagService;
+	private HashtagService $hashtagService;

-	/** @var FollowService */
-	private $followService;
+	private FollowService $followService;

-	/** @var BoostService */
-	private $boostService;
+	private BoostService $boostService;

-	/** @var LikeService */
-	private $likeService;
+	private LikeService $likeService;

-	/** @var PostService */
-	private $postService;
+	private PostService $postService;

-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var SearchService */
-	private $searchService;
+	private SearchService $searchService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var DocumentService */
-	private $documentService;
+	private DocumentService $documentService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


-	/** @var Person */
-	private $viewer;
+	private ?Person $viewer = null;


 	/**
--- a/lib/Controller/OAuthController.php
+++ b/lib/Controller/OAuthController.php
@ -58,29 +58,21 @@ class OAuthController extends Controller {
 	use TNCDataResponse;


-	/** @var IUserSession */
-	private $userSession;
+	private IUserSession $userSession;

-	/** @var IURLGenerator */
-	private $urlGenerator;
+	private IURLGenerator $urlGenerator;

-	/** @var InstanceService */
-	private $instanceService;
+	private InstanceService $instanceService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var ClientService */
-	private $clientService;
+	private ClientService $clientService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Controller/OStatusController.php
+++ b/lib/Controller/OStatusController.php
@ -58,22 +58,16 @@ class OStatusController extends Controller {
 	use TArrayTools;


-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;

-	/** @var IUserManager */
-	private $userSession;
-	/** @var IInitialStateService */
-	private $initialStateService;
+	private IUserManager $userSession;
+	private IInitialStateService $initialStateService;


 	/**
--- a/lib/Controller/QueueController.php
+++ b/lib/Controller/QueueController.php
@ -51,14 +51,11 @@ class QueueController extends Controller {

 	use TAsync;

-	/** @var RequestQueueService */
-	private $requestQueueService;
+	private RequestQueueService $requestQueueService;

-	/** @var ActivityService */
-	private $activityService;
+	private ActivityService $activityService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Controller/SocialPubController.php
+++ b/lib/Controller/SocialPubController.php
@ -65,26 +65,19 @@ class SocialPubController extends Controller {
 	use TNCDataResponse;


-	/** @var string */
-	private $userId;
+	private string $userId;

-	/** @var IL10N */
-	private $l10n;
+	private IL10N $l10n;

-	/** @var NavigationController */
-	private $navigationController;
+	private NavigationController $navigationController;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;


 	/**
--- a/lib/Cron/Cache.php
+++ b/lib/Cron/Cache.php
@ -49,17 +49,13 @@ use OCP\AppFramework\QueryException;
 class Cache extends TimedJob {


-	/** @var AccountService */
-	private $accountService;
+	private ?AccountService $accountService = null;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private ?CacheActorService $cacheActorService = null;

-	/** @var DocumentService */
-	private $documentService;
+	private ?DocumentService $documentService = null;

-	/** @var HashtagService */
-	private $hashtagService;
+	private ?HashtagService $hashtagService = null;


 	/**
--- a/lib/Cron/Chunk.php
+++ b/lib/Cron/Chunk.php
@ -45,11 +45,9 @@ use OCP\AppFramework\QueryException;
 */
 class Chunk extends TimedJob {

-	/** @var ConfigService */
-	private $configService;
+	private ?ConfigService $configService = null;

-	/** @var MiscService */
-	private $miscService;
+	private ?MiscService $miscService = null;


 	/**
--- a/lib/Cron/Queue.php
+++ b/lib/Cron/Queue.php
@ -49,17 +49,13 @@ use OCP\AppFramework\QueryException;
 class Queue extends TimedJob {


-	/** @var ActivityService */
-	private $activityService;
+	private ?ActivityService $activityService = null;

-	/** @var RequestQueueService */
-	private $requestQueueService;
+	private ?RequestQueueService $requestQueueService = null;

-	/** @var StreamQueueService */
-	private $streamQueueService;
+	private ?StreamQueueService $streamQueueService = null;

-	/** @var MiscService */
-	private $miscService;
+	private ?MiscService $miscService = null;


 	/**
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@ -79,8 +79,7 @@ class CoreRequestBuilder {
 	const TABLE_CLIENT_TOKEN = 'social_3_client_token';


-	/** @var array */
-	private $tables = [
+	private array $tables = [
 		self::TABLE_REQUEST_QUEUE,
 		self::TABLE_ACTORS,
 		self::TABLE_STREAM,
--- a/lib/Db/SocialQueryBuilder.php
+++ b/lib/Db/SocialQueryBuilder.php
@ -39,8 +39,7 @@ namespace OCA\Social\Db;
 class SocialQueryBuilder extends SocialFiltersQueryBuilder {


-	/** @var int */
-	private $format = 1;
+	private int $format = 1;


 	/**
--- a/lib/Interfaces/Activity/AcceptInterface.php
+++ b/lib/Interfaces/Activity/AcceptInterface.php
@ -42,8 +42,7 @@ use OCA\Social\Service\MiscService;
 class AcceptInterface implements IActivityPubInterface {


-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Activity/AddInterface.php
+++ b/lib/Interfaces/Activity/AddInterface.php
@ -42,8 +42,7 @@ use OCA\Social\Service\MiscService;
 class AddInterface implements IActivityPubInterface {


-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Activity/BlockInterface.php
+++ b/lib/Interfaces/Activity/BlockInterface.php
@ -42,8 +42,7 @@ use OCA\Social\Service\MiscService;
 class BlockInterface implements IActivityPubInterface {


-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Activity/CreateInterface.php
+++ b/lib/Interfaces/Activity/CreateInterface.php
@ -42,8 +42,7 @@ use OCA\Social\Service\MiscService;
 class CreateInterface implements IActivityPubInterface {


-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Activity/DeleteInterface.php
+++ b/lib/Interfaces/Activity/DeleteInterface.php
@ -42,8 +42,7 @@ use OCA\Social\Service\MiscService;
 class DeleteInterface implements IActivityPubInterface {


-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Activity/RejectInterface.php
+++ b/lib/Interfaces/Activity/RejectInterface.php
@ -42,8 +42,7 @@ use OCA\Social\Service\MiscService;
 class RejectInterface implements IActivityPubInterface {


-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Activity/RemoveInterface.php
+++ b/lib/Interfaces/Activity/RemoveInterface.php
@ -42,8 +42,7 @@ use OCA\Social\Service\MiscService;
 class RemoveInterface implements IActivityPubInterface {


-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Activity/UndoInterface.php
+++ b/lib/Interfaces/Activity/UndoInterface.php
@ -42,8 +42,7 @@ use OCA\Social\Service\MiscService;
 class UndoInterface implements IActivityPubInterface {


-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Activity/UpdateInterface.php
+++ b/lib/Interfaces/Activity/UpdateInterface.php
@ -42,8 +42,7 @@ use OCA\Social\Service\MiscService;
 class UpdateInterface implements IActivityPubInterface {


-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Actor/PersonInterface.php
+++ b/lib/Interfaces/Actor/PersonInterface.php
@ -58,23 +58,17 @@ class PersonInterface implements IActivityPubInterface {
 	use TArrayTools;


-	/** @var CacheActorsRequest */
-	private $cacheActorsRequest;
+	private CacheActorsRequest $cacheActorsRequest;

-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var FollowsRequest */
-	private $followsRequest;
+	private FollowsRequest $followsRequest;

-	/** @var ActorService */
-	private $actorService;
+	private ActorService $actorService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Internal/SocialAppNotificationInterface.php
+++ b/lib/Interfaces/Internal/SocialAppNotificationInterface.php
@ -45,17 +45,13 @@ use OCA\Social\Service\MiscService;
 class SocialAppNotificationInterface implements IActivityPubInterface {


-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Object/AnnounceInterface.php
+++ b/lib/Interfaces/Object/AnnounceInterface.php
@ -77,20 +77,15 @@ class AnnounceInterface implements IActivityPubInterface {
 	use TArrayTools;


-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var ActionsRequest */
-	private $actionsRequest;
+	private ActionsRequest $actionsRequest;

-	/** @var StreamQueueService */
-	private $streamQueueService;
+	private StreamQueueService $streamQueueService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Object/DocumentInterface.php
+++ b/lib/Interfaces/Object/DocumentInterface.php
@ -45,11 +45,9 @@ use OCA\Social\Service\MiscService;
 class DocumentInterface implements IActivityPubInterface {


-	/** @var CacheDocumentsRequest */
-	protected $cacheDocumentsRequest;
+	protected CacheDocumentsRequest $cacheDocumentsRequest;

-	/** @var MiscService */
-	protected $miscService;
+	protected MiscService $miscService;


 	/**
--- a/lib/Interfaces/Object/FollowInterface.php
+++ b/lib/Interfaces/Object/FollowInterface.php
@ -71,23 +71,17 @@ use OCA\Social\Service\MiscService;
 class FollowInterface implements IActivityPubInterface {


-	/** @var FollowsRequest */
-	private $followsRequest;
+	private FollowsRequest $followsRequest;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var ActivityService */
-	private $activityService;
+	private ActivityService $activityService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Object/LikeInterface.php
+++ b/lib/Interfaces/Object/LikeInterface.php
@ -61,17 +61,13 @@ use OCA\Social\Service\MiscService;
 */
 class LikeInterface implements IActivityPubInterface {

-	/** @var ActionsRequest */
-	private $actionsRequest;
+	private ActionsRequest $actionsRequest;

-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Interfaces/Object/NoteInterface.php
+++ b/lib/Interfaces/Object/NoteInterface.php
@ -49,20 +49,15 @@ use OCA\Social\Service\PushService;
 class NoteInterface implements IActivityPubInterface {


-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var PushService */
-	private $pushService;
+	private PushService $pushService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Migration/CheckInstallation.php
+++ b/lib/Migration/CheckInstallation.php
@ -44,8 +44,7 @@ use OCP\Migration\IRepairStep;
 class CheckInstallation implements IRepairStep {


-	/** @var CheckService */
-	protected $checkService;
+	protected CheckService $checkService;


 	/**
--- a/lib/Migration/Version0003Date20200611000001.php
+++ b/lib/Migration/Version0003Date20200611000001.php
@ -48,8 +48,7 @@ use OCP\Migration\SimpleMigrationStep;
 class Version0003Date20200611000001 extends SimpleMigrationStep {


-	/** @var IDBConnection */
-	private $connection;
+	private IDBConnection $connection;


 	/**
--- a/lib/Migration/Version0003Date20200823023900.php
+++ b/lib/Migration/Version0003Date20200823023900.php
@ -49,8 +49,7 @@ use OCP\Migration\SimpleMigrationStep;
 class Version0003Date20200823023900 extends SimpleMigrationStep {


-	/** @var IDBConnection */
-	private $connection;
+	private IDBConnection $connection;


 	/**
--- a/lib/Migration/Version0003Date20200823023911.php
+++ b/lib/Migration/Version0003Date20200823023911.php
@ -49,8 +49,7 @@ use OCP\Migration\SimpleMigrationStep;
 class Version0003Date20200823023911 extends SimpleMigrationStep {


-	/** @var IDBConnection */
-	private $connection;
+	private IDBConnection $connection;


 	/**
--- a/lib/Migration/Version0003Date20200921103342.php
+++ b/lib/Migration/Version0003Date20200921103342.php
@ -47,8 +47,7 @@ use OCP\Migration\SimpleMigrationStep;
 class Version0003Date20200921103342 extends SimpleMigrationStep {


-	/** @var IDBConnection */
-	private $connection;
+	private IDBConnection $connection;


 	/**
--- a/lib/Model/ActivityPub/ACore.php
+++ b/lib/Model/ActivityPub/ACore.php
@ -71,26 +71,19 @@ class ACore extends Item implements JsonSerializable {
 	/** @var null Item */
 	private $parent = null;

-	/** @var string */
-	private $requestToken = '';
+	private string $requestToken = '';

-	/** @var array */
-	private $entries = [];
+	private array $entries = [];

-	/** @var ACore */
-	private $object = null;
+	private ?\OCA\Social\Model\ActivityPub\ACore $object = null;

-	/** @var Document */
-	private $icon = null;
+	private ?Document $icon = null;

-	/** @var bool */
-	private $displayW3ContextSecurity = false;
+	private bool $displayW3ContextSecurity = false;

-	/** @var LinkedDataSignature */
-	private $signature = null;
+	private ?LinkedDataSignature $signature = null;

-	/** @var int */
-	private $format = self::FORMAT_ACTIVITYPUB;
+	private int $format = self::FORMAT_ACTIVITYPUB;


 	/**
--- a/lib/Model/ActivityPub/Actor/Person.php
+++ b/lib/Model/ActivityPub/Actor/Person.php
@ -64,80 +64,55 @@ class Person extends ACore implements IQueryRow, JsonSerializable {
 	const LINK_LOCAL = 'local';


-	/** @var string */
-	private $userId = '';
+	private string $userId = '';

-	/** @var string */
-	private $name = '';
+	private string $name = '';

-	/** @var string */
-	private $preferredUsername = '';
+	private string $preferredUsername = '';

-	/** @var string */
-	private $displayName = '';
+	private string $displayName = '';

-	/** @var string */
-	private $description = '';
+	private string $description = '';

-	/** @var string */
-	private $publicKey = '';
+	private string $publicKey = '';

-	/** @var string */
-	private $privateKey = '';
+	private string $privateKey = '';

-	/** @var int */
-	private $creation = 0;
+	private int $creation = 0;

-	/** @var string */
-	private $account = '';
+	private string $account = '';

-	/** @var string */
-	private $following = '';
+	private string $following = '';

-	/** @var string */
-	private $followers = '';
+	private string $followers = '';

-	/** @var string */
-	private $inbox = '';
+	private string $inbox = '';

-	/** @var string */
-	private $outbox = '';
+	private string $outbox = '';

-	/** @var string */
-	private $sharedInbox = '';
+	private string $sharedInbox = '';

-	/** @var string */
-	private $featured = '';
+	private string $featured = '';

-	/** @var string */
-	private $avatar = '';
+	private string $avatar = '';

-	/** @var string */
-	private $header = '';
+	private string $header = '';

-	/** @var bool */
-	private $locked = false;
+	private bool $locked = false;

-	/** @var bool */
-	private $bot = false;
+	private bool $bot = false;

-	/** @var bool */
-	private $discoverable = false;
+	private bool $discoverable = false;

-	/** @var string */
-	private $privacy = 'public';
+	private string $privacy = 'public';

-	/** @var bool */
-	private $sensitive = false;
+	private bool $sensitive = false;

-	/** @var string */
-	private $language = 'en';
+	private string $language = 'en';

-	/** @var int */
-	private $avatarVersion = -1;
+	private int $avatarVersion = -1;

-	/** @var string */
-	private $viewerLink = '';
+	private string $viewerLink = '';

 	/**
 	 * Person constructor.
--- a/lib/Model/ActivityPub/Item.php
+++ b/lib/Model/ActivityPub/Item.php
@ -41,86 +41,60 @@ class Item {
 	use TArrayTools;


-	/** @var string */
-	private $urlSocial = '';
+	private string $urlSocial = '';

-	/** @var string */
-	private $urlCloud = '';
+	private string $urlCloud = '';

-	/** @var string */
-	private $address = '';
+	private string $address = '';

-	/** @var string */
-	private $id = '';
+	private string $id = '';

-	/** @var int */
-	private $nid = 0;
+	private int $nid = 0;

-	/** @var string */
-	private $type = '';
+	private string $type = '';

-	/** @var string */
-	private $subType = '';
+	private string $subType = '';

-	/** @var string */
-	private $url = '';
+	private string $url = '';

-	/** @var string */
-	private $attributedTo = '';
+	private string $attributedTo = '';

-	/** @var string */
-	private $summary = '';
+	private string $summary = '';

 	/** @var InstancePath[] */
-	private $instancePaths = [];
+	private array $instancePaths = [];

-	/** @var string */
-	private $to = '';
+	private string $to = '';

-	/** @var array */
-	private $toArray = [];
+	private array $toArray = [];

-	/** @var array */
-	private $cc = [];
+	private array $cc = [];

-	/** @var array */
-	private $bcc = [];
+	private array $bcc = [];

-	/** @var string */
-	private $published = '';
+	private string $published = '';

-	/** @var array */
-	private $tags = [];
+	private array $tags = [];

-	/** @var Person */
-	private $actor = null;
+	private ?Person $actor = null;

-	/** @var string */
-	private $actorId = '';
+	private string $actorId = '';

-	/** @var string */
-	private $iconId = '';
+	private string $iconId = '';

-	/** @var string */
-	private $objectId = '';
+	private string $objectId = '';

-	/** @var bool */
-	private $completeDetails = false;
+	private bool $completeDetails = false;

-	/** @var string */
-	private $source = '';
+	private string $source = '';

-	/** @var bool */
-	private $local = false;
+	private bool $local = false;

-	/** @var string */
-	private $origin = '';
+	private string $origin = '';

-	/** @var int */
-	private $originSource = 0;
+	private int $originSource = 0;

-	/** @var int */
-	private $originCreationTime = 0;
+	private int $originCreationTime = 0;


 	/**
--- a/lib/Model/ActivityPub/Object/Document.php
+++ b/lib/Model/ActivityPub/Object/Document.php
@ -50,29 +50,21 @@ class Document extends ACore implements JsonSerializable {
 	const TYPE = 'Document';


-	/** @var string */
-	private $mediaType = '';
+	private string $mediaType = '';

-	/** @var string */
-	private $mimeType = '';
+	private string $mimeType = '';

-	/** @var string */
-	private $localCopy = '';
+	private string $localCopy = '';

-	/** @var string */
-	private $resizedCopy = '';
+	private string $resizedCopy = '';

-	/** @var int */
-	private $caching = 0;
+	private int $caching = 0;

-	/** @var bool */
-	private $public = false;
+	private bool $public = false;

-	/** @var int */
-	private $error = 0;
+	private int $error = 0;

-	/** @var string */
-	private $parentId = '';
+	private string $parentId = '';

 	/**
 	 * Document constructor.
--- a/lib/Model/ActivityPub/Object/Follow.php
+++ b/lib/Model/ActivityPub/Object/Follow.php
@ -47,14 +47,11 @@ class Follow extends ACore implements JsonSerializable, IQueryRow {
 	const TYPE = 'Follow';


-	/** @var string */
-	private $followId = '';
+	private string $followId = '';

-	/** @var string */
-	private $followIdPrim = '';
+	private string $followIdPrim = '';

-	/** @var bool */
-	private $accepted = false;
+	private bool $accepted = false;


 	/**
--- a/lib/Model/ActivityPub/Object/Note.php
+++ b/lib/Model/ActivityPub/Object/Note.php
@ -46,11 +46,9 @@ class Note extends Stream implements JsonSerializable {
 	const TYPE = 'Note';


-	/** @var array */
-	private $attachments = [];
+	private array $attachments = [];

-	/** @var array */
-	private $hashtags = [];
+	private array $hashtags = [];


 	/**
--- a/lib/Model/ActivityPub/OrderedCollection.php
+++ b/lib/Model/ActivityPub/OrderedCollection.php
@ -45,11 +45,9 @@ class OrderedCollection extends ACore implements JsonSerializable {
 	const TYPE = 'OrderedCollection';


-	/** @var int */
-	private $totalItems = 0;
+	private int $totalItems = 0;

-	/** @var string */
-	private $first = '';
+	private string $first = '';

 	/**
 	 * Activity constructor.
--- a/lib/Model/ActivityPub/Stream.php
+++ b/lib/Model/ActivityPub/Stream.php
@ -62,44 +62,31 @@ class Stream extends ACore implements IQueryRow, JsonSerializable {
 	const TYPE_ANNOUNCE = 'announce';


-	/** @var string */
-	private $activityId = '';
+	private string $activityId = '';

-	/** @var string */
-	private $content = '';
+	private string $content = '';

-	/** @var string */
-	private $spoilerText = '';
+	private string $spoilerText = '';

-	/** @var string */
-	private $language = 'en';
+	private string $language = 'en';

-	/** @var string */
-	private $attributedTo = '';
+	private string $attributedTo = '';

-	/** @var string */
-	private $inReplyTo = '';
+	private string $inReplyTo = '';

-	/** @var bool */
-	private $sensitive = false;
+	private bool $sensitive = false;

-	/** @var string */
-	private $conversation = '';
+	private string $conversation = '';

-	/** @var Cache */
-	private $cache = null;
+	private ?Cache $cache = null;

-	/** @var int */
-	private $publishedTime = 0;
+	private int $publishedTime = 0;

-	/** @var StreamAction */
-	private $action = null;
+	private ?StreamAction $action = null;

-	/** @var string */
-	private $timeline = '';
+	private string $timeline = '';

-	/** @var bool */
-	private $filterDuplicate = false;
+	private bool $filterDuplicate = false;


 	/**
--- a/lib/Model/Client/Options/CoreOptions.php
+++ b/lib/Model/Client/Options/CoreOptions.php
@ -42,8 +42,7 @@ use OCA\Social\Model\ActivityPub\ACore;
 class CoreOptions {


-	/** @var int */
-	private $format = ACore::FORMAT_ACTIVITYPUB;
+	private int $format = ACore::FORMAT_ACTIVITYPUB;


 	/**
--- a/lib/Model/Client/Options/TimelineOptions.php
+++ b/lib/Model/Client/Options/TimelineOptions.php
@ -47,32 +47,23 @@ class TimelineOptions extends CoreOptions implements JsonSerializable {
 	use TArrayTools;


-	/** @var string */
-	private $timeline = '';
+	private string $timeline = '';

-	/** @var bool */
-	private $local = false;
+	private bool $local = false;

-	/** @var bool */
-	private $remote = false;
+	private bool $remote = false;

-	/** @var bool */
-	private $onlyMedia = false;
+	private bool $onlyMedia = false;

-	/** @var int */
-	private $minId = 0;
+	private int $minId = 0;

-	/** @var int */
-	private $maxId = 0;
+	private int $maxId = 0;

-	/** @var int */
-	private $sinceId = 0;
+	private int $sinceId = 0;

-	/** @var int */
-	private $limit = 20;
+	private int $limit = 20;

-	/** @var bool */
-	private $inverted = false;
+	private bool $inverted = false;


 	/**
--- a/lib/Model/Client/SocialClient.php
+++ b/lib/Model/Client/SocialClient.php
@ -49,50 +49,33 @@ class SocialClient implements IQueryRow, JsonSerializable {
 	use TArrayTools;


-	/** @var int */
-	private $id = 0;
+	private int $id = 0;

-	/** @var string */
-	private $appName = '';
+	private string $appName = '';

-	/** @var string */
-	private $appWebsite = '';
+	private string $appWebsite = '';

-	/** @var array */
-	private $appRedirectUris = [];
+	private array $appRedirectUris = [];

-	/** @var string */
-	private $appClientId = '';
+	private string $appClientId = '';

-	/** @var string */
-	private $appClientSecret = '';
+	private string $appClientSecret = '';

-	/** @var array */
-	private $appScopes = [];
+	private array $appScopes = [];

-	/** @var array */
-	private $authScopes = [];
+	private array $authScopes = [];

-	/** @var string */
-	private $authAccount = '';
+	private string $authAccount = '';

-	/** @var string */
-	private $authUserId = '';
+	private string $authUserId = '';

-	/** @var string */
-	private $authCode = '';
+	private string $authCode = '';

-//	/** @var string */
-//	private $authRedirectUri = '';
+private int $lastUpdate = -1;

-	/** @var int */
-	private $lastUpdate = -1;
+	private string $token = '';

-	/** @var string */
-	private $token = '';
-
-	/** @var int */
-	private $creation = -1;
+	private int $creation = -1;

 //	/** @var array */
 //	private $tokenScopes = [];
--- a/lib/Model/Instance.php
+++ b/lib/Model/Instance.php
@ -47,56 +47,39 @@ class Instance implements IQueryRow, JsonSerializable {
 	use TArrayTools;


-	/** @var bool */
-	private $local = false;
+	private bool $local = false;

-	/** @var string */
-	private $uri = '';
+	private string $uri = '';

-	/** @var string */
-	private $title = '';
+	private string $title = '';

-	/** @var string */
-	private $version = '';
+	private string $version = '';

-	/** @var string */
-	private $shortDescription = '';
+	private string $shortDescription = '';

-	/** @var string */
-	private $description = '';
+	private string $description = '';

-	/** @var string */
-	private $email = '';
+	private string $email = '';

-	/** @var array */
-	private $urls = [];
+	private array $urls = [];

-	/** @var array */
-	private $stats = [];
+	private array $stats = [];

-	/** @var array */
-	private $usage = [];
+	private array $usage = [];

-	/** @var string */
-	private $image = '';
+	private string $image = '';

-	/** @var array */
-	private $languages = [];
+	private array $languages = [];

-	/** @var bool */
-	private $registrations = false;
+	private bool $registrations = false;

-	/** @var bool */
-	private $approvalRequired = false;
+	private bool $approvalRequired = false;

-	/** @var bool */
-	private $invitesEnabled = false;
+	private bool $invitesEnabled = false;

-	/** @var Person */
-	private $contactAccount;
+	private ?Person $contactAccount = null;

-	/** @var string */
-	private $accountPrim;
+	private ?string $accountPrim = null;


 	/**
--- a/lib/Model/InstancePath.php
+++ b/lib/Model/InstancePath.php
@ -56,14 +56,11 @@ class InstancePath implements JsonSerializable {
 	const PRIORITY_HIGH = 3;
 	const PRIORITY_TOP = 4;

-	/** @var string */
-	private $uri = '';
+	private string $uri = '';

-	/** @var int */
-	private $type = 0;
+	private int $type = 0;

-	/** @var int */
-	private $priority = 0;
+	private int $priority = 0;


 	/**
--- a/lib/Model/LinkedDataSignature.php
+++ b/lib/Model/LinkedDataSignature.php
@ -47,29 +47,21 @@ class LinkedDataSignature implements JsonSerializable {

 	use TArrayTools;

-	/** @var string */
-	private $type = '';
+	private string $type = '';

-	/** @var string */
-	private $creator = '';
+	private string $creator = '';

-	/** @var string */
-	private $created = '';
+	private string $created = '';

-	/** @var string */
-	private $nonce = '';
+	private string $nonce = '';

-	/** @var string */
-	private $signatureValue = '';
+	private string $signatureValue = '';

-	/** @var string */
-	private $privateKey = '';
+	private string $privateKey = '';

-	/** @var string */
-	private $publicKey = '';
+	private string $publicKey = '';

-	/** @var array */
-	private $object = [];
+	private array $object = [];


 	/**
--- a/lib/Model/Post.php
+++ b/lib/Model/Post.php
@ -47,29 +47,23 @@ class Post implements JsonSerializable {
 	use TArrayTools;


-	/** @var Person */
-	private $actor;
+	private Person $actor;

-	/** @var array */
-	private $to = [];
+	private array $to = [];

-	/** @var string */
-	private $replyTo = '';
+	private string $replyTo = '';

-	/** @var string */
-	private $content = '';
+	private string $content = '';

-	/** @var string */
-	private $type = '';
+	private string $type = '';

-	/** @var array */
-	private $hashtags = [];
+	private array $hashtags = [];

 	/** @var string[] */
-	private $attachments = [];
+	private array $attachments = [];

 	/** @var Document[] */
-	private $documents = [];
+	private array $documents = [];

 	/**
 	 * Post constructor.
--- a/lib/Model/RequestQueue.php
+++ b/lib/Model/RequestQueue.php
@ -55,35 +55,25 @@ class RequestQueue implements JsonSerializable {
 	const STATUS_SUCCESS = 9;


-	/** @var integer */
-	private $id = 0;
+	private int $id = 0;

-	/** @var string */
-	private $token = '';
+	private string $token = '';

-	/** @var string */
-	private $author = '';
+	private string $author = '';

-	/** @var string */
-	private $activity = '';
+	private string $activity = '';

-	/** @var InstancePath */
-	private $instance;
+	private ?InstancePath $instance = null;

-	/** @var int */
-	private $priority = 0;
+	private int $priority = 0;

-	/** @var int */
-	private $status = 0;
+	private int $status = 0;

-	/** @var int */
-	private $tries = 0;
+	private int $tries = 0;

-	/** @var int */
-	private $last = 0;
+	private int $last = 0;

-	/** @var int */
-	private $timeout = 5;
+	private int $timeout = 5;


 	/**
--- a/lib/Model/StreamAction.php
+++ b/lib/Model/StreamAction.php
@ -53,17 +53,13 @@ class StreamAction implements JsonSerializable {
 	const REPLIED = 'replied';


-	/** @var integer */
-	private $id = 0;
+	private int $id = 0;

-	/** @var string */
-	private $actorId = '';
+	private string $actorId = '';

-	/** @var string */
-	private $streamId = '';
+	private string $streamId = '';

-	/** @var array */
-	private $values = [];
+	private array $values = [];


 	/**
--- a/lib/Model/StreamDetails.php
+++ b/lib/Model/StreamDetails.php
@ -48,20 +48,17 @@ class StreamDetails implements JsonSerializable {
 	use TArrayTools;


-	/** @var Stream */
-	private $stream;
+	private Stream $stream;

 	/** @var Person[] */
-	private $homeViewers = [];
+	private array $homeViewers = [];

 	/** @var Person[] */
-	private $directViewers = [];
+	private array $directViewers = [];

-	/** @var bool */
-	private $public = false;
+	private bool $public = false;

-	/** @var bool */
-	private $federated = false;
+	private bool $federated = false;


 	/**
--- a/lib/Model/StreamQueue.php
+++ b/lib/Model/StreamQueue.php
@ -56,26 +56,19 @@ class StreamQueue implements JsonSerializable {
 	const STATUS_SUCCESS = 9;


-	/** @var integer */
-	private $id = 0;
+	private int $id = 0;

-	/** @var string */
-	private $token = '';
+	private string $token = '';

-	/** @var string */
-	private $streamId = '';
+	private string $streamId = '';

-	/** @var string */
-	private $type = '';
+	private string $type = '';

-	/** @var int */
-	private $status = 0;
+	private int $status = 0;

-	/** @var int */
-	private $tries = 0;
+	private int $tries = 0;

-	/** @var int */
-	private $last = 0;
+	private int $last = 0;


 	/**
--- a/lib/Model/Test.php
+++ b/lib/Model/Test.php
@ -51,17 +51,13 @@ class Test extends SimpleDataStore implements JsonSerializable {
 	const SEVERITY_MANDATORY = 'mandatory';


-	/** @var string */
-	private $name;
+	private string $name;

-	/** @var string */
-	private $severity;
+	private string $severity;

-	/** @var bool */
-	private $success = false;
+	private bool $success = false;

-	/** @var array */
-	private $messages = [];
+	private array $messages = [];


 	/**
--- a/lib/Notification/Notifier.php
+++ b/lib/Notification/Notifier.php
@ -49,20 +49,15 @@ use OCP\Notification\INotifier;
 class Notifier implements INotifier {


-	/** @var IL10N */
-	private $l10n;
+	private IL10N $l10n;

-	/** @var IFactory */
-	protected $factory;
+	protected IFactory $factory;

-	/** @var IManager */
-	protected $contactsManager;
+	protected IManager $contactsManager;

-	/** @var IURLGenerator */
-	protected $url;
+	protected IURLGenerator $url;

-	/** @var ICloudIdManager */
-	protected $cloudIdManager;
+	protected ICloudIdManager $cloudIdManager;


 	public function __construct(
--- a/lib/Providers/ContactsMenuProvider.php
+++ b/lib/Providers/ContactsMenuProvider.php
@ -51,20 +51,15 @@ use OCP\IUserManager;
 class ContactsMenuProvider implements IProvider {


-	/** @var IActionFactory */
-	private $actionFactory;
+	private IActionFactory $actionFactory;

-	/** @var IURLGenerator */
-	private $urlGenerator;
+	private IURLGenerator $urlGenerator;

-	/** @var IUserManager */
-	private $userManager;
+	private IUserManager $userManager;

-	/** @var IL10N */
-	private $l10n;
+	private IL10N $l10n;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;


 	/**
--- a/lib/Search/UnifiedSearchProvider.php
+++ b/lib/Search/UnifiedSearchProvider.php
@ -66,36 +66,26 @@ class UnifiedSearchProvider implements IProvider {
 	use TNC20Logger;


-	/** @var IL10N */
-	private $l10n;
+	private IL10N $l10n;

-	/** @var IURLGenerator */
-	private $urlGenerator;
+	private IURLGenerator $urlGenerator;

-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var FollowService */
-	private $followService;
+	private FollowService $followService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var SearchService */
-	private $searchService;
+	private SearchService $searchService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


-	/** @var Person */
-	private $viewer;
+	private ?Person $viewer = null;


 	/**
--- a/lib/Service/ActivityService.php
+++ b/lib/Service/ActivityService.php
@ -76,33 +76,24 @@ class ActivityService {
 	const TIMEOUT_SERVICE = 30;


-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var FollowsRequest */
-	private $followsRequest;
+	private FollowsRequest $followsRequest;

-	/** @var SignatureService */
-	private $signatureService;
+	private SignatureService $signatureService;

-	/** @var RequestQueueService */
-	private $requestQueueService;
+	private RequestQueueService $requestQueueService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


-	/** @var array */
-	private $failInstances;
+	private ?array $failInstances = null;


 	/**
--- a/lib/Service/ActorService.php
+++ b/lib/Service/ActorService.php
@ -52,20 +52,15 @@ class ActorService {
 	use TArrayTools;


-	/** @var CacheActorsRequest */
-	private $cacheActorsRequest;
+	private CacheActorsRequest $cacheActorsRequest;

-	/** @var CacheDocumentsRequest */
-	private $cacheDocumentsRequest;
+	private CacheDocumentsRequest $cacheDocumentsRequest;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/BoostService.php
+++ b/lib/Service/BoostService.php
@ -57,26 +57,19 @@ class BoostService {
 	use TStringTools;


-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var SignatureService */
-	private $signatureService;
+	private SignatureService $signatureService;

-	/** @var ActivityService */
-	private $activityService;
+	private ActivityService $activityService;

-	/** @var StreamActionService */
-	private $streamActionService;
+	private StreamActionService $streamActionService;

-	/** @var StreamQueueService */
-	private $streamQueueService;
+	private StreamQueueService $streamQueueService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/CacheActorService.php
+++ b/lib/Service/CacheActorService.php
@ -66,23 +66,17 @@ class CacheActorService {
 	use TNC20Logger;


-	/** @var IURLGenerator */
-	private $urlGenerator;
+	private \OCP\IURLGenerator $urlGenerator;

-	/** @var CacheActorsRequest */
-	private $cacheActorsRequest;
+	private CacheActorsRequest $cacheActorsRequest;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var FediverseService */
-	private $fediverseService;
+	private FediverseService $fediverseService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/CacheDocumentService.php
+++ b/lib/Service/CacheDocumentService.php
@ -64,17 +64,13 @@ class CacheDocumentService {
 	const RESIZED_WIDTH = 280;
 	const RESIZED_HEIGHT = 180;

-	/** @var IAppData */
-	private $appData;
+	private IAppData $appData;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/CheckService.php
+++ b/lib/Service/CheckService.php
@ -64,44 +64,31 @@ class CheckService {

 	const CACHE_PREFIX = 'social_check_';

-	/** @var IUserManager */
-	private $userManager;
+	private IUserManager $userManager;

-	/** @var ICache */
-	private $cache;
+	private ICache $cache;

-	/** @var IConfig */
-	private $config;
+	private IConfig $config;

-	/** @var IClientService */
-	private $clientService;
+	private IClientService $clientService;

-	/** @var IRequest */
-	private $request;
+	private IRequest $request;

-	/** @var IURLGenerator */
-	private $urlGenerator;
+	private IURLGenerator $urlGenerator;

-	/** @var FollowsRequest */
-	private $followRequest;
+	private FollowsRequest $followRequest;

-	/** @var CacheActorsRequest */
-	private $cacheActorsRequest;
+	private CacheActorsRequest $cacheActorsRequest;

-	/** @var StreamDestRequest */
-	private $streamDestRequest;
+	private StreamDestRequest $streamDestRequest;

-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/ClientService.php
+++ b/lib/Service/ClientService.php
@ -57,11 +57,9 @@ class ClientService {
 	use TStringTools;


-	/** @var ClientRequest */
-	private $clientRequest;
+	private ClientRequest $clientRequest;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@ -72,8 +72,7 @@ class ConfigService {
 	const BACKGROUND_SERVICE = 3;
 	const BACKGROUND_FULL_SERVICE = 4;

-	/** @var array */
-	public $defaults = [
+	public array $defaults = [
 		self::CLOUD_URL           => '',
 		self::SOCIAL_URL          => '',
 		self::SOCIAL_ADDRESS      => '',
@ -85,27 +84,21 @@ class ConfigService {
 		self::DATABASE_CHUNK_SIZE => 10000
 	];

-	/** @var array */
-	public $accessTypeList = [
+	public array $accessTypeList = [
 		'BLACKLIST' => 'all_but',
 		'WHITELIST' => 'none_but'
 	];


-	/** @var string */
-	private $userId;
+	private string $userId;

-	/** @var IConfig */
-	private $config;
+	private IConfig $config;

-	/** @var IRequest */
-	private $request;
+	private IRequest $request;

-	/** @var IURLGenerator */
-	private $urlGenerator;
+	private IURLGenerator $urlGenerator;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/CurlService.php
+++ b/lib/Service/CurlService.php
@ -68,14 +68,11 @@ class CurlService {
 	const USER_AGENT = 'Nextcloud Social';


-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var FediverseService */
-	private $fediverseService;
+	private FediverseService $fediverseService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/DetailsService.php
+++ b/lib/Service/DetailsService.php
@ -44,17 +44,13 @@ use OCA\Social\Model\StreamDetails;
 */
 class DetailsService {

-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var FollowService */
-	private $followService;
+	private FollowService $followService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;


 	/**
--- a/lib/Service/DocumentService.php
+++ b/lib/Service/DocumentService.php
@ -67,26 +67,19 @@ class DocumentService {
 	const ERROR_PERMISSION = 3;


-	/** @var IURLGenerator */
-	private $urlGenerator;
+	private \OCP\IURLGenerator $urlGenerator;

-	/** @var CacheDocumentsRequest */
-	private $cacheDocumentsRequest;
+	private CacheDocumentsRequest $cacheDocumentsRequest;

-	/** @var ActorsRequest */
-	private $actorRequest;
+	private ActorsRequest $actorRequest;

-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var CacheDocumentService */
-	private $cacheService;
+	private CacheDocumentService $cacheService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/FediverseService.php
+++ b/lib/Service/FediverseService.php
@ -43,11 +43,9 @@ use OCA\Social\Exceptions\UnauthorizedFediverseException;
 class FediverseService {


-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/FollowService.php
+++ b/lib/Service/FollowService.php
@ -62,24 +62,18 @@ class FollowService {
 	use TArrayTools;


-	/** @var FollowsRequest */
-	private $followsRequest;
+	private FollowsRequest $followsRequest;

-	/** @var ActivityService */
-	private $activityService;
+	private ActivityService $activityService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


-	/** @var Person */
-	private $viewer = null;
+	private ?Person $viewer = null;


 	/**
--- a/lib/Service/HashtagService.php
+++ b/lib/Service/HashtagService.php
@ -55,17 +55,13 @@ class HashtagService {
 	use TArrayTools;


-	/** @var HashtagsRequest */
-	private $hashtagsRequest;
+	private HashtagsRequest $hashtagsRequest;

-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@ -50,11 +50,9 @@ class ImportService {
 	use TStringTools;


-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/InstanceService.php
+++ b/lib/Service/InstanceService.php
@ -46,11 +46,9 @@ class InstanceService {

 	private $instancesRequest;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	public function __construct(
--- a/lib/Service/LikeService.php
+++ b/lib/Service/LikeService.php
@ -60,26 +60,19 @@ class LikeService {
 	use TStringTools;


-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var SignatureService */
-	private $signatureService;
+	private SignatureService $signatureService;

-	/** @var ActivityService */
-	private $activityService;
+	private ActivityService $activityService;

-	/** @var StreamActionService */
-	private $streamActionService;
+	private StreamActionService $streamActionService;

-	/** @var StreamQueueService */
-	private $streamQueueService;
+	private StreamQueueService $streamQueueService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/PostService.php
+++ b/lib/Service/PostService.php
@ -57,23 +57,17 @@ use OCP\Files\NotPermittedException;
 class PostService {


-	/** @var StreamService */
-	private $streamService;
+	private StreamService $streamService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var ActivityService */
-	private $activityService;
+	private ActivityService $activityService;

-	/** @var CacheDocumentService */
-	private $cacheDocumentService;
+	private CacheDocumentService $cacheDocumentService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/PushService.php
+++ b/lib/Service/PushService.php
@ -53,18 +53,11 @@ class PushService {

 	use TAsync;

-//
-//	/** @var IPushManager */
-//	private $pushManager;
+private DetailsService $detailsService;

-	/** @var DetailsService */
-	private $detailsService;
+	private StreamService $streamService;

-	/** @var StreamService */
-	private $streamService;
-
-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/RequestQueueService.php
+++ b/lib/Service/RequestQueueService.php
@ -47,14 +47,11 @@ class RequestQueueService {
 	use TArrayTools;


-	/** @var RequestQueueRequest */
-	private $requestQueueRequest;
+	private RequestQueueRequest $requestQueueRequest;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/SearchService.php
+++ b/lib/Service/SearchService.php
@ -55,17 +55,13 @@ class SearchService {
 	const SEARCH_ALL = 7;


-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var HashtagService */
-	private $hashtagService;
+	private HashtagService $hashtagService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/SignatureService.php
+++ b/lib/Service/SignatureService.php
@ -83,20 +83,15 @@ class SignatureService {
 	const DATE_DELAY = 300;


-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var ActorsRequest */
-	private $actorsRequest;
+	private ActorsRequest $actorsRequest;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/StreamActionService.php
+++ b/lib/Service/StreamActionService.php
@ -43,11 +43,9 @@ use OCA\Social\Model\StreamAction;
 class StreamActionService {


-	/** @var StreamActionsRequest */
-	private $streamActionsRequest;
+	private StreamActionsRequest $streamActionsRequest;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/StreamQueueService.php
+++ b/lib/Service/StreamQueueService.php
@ -62,23 +62,17 @@ use OCA\Social\Model\StreamQueue;
 class StreamQueueService {


-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var StreamQueueRequest */
-	private $streamQueueRequest;
+	private StreamQueueRequest $streamQueueRequest;

-	/** @var ImportService */
-	private $importService;
+	private ImportService $importService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/StreamService.php
+++ b/lib/Service/StreamService.php
@ -58,29 +58,21 @@ use OCA\Social\Model\InstancePath;
 class StreamService {


-	/** @var StreamRequest */
-	private $streamRequest;
+	private StreamRequest $streamRequest;

-	/** @var ActivityService */
-	private $activityService;
+	private ActivityService $activityService;

-	/** @var AccountService */
-	private $accountService;
+	private AccountService $accountService;

-	/** @var SignatureService */
-	private $signatureService;
+	private SignatureService $signatureService;

-	/** @var StreamQueueService */
-	private $streamQueueService;
+	private StreamQueueService $streamQueueService;

-	/** @var CacheActorService */
-	private $cacheActorService;
+	private CacheActorService $cacheActorService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/lib/Service/TestService.php
+++ b/lib/Service/TestService.php
@ -55,14 +55,11 @@ class TestService {
 	use TArrayTools;


-	/** @var CurlService */
-	private $curlService;
+	private CurlService $curlService;

-	/** @var ConfigService */
-	private $configService;
+	private ConfigService $configService;

-	/** @var MiscService */
-	private $miscService;
+	private MiscService $miscService;


 	/**
--- a/Show More
+++ b/Show More