Fix type handling

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

10 files changed, 11 insertions, 13 deletions

diff --git a/tests/php/Chat/AutoComplete/SearchPluginTest.php b/tests/php/Chat/AutoComplete/SearchPluginTest.php
index b6e885b44..a88a0c605 100644
--- a/tests/php/Chat/AutoComplete/SearchPluginTest.php
+++ b/tests/php/Chat/AutoComplete/SearchPluginTest.php
@@ -21,7 +21,6 @@
 
 namespace OCA\Talk\Tests\php\Chat\AutoComplete;
 
-use Test\TestCase;
 use OCA\Talk\Chat\AutoComplete\SearchPlugin;
 use OCA\Talk\Files\Util;
 use OCA\Talk\GuestManager;
@@ -36,6 +35,7 @@ use OCP\IL10N;
 use OCP\IUser;
 use OCP\IUserManager;
 use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
 
 class SearchPluginTest extends TestCase {
 
diff --git a/tests/php/Chat/AutoComplete/SorterTest.php b/tests/php/Chat/AutoComplete/SorterTest.php
index cb165ea06..d445a8068 100644
--- a/tests/php/Chat/AutoComplete/SorterTest.php
+++ b/tests/php/Chat/AutoComplete/SorterTest.php
@@ -23,10 +23,10 @@ declare(strict_types=1);
 
 namespace OCA\Talk\Tests\php\Chat;
 
-use Test\TestCase;
 use OCA\Talk\Chat\AutoComplete\Sorter;
 use OCA\Talk\Chat\CommentsManager;
 use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
 
 class SorterTest extends TestCase {
 
diff --git a/tests/php/Chat/NotifierTest.php b/tests/php/Chat/NotifierTest.php
index 3ee7e4593..0acec8008 100644
--- a/tests/php/Chat/NotifierTest.php
+++ b/tests/php/Chat/NotifierTest.php
@@ -59,8 +59,6 @@ class NotifierTest extends TestCase {
 	/** @var Util|MockObject */
 	protected $util;
 
-	protected Notifier $notifier;
-
 	public function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/php/Chat/Parser/UserMentionTest.php b/tests/php/Chat/Parser/UserMentionTest.php
index d677adf63..e72afeed2 100644
--- a/tests/php/Chat/Parser/UserMentionTest.php
+++ b/tests/php/Chat/Parser/UserMentionTest.php
@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace OCA\Talk\Tests\php\Chat\Parser;
 
-use Test\TestCase;
 use OCA\Talk\Chat\Parser\UserMention;
 use OCA\Talk\Exceptions\ParticipantNotFoundException;
 use OCA\Talk\GuestManager;
@@ -38,6 +37,7 @@ use OCP\IL10N;
 use OCP\IUser;
 use OCP\IUserManager;
 use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
 
 class UserMentionTest extends TestCase {
 
diff --git a/tests/php/Collaboration/Collaborators/RoomPluginTest.php b/tests/php/Collaboration/Collaborators/RoomPluginTest.php
index 867449be3..f96d23569 100644
--- a/tests/php/Collaboration/Collaborators/RoomPluginTest.php
+++ b/tests/php/Collaboration/Collaborators/RoomPluginTest.php
@@ -25,7 +25,6 @@ declare(strict_types=1);
 
 namespace OCA\Talk\Tests\php\Collaboration\Collaborators;
 
-use Test\TestCase;
 use OCA\Talk\Collaboration\Collaborators\RoomPlugin;
 use OCA\Talk\Manager;
 use OCA\Talk\Room;
@@ -34,6 +33,7 @@ use OCP\Collaboration\Collaborators\SearchResultType;
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Share\IShare;
+use Test\TestCase;
 
 class RoomPluginTest extends TestCase {
 	protected ?Manager $manager = null;
diff --git a/tests/php/Controller/SignalingControllerTest.php b/tests/php/Controller/SignalingControllerTest.php
index ec0851335..53234ce49 100644
--- a/tests/php/Controller/SignalingControllerTest.php
+++ b/tests/php/Controller/SignalingControllerTest.php
@@ -22,8 +22,6 @@
 
 namespace OCA\Talk\Tests\php\Controller;
 
-use Test\TestCase;
-use OCP\IRequest;
 use OCA\Talk\Chat\CommentsManager;
 use OCA\Talk\Config;
 use OCA\Talk\Controller\SignalingController;
@@ -47,12 +45,14 @@ use OCP\Http\Client\IClientService;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IL10N;
+use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserManager;
 use OCP\Security\IHasher;
 use OCP\Security\ISecureRandom;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
+use Test\TestCase;
 
 class CustomInputSignalingController extends SignalingController {
 	private $inputStream;
@@ -97,7 +97,7 @@ class SignalingControllerTest extends TestCase {
 	/** @var LoggerInterface|MockObject */
 	private $logger;
 
-	private ?\OCA\Talk\Tests\php\Controller\CustomInputSignalingController $controller = null;
+	private ?CustomInputSignalingController $controller = null;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/php/Notification/NotifierTest.php b/tests/php/Notification/NotifierTest.php
index 4527dad1c..7148f6e6f 100644
--- a/tests/php/Notification/NotifierTest.php
+++ b/tests/php/Notification/NotifierTest.php
@@ -21,7 +21,6 @@
 
 namespace OCA\Talk\Tests\php\Notifications;
 
-use Test\TestCase;
 use OCA\FederatedFileSharing\AddressHandler;
 use OCA\Talk\Chat\CommentsManager;
 use OCA\Talk\Chat\MessageParser;
@@ -48,6 +47,7 @@ use OCP\Notification\INotification;
 use OCP\RichObjectStrings\Definitions;
 use OCP\Share\IManager as IShareManager;
 use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
 
 class NotifierTest extends TestCase {
 
diff --git a/tests/php/Settings/Admin/AdminSettingsTest.php b/tests/php/Settings/Admin/AdminSettingsTest.php
index a5b81e4b0..1438c63e4 100644
--- a/tests/php/Settings/Admin/AdminSettingsTest.php
+++ b/tests/php/Settings/Admin/AdminSettingsTest.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace OCA\Talk\Tests\php\Settings\Admin;
 
-use Test\TestCase;
 use OCA\Talk\Config;
 use OCA\Talk\MatterbridgeManager;
 use OCA\Talk\Service\CommandService;
@@ -36,6 +35,7 @@ use OCP\IL10N;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
 use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
 
 class AdminSettingsTest extends TestCase {
 
diff --git a/tests/php/Settings/Admin/SectionTest.php b/tests/php/Settings/Admin/SectionTest.php
index cfdff1537..e1c79169d 100644
--- a/tests/php/Settings/Admin/SectionTest.php
+++ b/tests/php/Settings/Admin/SectionTest.php
@@ -23,11 +23,11 @@ declare(strict_types=1);
 
 namespace OCA\Talk\Tests\php\Settings\Admin;
 
-use Test\TestCase;
 use OCA\Talk\Settings\Admin\Section;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
 
 class SectionTest extends TestCase {
 
diff --git a/tests/php/Signaling/BackendNotifierTest.php b/tests/php/Signaling/BackendNotifierTest.php
index eb871389b..3bb2fc386 100644
--- a/tests/php/Signaling/BackendNotifierTest.php
+++ b/tests/php/Signaling/BackendNotifierTest.php
@@ -22,7 +22,6 @@
 
 namespace OCA\Talk\Tests\php\Signaling;
 
-use Test\TestCase;
 use OCA\Talk\AppInfo\Application;
 use OCA\Talk\Chat\CommentsManager;
 use OCA\Talk\Config;
@@ -50,6 +49,7 @@ use OCP\Security\IHasher;
 use OCP\Security\ISecureRandom;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
+use Test\TestCase;
 
 class CustomBackendNotifier extends BackendNotifier {
 	private array $requests = [];