Use PHP7.4 property typehinting where possible

lib/Activity/Listener.php

@@ -41,24 +41,17 @@
 use Psr\Log\LoggerInterface;
 
 class Listener {
+	protected IManager $activityManager;
 
-	/** @var IManager */
-	protected $activityManager;
+	protected IUserSession $userSession;
 
-	/** @var IUserSession */
-	protected $userSession;
+	protected ChatManager $chatManager;
 
-	/** @var ChatManager */
-	protected $chatManager;
+	protected ParticipantService $participantService;
 
-	/** @var ParticipantService */
-	protected $participantService;
+	protected LoggerInterface $logger;
 
-	/** @var LoggerInterface */
-	protected $logger;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
+	protected ITimeFactory $timeFactory;
 
 	public function __construct(IManager $activityManager,
 								IUserSession $userSession,

lib/Activity/Provider/Base.php

@@ -36,22 +36,15 @@
 use OCP\L10N\IFactory;
 
 abstract class Base implements IProvider {
-
-	/** @var IFactory */
-	protected $languageFactory;
-	/** @var IURLGenerator */
-	protected $url;
-	/** @var Config */
-	protected $config;
-	/** @var IManager */
-	protected $activityManager;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var Manager */
-	protected $manager;
+	protected IFactory $languageFactory;
+	protected IURLGenerator $url;
+	protected Config $config;
+	protected IManager $activityManager;
+	protected IUserManager $userManager;
+	protected Manager $manager;
 
 	/** @var string[] */
-	protected $displayNames = [];
+	protected array $displayNames = [];
 
 	public function __construct(IFactory $languageFactory,
 								IURLGenerator $url,

lib/Activity/Setting.php

@@ -27,9 +27,7 @@
 use OCP\IL10N;
 
 class Setting extends ActivitySettings {
-
-	/** @var IL10N */
-	protected $l;
+	protected IL10N $l;
 
 	public function __construct(IL10N $l) {
 		$this->l = $l;

lib/AppInfo/Application.php

@@ -23,6 +23,7 @@
 
 namespace OCA\Talk\AppInfo;
 
+use OCP\Util;
 use OCA\Circles\Events\AddingCircleMemberEvent;
 use OCA\Circles\Events\CircleDestroyedEvent;
 use OCA\Circles\Events\RemovingCircleMemberEvent;
@@ -184,7 +185,7 @@ protected function registerCollaborationResourceProvider(IServerContainer $serve
 		$resourceManager = $server->get(IProviderManager::class);
 		$resourceManager->registerResourceProvider(ConversationProvider::class);
 		$server->getEventDispatcher()->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
-			\OCP\Util::addScript(self::APP_ID, 'talk-collections');
+			Util::addScript(self::APP_ID, 'talk-collections');
 		});
 	}
 

lib/BackgroundJob/CheckHostedSignalingServer.php

@@ -39,19 +39,12 @@
 use Psr\Log\LoggerInterface;
 
 class CheckHostedSignalingServer extends TimedJob {
-
-	/** @var HostedSignalingServerService */
-	private $hostedSignalingServerService;
-	/** @var IConfig */
-	private $config;
-	/** @var IManager */
-	private $notificationManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var LoggerInterface */
-	private $logger;
+	private HostedSignalingServerService $hostedSignalingServerService;
+	private IConfig $config;
+	private IManager $notificationManager;
+	private IGroupManager $groupManager;
+	private IURLGenerator $urlGenerator;
+	private LoggerInterface $logger;
 
 	public function __construct(ITimeFactory $timeFactory,
 								HostedSignalingServerService $hostedSignalingServerService,

lib/BackgroundJob/CheckMatterbridges.php

@@ -36,15 +36,11 @@
  * @package OCA\Talk\BackgroundJob
  */
 class CheckMatterbridges extends TimedJob {
+	protected IConfig $serverConfig;
 
-	/** @var IConfig */
-	protected $serverConfig;
+	protected MatterbridgeManager $bridgeManager;
 
-	/** @var MatterbridgeManager */
-	protected $bridgeManager;
-
-	/** @var LoggerInterface */
-	protected $logger;
+	protected LoggerInterface $logger;
 
 	public function __construct(ITimeFactory $time,
 								IConfig $serverConfig,

lib/BackgroundJob/CheckReferenceIdColumn.php

@@ -38,11 +38,8 @@
  * @package OCA\Talk\BackgroundJob
  */
 class CheckReferenceIdColumn extends TimedJob {
-
-	/** @var IJobList */
-	protected $jobList;
-	/** @var IConfig */
-	protected $serverConfig;
+	protected IJobList $jobList;
+	protected IConfig $serverConfig;
 	/** @var IDBConnection|ConnectionAdapter */
 	protected $connection;
 

lib/BackgroundJob/ExpireSignalingMessage.php

@@ -34,9 +34,7 @@
  * @package OCA\Talk\BackgroundJob
  */
 class ExpireSignalingMessage extends TimedJob {
-
-	/** @var Messages */
-	protected $messages;
+	protected Messages $messages;
 
 	public function __construct(ITimeFactory $timeFactory,
 								Messages $messages) {

lib/BackgroundJob/RemoveEmptyRooms.php

@@ -38,20 +38,15 @@
  * @package OCA\Talk\BackgroundJob
  */
 class RemoveEmptyRooms extends TimedJob {
+	protected Manager $manager;
 
-	/** @var Manager */
-	protected $manager;
+	protected ParticipantService $participantService;
 
-	/** @var ParticipantService */
-	protected $participantService;
+	protected LoggerInterface $logger;
 
-	/** @var LoggerInterface */
-	protected $logger;
+	protected IUserMountCache $userMountCache;
 
-	/** @var IUserMountCache */
-	protected $userMountCache;
-
-	protected $numDeletedRooms = 0;
+	protected int $numDeletedRooms = 0;
 
 	public function __construct(ITimeFactory $timeFactory,
 								Manager $manager,

lib/BackgroundJob/ResetAssignedSignalingServer.php

@@ -31,11 +31,8 @@
 use OCP\ICacheFactory;
 
 class ResetAssignedSignalingServer extends TimedJob {
-
-	/** @var Manager */
-	protected $manager;
-	/** @var ICache */
-	protected $cache;
+	protected Manager $manager;
+	protected ICache $cache;
 
 	public function __construct(ITimeFactory $time,
 								Manager $manager,

lib/BackgroundJob/RetryJob.php

@@ -45,11 +45,10 @@
  * @package OCA\Talk\BackgroundJob
  */
 class RetryJob extends Job {
-	/** @var Notifications */
-	private $notifications;
+	private Notifications $notifications;
 
 	/** @var int max number of attempts to send the request */
-	private $maxTry = 20;
+	private int $maxTry = 20;
 
 
 	public function __construct(Notifications $notifications,

lib/Capabilities.php

@@ -33,15 +33,10 @@
 use OCP\IUserSession;
 
 class Capabilities implements IPublicCapability {
-
-	/** @var IConfig */
-	protected $serverConfig;
-	/** @var Config */
-	protected $talkConfig;
-	/** @var ICommentsManager */
-	protected $commentsManager;
-	/** @var IUserSession */
-	protected $userSession;
+	protected IConfig $serverConfig;
+	protected Config $talkConfig;
+	protected ICommentsManager $commentsManager;
+	protected IUserSession $userSession;
 
 	public function __construct(IConfig $serverConfig,
 								Config $talkConfig,

lib/Chat/AutoComplete/SearchPlugin.php

@@ -37,24 +37,15 @@
 use OCP\IUserManager;
 
 class SearchPlugin implements ISearchPlugin {
-
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var GuestManager */
-	protected $guestManager;
-	/** @var TalkSession */
-	protected $talkSession;
-	/** @var ParticipantService */
-	protected $participantService;
-	/** @var Util */
-	protected $util;
-	/** @var string|null */
-	protected $userId;
-	/** @var IL10N */
-	protected $l;
-
-	/** @var Room */
-	protected $room;
+	protected IUserManager $userManager;
+	protected GuestManager $guestManager;
+	protected TalkSession $talkSession;
+	protected ParticipantService $participantService;
+	protected Util $util;
+	protected ?string $userId;
+	protected IL10N $l;
+
+	protected ?Room $room = null;
 
 	public function __construct(IUserManager $userManager,
 								GuestManager $guestManager,

lib/Chat/AutoComplete/Sorter.php

@@ -28,9 +28,7 @@
 use OCP\Comments\ICommentsManager;
 
 class Sorter implements ISorter {
-
-	/** @var ICommentsManager */
-	protected $commentsManager;
+	protected ICommentsManager $commentsManager;
 
 	public function __construct(CommentsManager $commentsManager) {
 		$this->commentsManager = $commentsManager;

lib/Chat/Changelog/Listener.php

@@ -38,8 +38,7 @@ public static function register(IEventDispatcher $dispatcher): void {
 		}, -100);
 	}
 
-	/** @var Manager */
-	protected $manager;
+	protected Manager $manager;
 
 	public function __construct(Manager $manager) {
 		$this->manager = $manager;

lib/Chat/Changelog/Manager.php

@@ -31,19 +31,12 @@
 use OCP\IL10N;
 
 class Manager {
-
-	/** @var IConfig */
-	protected $config;
-	/** @var IDBConnection */
-	protected $connection;
-	/** @var RoomManager */
-	protected $roomManager;
-	/** @var ChatManager */
-	protected $chatManager;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var IL10N */
-	protected $l;
+	protected IConfig $config;
+	protected IDBConnection $connection;
+	protected RoomManager $roomManager;
+	protected ChatManager $chatManager;
+	protected ITimeFactory $timeFactory;
+	protected IL10N $l;
 
 	public function __construct(IConfig $config,
 								IDBConnection $connection,

lib/Chat/ChatManager.php

@@ -72,26 +72,16 @@ class ChatManager {
 	/** @var ICommentsManager|CommentsManager
 	 */
 	private $commentsManager;
-	/** @var IEventDispatcher */
-	private $dispatcher;
-	/** @var IDBConnection */
-	private $connection;
-	/** @var INotificationManager */
-	private $notificationManager;
-	/** @var IManager */
-	private $shareManager;
-	/** @var RoomShareProvider */
-	private $shareProvider;
-	/** @var ParticipantService */
-	private $participantService;
-	/** @var Notifier */
-	private $notifier;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var ICache */
-	protected $cache;
-	/** @var ICache */
-	protected $unreadCountCache;
+	private IEventDispatcher $dispatcher;
+	private IDBConnection $connection;
+	private INotificationManager $notificationManager;
+	private \OCP\Share\IManager $shareManager;
+	private RoomShareProvider $shareProvider;
+	private ParticipantService $participantService;
+	private Notifier $notifier;
+	protected ITimeFactory $timeFactory;
+	protected ICache $cache;
+	protected ICache $unreadCountCache;
 	protected AttachmentService $attachmentService;
 
 	public function __construct(CommentsManager $commentsManager,