refactor: replace @var tags with typed properties

Chartman123 · Chartman123 · commit 707155757ae0 · 2026-05-04T17:12:32.000+02:00
Signed-off-by: Christian Hartmann &lt;chris-hartmann@gmx.de&gt;
diff --git a/lib/Db/Share.php b/lib/Db/Share.php
@@ -23,13 +23,9 @@
  * @method void setShareWith(string $value)
  */
 class Share extends Entity {
-	/** @var int */
 	protected $formId;
-	/** @var int */
 	protected $shareType;
-	/** @var string */
 	protected $shareWith;
-	/** @var string */
 	protected $permissionsJson;
 
 	/**
diff --git a/lib/Migration/Version0010Date20190000000007.php b/lib/Migration/Version0010Date20190000000007.php
@@ -19,11 +19,8 @@
  */
 class Version0010Date20190000000007 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IConfig */
-	protected $config;
+	protected IDBConnection $connection;
+	protected IConfig $config;
 
 	/**
 	 * @param IDBConnection $connection
diff --git a/lib/Migration/Version010200Date20200323141300.php b/lib/Migration/Version010200Date20200323141300.php
@@ -23,14 +23,11 @@
  */
 class Version010200Date20200323141300 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IConfig */
-	protected $config;
+	protected IDBConnection $connection;
+	protected IConfig $config;
 
 	/** Map of questionTypes to change */
-	private $questionTypeMap = [
+	private array $questionTypeMap = [
 		'radiogroup' => 'multiple_unique',
 		'checkbox' => 'multiple',
 		'text' => 'short',
diff --git a/lib/Migration/Version020202Date20210311150843.php b/lib/Migration/Version020202Date20210311150843.php
@@ -16,8 +16,7 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version020202Date20210311150843 extends SimpleMigrationStep {
-	/** @var IDBConnection */
-	protected $connection;
+	protected IDBConnection $connection;
 
 	/**
 	 * @param IDBConnection $connection
diff --git a/lib/Migration/Version020300Date20210406114130.php b/lib/Migration/Version020300Date20210406114130.php
@@ -16,8 +16,7 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version020300Date20210406114130 extends SimpleMigrationStep {
-	/** @var IDBConnection */
-	protected $connection;
+	protected IDBConnection $connection;
 
 	/**
 	 * @param IDBConnection $connection
diff --git a/lib/Migration/Version030000Date20211206213004.php b/lib/Migration/Version030000Date20211206213004.php
@@ -20,8 +20,7 @@
 
 class Version030000Date20211206213004 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	protected $connection;
+	protected IDBConnection $connection;
 
 	/**
 	 * @param IDBConnection $connection
diff --git a/lib/Migration/Version030000Date20220705192811.php b/lib/Migration/Version030000Date20220705192811.php
@@ -16,8 +16,7 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version030000Date20220705192811 extends SimpleMigrationStep {
-	/** @var IDBConnection */
-	protected $connection;
+	protected IDBConnection $connection;
 
 	/**
 	 * @param IDBConnection $connection
diff --git a/lib/Migration/Version030000Date20220926200602.php b/lib/Migration/Version030000Date20220926200602.php
@@ -16,8 +16,7 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version030000Date20220926200602 extends SimpleMigrationStep {
-	/** @var IDBConnection */
-	protected $connection;
+	protected IDBConnection $connection;
 
 	/**
 	 * @param IDBConnection $connection
diff --git a/tests/Integration/Api/ApiV3Test.php b/tests/Integration/Api/ApiV3Test.php
@@ -18,8 +18,7 @@
  * @group DB
  */
 class ApiV3Test extends IntegrationBase {
-	/** @var GuzzleHttp\Client */
-	private $http;
+	private Client $http;
 
 	protected array $users = [
 		'test' => 'Test user',
diff --git a/tests/Integration/Api/RespectAdminSettingsTest.php b/tests/Integration/Api/RespectAdminSettingsTest.php
@@ -18,8 +18,7 @@
  * @group DB
  */
 class RespectAdminSettingsTest extends IntegrationBase {
-	/** @var GuzzleHttp\Client */
-	private $http;
+	private Client $http;
 
 	protected array $users = [
 		'test' => 'Test user',
diff --git a/tests/Integration/DB/SubmissionMapperTest.php b/tests/Integration/DB/SubmissionMapperTest.php
@@ -16,8 +16,7 @@
  * @group DB
  */
 class SubmissionMapperTest extends IntegrationBase {
-	/** @var SubmissionMapper */
-	private $submissionMapper;
+	private SubmissionMapper $submissionMapper;
 
 	protected array $users = [
 		'test' => 'Test user',
diff --git a/tests/Integration/IntegrationBase.php b/tests/Integration/IntegrationBase.php
@@ -19,8 +19,7 @@
  * @group DB
  */
 class IntegrationBase extends TestCase {
-	/** @var Array */
-	protected $testForms;
+	protected array $testForms = [];
 
 	/**
 	 * Users that are needed by this test case
diff --git a/tests/Unit/Activity/ActivityManagerTest.php b/tests/Unit/Activity/ActivityManagerTest.php
@@ -23,9 +23,9 @@
 class ActivityManagerTest extends TestCase {
 
 	private ActivityManager $activityManager;
-	private IManager&MockObject $manager;
-	private IGroupManager&MockObject $groupManager;
-	private CirclesService&MockObject $circlesService;
+	private IManager|MockObject $manager;
+	private IGroupManager|MockObject $groupManager;
+	private CirclesService|MockObject $circlesService;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/Activity/FilterTest.php b/tests/Unit/Activity/FilterTest.php
@@ -16,14 +16,9 @@
 
 class FilterTest extends TestCase {
 
-	/** @var Filter */
-	private $filter;
-
-	/** @var IL10N|MockObject */
-	private $l10n;
-
-	/** @var IURLGenerator|MockObject */
-	private $urlGenerator;
+	private Filter $filter;
+	private IL10N|MockObject $l10n;
+	private IURLGenerator|MockObject $urlGenerator;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/Activity/ProviderTest.php b/tests/Unit/Activity/ProviderTest.php
@@ -29,38 +29,17 @@
 
 class ProviderTest extends TestCase {
 
-	/** @var Provider */
-	private $provider;
-
-	/** @var FormMapper|MockObject */
-	private $formMapper;
-
-	/** @var IEventMerger|MockObject */
-	private $eventMerger;
-
-	/** @var IGroupManager|MockObject */
-	private $groupManager;
-
-	/** @var IL10N|MockObject */
-	private $l10n;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
-
-	/** @var IURLGenerator|MockObject */
-	private $urlGenerator;
-
-	/** @var IUserManager|MockObject */
-	private $userManager;
-
-	/** @var IFactory|MockObject */
-	private $l10nFactory;
-
-	/** @var IValidator|MockObject */
-	private $validator;
-
-	/** @var CirclesService|MockObject */
-	private $circlesService;
+	private Provider $provider;
+	private FormMapper|MockObject $formMapper;
+	private IEventMerger|MockObject $eventMerger;
+	private IGroupManager|MockObject $groupManager;
+	private IL10N|MockObject $l10n;
+	private LoggerInterface|MockObject $logger;
+	private IURLGenerator|MockObject $urlGenerator;
+	private IUserManager|MockObject $userManager;
+	private IFactory|MockObject $l10nFactory;
+	private IValidator|MockObject $validator;
+	private CirclesService|MockObject $circlesService;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/Activity/Settings/FormsActivitySettingsTest.php b/tests/Unit/Activity/Settings/FormsActivitySettingsTest.php
@@ -10,7 +10,6 @@
 use OCA\Forms\Activity\Settings\FormsActivitySettings;
 use OCP\IL10N;
 
-use PHPUnit\Framework\MockObject\MockClass;
 use Test\TestCase;
 
 class SettingsTestClass extends FormsActivitySettings {
@@ -22,11 +21,8 @@ public function getName() {
 }
 
 class FormsActivitySettingsTest extends TestCase {
-	/** @var IL10N|MockObject */
-	private $l10n;
-
-	/** @var SettingsTestClass|MockClass */
-	private $activitySettings;
+	private IL10N|MockObject $l10n;
+	private SettingsTestClass $activitySettings;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/Activity/Settings/NewShareTest.php b/tests/Unit/Activity/Settings/NewShareTest.php
@@ -10,15 +10,11 @@
 use OCA\Forms\Activity\Settings\NewShare;
 use OCP\IL10N;
 
-use PHPUnit\Framework\MockObject\MockClass;
 use Test\TestCase;
 
 class NewShareTest extends TestCase {
-	/** @var IL10N|MockObject */
-	private $l10n;
-
-	/** @var NewShare|MockClass */
-	private $newShare;
+	private IL10N|MockObject $l10n;
+	private NewShare $newShare;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/Activity/Settings/NewSharedSubmissionTest.php b/tests/Unit/Activity/Settings/NewSharedSubmissionTest.php
@@ -10,15 +10,11 @@
 use OCA\Forms\Activity\Settings\NewSharedSubmission;
 use OCP\IL10N;
 
-use PHPUnit\Framework\MockObject\MockClass;
 use Test\TestCase;
 
 class NewSharedSubmissionTest extends TestCase {
-	/** @var IL10N|MockObject */
-	private $l10n;
-
-	/** @var NewSharedSubmission|MockClass */
-	private $newShare;
+	private IL10N|MockObject $l10n;
+	private NewSharedSubmission $newShare;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/Activity/Settings/NewSubmissionTest.php b/tests/Unit/Activity/Settings/NewSubmissionTest.php
@@ -10,15 +10,11 @@
 use OCA\Forms\Activity\Settings\NewSubmission;
 use OCP\IL10N;
 
-use PHPUnit\Framework\MockObject\MockClass;
 use Test\TestCase;
 
 class NewSubmissionTest extends TestCase {
-	/** @var IL10N|MockObject */
-	private $l10n;
-
-	/** @var NewSubmission|MockClass */
-	private $newShare;
+	private IL10N|MockObject $l10n;
+	private NewSubmission $newShare;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/BackgroundJob/CleanupUploadedFilesJobTest.php b/tests/Unit/BackgroundJob/CleanupUploadedFilesJobTest.php
@@ -19,20 +19,11 @@
 use Test\TestCase;
 
 class CleanupUploadedFilesJobTest extends TestCase {
-	/** @var IRootFolder|MockObject */
-	private $rootFolder;
-
-	/** @var CleanupUploadedFilesJob */
-	private $cleanupUploadedFilesJob;
-
-	/** @var FormMapper|MockObject */
-	private $formMapper;
-
-	/** @var UploadedFileMapper|MockObject */
-	private $uploadedFileMapper;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
+	private IRootFolder|MockObject $rootFolder;
+	private CleanupUploadedFilesJob $cleanupUploadedFilesJob;
+	private FormMapper|MockObject $formMapper;
+	private UploadedFileMapper|MockObject $uploadedFileMapper;
+	private LoggerInterface|MockObject $logger;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/BackgroundJob/SyncSubmissionsWithLinkedFileJobTest.php b/tests/Unit/BackgroundJob/SyncSubmissionsWithLinkedFileJobTest.php
@@ -29,29 +29,14 @@
 class SyncSubmissionsWithLinkedFileJobTest extends TestCase {
 	private SyncSubmissionsWithLinkedFileJob $job;
 
-	/** @var FormMapper|MockObject */
-	private $formMapper;
-
-	/** @var FormsService|MockObject */
-	private $formsService;
-
-	/** @var SubmissionService|MockObject */
-	private $submissionService;
-
-	/** @var ITimeFactory|MockObject */
-	private $timeFactory;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
-
-	/** @var IUserManager|MockObject */
-	private $userManager;
-
-	/** @var IUserSession|MockObject */
-	private $userSession;
-
-	/** @var IJobList|MockObject */
-	private $jobList;
+	private FormMapper|MockObject $formMapper;
+	private FormsService|MockObject $formsService;
+	private SubmissionService|MockObject $submissionService;
+	private ITimeFactory|MockObject $timeFactory;
+	private LoggerInterface|MockObject $logger;
+	private IUserManager|MockObject $userManager;
+	private IUserSession|MockObject $userSession;
+	private IJobList|MockObject $jobList;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/BackgroundJob/UserDeletedJobTest.php b/tests/Unit/BackgroundJob/UserDeletedJobTest.php
@@ -18,14 +18,9 @@
 use Test\TestCase;
 
 class UserDeletedJobTest extends TestCase {
-	/** @var UserDeletedJob */
-	private $userDeletedJob;
-
-	/** @var FormMapper|MockObject */
-	private $formMapper;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
+	private UserDeletedJob $userDeletedJob;
+	private FormMapper|MockObject $formMapper;
+	private LoggerInterface|MockObject $logger;
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Unit/Controller/ApiControllerTest.php b/tests/Unit/Controller/ApiControllerTest.php
diff --git a/tests/Unit/Controller/ConfigControllerTest.php b/tests/Unit/Controller/ConfigControllerTest.php
diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php
diff --git a/tests/Unit/Controller/ShareApiControllerTest.php b/tests/Unit/Controller/ShareApiControllerTest.php
diff --git a/tests/Unit/FormsMigratorTest.php b/tests/Unit/FormsMigratorTest.php
diff --git a/tests/Unit/Listener/UserDeletedListenerTest.php b/tests/Unit/Listener/UserDeletedListenerTest.php
diff --git a/tests/Unit/Service/CirclesServiceTest.php b/tests/Unit/Service/CirclesServiceTest.php
diff --git a/tests/Unit/Service/ConfigServiceTest.php b/tests/Unit/Service/ConfigServiceTest.php
diff --git a/tests/Unit/Service/FormsServiceTest.php b/tests/Unit/Service/FormsServiceTest.php
diff --git a/tests/Unit/Service/SubmissionServiceTest.php b/tests/Unit/Service/SubmissionServiceTest.php
