Fix type handling

Signed-off-by: Joas Schilling <coding@schilljs.com>

9 files changed, 12 insertions, 19 deletions

diff --git a/lib/Chat/ChatManager.php b/lib/Chat/ChatManager.php
index 4c66e9bc5..2b5094d0d 100644
--- a/lib/Chat/ChatManager.php
+++ b/lib/Chat/ChatManager.php
@@ -75,7 +75,7 @@ class ChatManager {
 	private IEventDispatcher $dispatcher;
 	private IDBConnection $connection;
 	private INotificationManager $notificationManager;
-	private \OCP\Share\IManager $shareManager;
+	private IManager $shareManager;
 	private RoomShareProvider $shareProvider;
 	private ParticipantService $participantService;
 	private Notifier $notifier;
diff --git a/lib/Chat/Parser/SystemMessage.php b/lib/Chat/Parser/SystemMessage.php
index 3cd7f4365..3f213a585 100644
--- a/lib/Chat/Parser/SystemMessage.php
+++ b/lib/Chat/Parser/SystemMessage.php
@@ -54,8 +54,7 @@ class SystemMessage {
 	protected GuestManager $guestManager;
 	protected IPreviewManager $previewManager;
 	protected RoomShareProvider $shareProvider;
-	/** @var PhotoCache */
-	protected $photoCache;
+	protected PhotoCache $photoCache;
 	protected IRootFolder $rootFolder;
 	protected IURLGenerator $url;
 	protected ?IL10N $l = null;
diff --git a/lib/Chat/ReactionManager.php b/lib/Chat/ReactionManager.php
index be97b84e7..5306f2d88 100644
--- a/lib/Chat/ReactionManager.php
+++ b/lib/Chat/ReactionManager.php
@@ -39,7 +39,7 @@ use OCP\IL10N;
 class ReactionManager {
 	private ChatManager $chatManager;
 	/** @var ICommentsManager|CommentsManager */
-	private $commentsManager;
+	private ICommentsManager $commentsManager;
 	private IL10N $l;
 	private MessageParser $messageParser;
 	private Notifier $notifier;
diff --git a/lib/Command/ActiveCalls.php b/lib/Command/ActiveCalls.php
index 62905567e..a4ddf508d 100644
--- a/lib/Command/ActiveCalls.php
+++ b/lib/Command/ActiveCalls.php
@@ -24,16 +24,13 @@ declare(strict_types=1);
 namespace OCA\Talk\Command;
 
 use OC\Core\Command\Base;
-use OCA\Talk\Manager;
 use OCA\Talk\Participant;
 use OCP\IDBConnection;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ActiveCalls extends Base {
-	public IDBConnection $connection;
-
-	public Manager $manager;
+	protected IDBConnection $connection;
 
 	public function __construct(IDBConnection $connection) {
 		parent::__construct();
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
index 3ff75dd71..39149b036 100644
--- a/lib/Controller/ChatController.php
+++ b/lib/Controller/ChatController.php
@@ -82,7 +82,7 @@ class ChatController extends AEnvironmentAwareController {
 
 	private MessageParser $messageParser;
 
-	private \OCP\Collaboration\AutoComplete\IManager $autoCompleteManager;
+	private IManager $autoCompleteManager;
 
 	private IUserStatusManager $statusManager;
 
diff --git a/lib/Events/EndCallForEveryoneEvent.php b/lib/Events/EndCallForEveryoneEvent.php
index 9710e0602..3dfd17854 100644
--- a/lib/Events/EndCallForEveryoneEvent.php
+++ b/lib/Events/EndCallForEveryoneEvent.php
@@ -29,9 +29,9 @@ use OCA\Talk\Room;
 class EndCallForEveryoneEvent extends ModifyRoomEvent {
 
 	/** @var string[] */
-	protected ?array $sessionIds = null;
+	protected array $sessionIds = [];
 	/** @var string[] */
-	protected ?array $userIds = null;
+	protected array $userIds = [];
 
 	public function __construct(Room $room,
 								?Participant $actor = null) {
@@ -49,7 +49,7 @@ class EndCallForEveryoneEvent extends ModifyRoomEvent {
 	/**
 	 * Only available in the after-event
 	 */
-	public function getSessionIds(): ?array {
+	public function getSessionIds(): array {
 		return $this->sessionIds;
 	}
 
@@ -64,7 +64,7 @@ class EndCallForEveryoneEvent extends ModifyRoomEvent {
 	/**
 	 * Only available in the after-event
 	 */
-	public function getUserIds(): ?array {
+	public function getUserIds(): array {
 		return $this->userIds;
 	}
 }
diff --git a/lib/Federation/CloudFederationProviderTalk.php b/lib/Federation/CloudFederationProviderTalk.php
index dd259c1e2..9ec518de2 100644
--- a/lib/Federation/CloudFederationProviderTalk.php
+++ b/lib/Federation/CloudFederationProviderTalk.php
@@ -53,8 +53,7 @@ use OCP\Share\Exceptions\ShareNotFound;
 class CloudFederationProviderTalk implements ICloudFederationProvider {
 	private IUserManager $userManager;
 
-	/** @var AddressHandler */
-	private $addressHandler;
+	private AddressHandler $addressHandler;
 
 	private FederationManager $federationManager;
 
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
index 4c2ff8030..ce569d474 100644
--- a/lib/Notification/Notifier.php
+++ b/lib/Notification/Notifier.php
@@ -66,8 +66,7 @@ class Notifier implements INotifier {
 	protected ICommentsManager $commentManager;
 	protected MessageParser $messageParser;
 	protected Definitions $definitions;
-	/** @var AddressHandler */
-	protected $addressHandler;
+	protected AddressHandler $addressHandler;
 
 	/** @var Room[] */
 	protected array $rooms = [];
diff --git a/lib/Signaling/BackendNotifier.php b/lib/Signaling/BackendNotifier.php
index 5571cd955..63597b150 100644
--- a/lib/Signaling/BackendNotifier.php
+++ b/lib/Signaling/BackendNotifier.php
@@ -43,8 +43,7 @@ class BackendNotifier {
 	private ISecureRandom $secureRandom;
 	private Manager $signalingManager;
 	private ParticipantService $participantService;
-	/** @var IUrlGenerator */
-	private $urlGenerator;
+	private IURLGenerator $urlGenerator;
 
 	public function __construct(Config $config,
 								LoggerInterface $logger,