From 707155757ae0c1ed8a7f57501b5909069aa448be Mon Sep 17 00:00:00 2001 From: Christian Hartmann Date: Mon, 4 May 2026 16:50:01 +0200 Subject: [PATCH] refactor: replace `@var` tags with typed properties Signed-off-by: Christian Hartmann --- lib/Db/Share.php | 4 -- .../Version0010Date20190000000007.php | 7 +-- .../Version010200Date20200323141300.php | 9 +-- .../Version020202Date20210311150843.php | 3 +- .../Version020300Date20210406114130.php | 3 +- .../Version030000Date20211206213004.php | 3 +- .../Version030000Date20220705192811.php | 3 +- .../Version030000Date20220926200602.php | 3 +- tests/Integration/Api/ApiV3Test.php | 3 +- .../Api/RespectAdminSettingsTest.php | 3 +- tests/Integration/DB/SubmissionMapperTest.php | 3 +- tests/Integration/IntegrationBase.php | 3 +- tests/Unit/Activity/ActivityManagerTest.php | 6 +- tests/Unit/Activity/FilterTest.php | 11 +--- tests/Unit/Activity/ProviderTest.php | 43 ++++--------- .../Settings/FormsActivitySettingsTest.php | 8 +-- tests/Unit/Activity/Settings/NewShareTest.php | 8 +-- .../Settings/NewSharedSubmissionTest.php | 8 +-- .../Activity/Settings/NewSubmissionTest.php | 8 +-- .../CleanupUploadedFilesJobTest.php | 19 ++---- .../SyncSubmissionsWithLinkedFileJobTest.php | 31 +++------ .../Unit/BackgroundJob/UserDeletedJobTest.php | 11 +--- tests/Unit/Controller/ApiControllerTest.php | 51 +++++---------- .../Unit/Controller/ConfigControllerTest.php | 19 ++---- tests/Unit/Controller/PageControllerTest.php | 51 ++++----------- .../Controller/ShareApiControllerTest.php | 51 ++++----------- tests/Unit/FormsMigratorTest.php | 39 +++--------- .../Unit/Listener/UserDeletedListenerTest.php | 11 +--- tests/Unit/Service/CirclesServiceTest.php | 6 +- tests/Unit/Service/ConfigServiceTest.php | 15 ++--- tests/Unit/Service/FormsServiceTest.php | 59 +++++------------ tests/Unit/Service/SubmissionServiceTest.php | 63 +++++-------------- 32 files changed, 154 insertions(+), 411 deletions(-) diff --git a/lib/Db/Share.php b/lib/Db/Share.php index 9859933fb..a07ef2421 100644 --- 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 index 50768eba7..52b57eec0 100644 --- 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 index 3d4200353..ecb13cd0d 100644 --- 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 index a447b081d..4b72681a2 100644 --- 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 index 68d2fbb06..a9041c86a 100644 --- 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 index bc1467ff6..bff258793 100644 --- 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 index 5a9f81f07..386f2cef2 100644 --- 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 index 7a9285cc1..e355fa36d 100644 --- 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 index 0605ffe91..810880fea 100644 --- 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 index 09d8ff7d1..763a230c8 100644 --- 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 index e204d56c7..a1155ef94 100644 --- 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 index 7b2fc271d..fc3b22401 100644 --- 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 index 5b4256da6..d36adae64 100644 --- 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 index d86fda172..89f12f53c 100644 --- 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 index cb54c751d..dc7664655 100644 --- 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 index ec2739bd6..ccf22f165 100644 --- 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 index b1896ceb9..90cd58d62 100644 --- 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 index 0daa85d18..968bd0a44 100644 --- 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 index 78fdb6536..6ed5f881c 100644 --- 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 index 18cdbba5e..cf2870368 100644 --- 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 index f40f6a813..5fffe24ae 100644 --- 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 index aaf48728f..617e0115a 100644 --- 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 index 28c77c60b..d70c5795f 100644 --- a/tests/Unit/Controller/ApiControllerTest.php +++ b/tests/Unit/Controller/ApiControllerTest.php @@ -73,40 +73,23 @@ function is_uploaded_file(string|bool|null $filename) { class ApiControllerTest extends TestCase { private ApiController $apiController; - /** @var AnswerMapper|MockObject */ - private $answerMapper; - /** @var FormMapper|MockObject */ - private $formMapper; - /** @var OptionMapper|MockObject */ - private $optionMapper; - /** @var QuestionMapper|MockObject */ - private $questionMapper; - /** @var ShareMapper|MockObject */ - private $shareMapper; - /** @var SubmissionMapper|MockObject */ - private $submissionMapper; - /** @var ConfigService|MockObject */ - private $configService; - /** @var FormsService|MockObject */ - private $formsService; - /** @var SubmissionService|MockObject */ - private $submissionService; - /** @var LoggerInterface|MockObject */ - private $logger; - /** @var IRequest|MockObject */ - private $request; - /** @var IUserManager|MockObject */ - private $userManager; - /** @var IL10N|MockObject */ - private $l10n; - /** @var IRootFolder|MockObject */ - private $storage; - /** @var UploadedFileMapper|MockObject */ - private $uploadedFileMapper; - /** @var IMimeTypeDetector|MockObject */ - private $mimeTypeDetector; - /** @var IJobList|MockObject */ - private $jobList; + private AnswerMapper|MockObject $answerMapper; + private FormMapper|MockObject $formMapper; + private OptionMapper|MockObject $optionMapper; + private QuestionMapper|MockObject $questionMapper; + private ShareMapper|MockObject $shareMapper; + private SubmissionMapper|MockObject $submissionMapper; + private ConfigService|MockObject $configService; + private FormsService|MockObject $formsService; + private SubmissionService|MockObject $submissionService; + private LoggerInterface|MockObject $logger; + private IRequest|MockObject $request; + private IUserManager|MockObject $userManager; + private IL10N|MockObject $l10n; + private IRootFolder|MockObject $storage; + private UploadedFileMapper|MockObject $uploadedFileMapper; + private IMimeTypeDetector|MockObject $mimeTypeDetector; + private IJobList|MockObject $jobList; public function setUp(): void { $this->answerMapper = $this->createMock(AnswerMapper::class); diff --git a/tests/Unit/Controller/ConfigControllerTest.php b/tests/Unit/Controller/ConfigControllerTest.php index 7e5020c6a..1f8671fcf 100644 --- a/tests/Unit/Controller/ConfigControllerTest.php +++ b/tests/Unit/Controller/ConfigControllerTest.php @@ -21,20 +21,11 @@ class ConfigControllerTest extends TestCase { - /** @var ConfigController */ - private $configController; - - /** @var ConfigService */ - private $configService; - - /** @var IConfig|MockObject */ - private $config; - - /** @var LoggerInterface|MockObject */ - private $logger; - - /** @var IRequest|MockObject */ - private $request; + private ConfigController $configController; + private ConfigService|MockObject $configService; + private IConfig|MockObject $config; + private LoggerInterface|MockObject $logger; + private IRequest|MockObject $request; public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php index b0c8724ed..98aba6e7b 100644 --- a/tests/Unit/Controller/PageControllerTest.php +++ b/tests/Unit/Controller/PageControllerTest.php @@ -28,44 +28,19 @@ class PageControllerTest extends TestCase { - /** @var PageController */ - private $pageController; - - /** @var IRequest|MockObject */ - private $request; - - /** @var FormMapper|MockObject */ - private $formMapper; - - /** @var ShareMapper|MockObject */ - private $shareMapper; - - /** @var SubmissionMapper|MockObject */ - private $submissionMapper; - - /** @var ConfigService|MockObject */ - private $configService; - - /** @var FormsService|MockObject */ - private $formsService; - - /** @var IAccountManager|MockObject */ - private $accountManager; - - /** @var IInitialState|MockObject */ - private $initialState; - - /** @var IL10N|MockObject */ - private $l10n; - - /** @var IURLGenerator|MockObject */ - private $urlGenerator; - - /** @var IUserManager|MockObject */ - private $userManager; - - /** @var IUserSession|MockObject */ - private $userSession; + private PageController $pageController; + private IRequest|MockObject $request; + private FormMapper|MockObject $formMapper; + private ShareMapper|MockObject $shareMapper; + private SubmissionMapper|MockObject $submissionMapper; + private ConfigService|MockObject $configService; + private FormsService|MockObject $formsService; + private IAccountManager|MockObject $accountManager; + private IInitialState|MockObject $initialState; + private IL10N|MockObject $l10n; + private IURLGenerator|MockObject $urlGenerator; + private IUserManager|MockObject $userManager; + private IUserSession|MockObject $userSession; public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/Controller/ShareApiControllerTest.php b/tests/Unit/Controller/ShareApiControllerTest.php index 3f3dad8e7..221431ecd 100644 --- a/tests/Unit/Controller/ShareApiControllerTest.php +++ b/tests/Unit/Controller/ShareApiControllerTest.php @@ -50,44 +50,19 @@ interface MapperException extends Throwable, IMapperException { class ShareApiControllerTest extends TestCase { - /** @var ShareApiController */ - private $shareApiController; - - /** @var FormMapper|MockObject */ - private $formMapper; - - /** @var ShareMapper|MockObject */ - private $shareMapper; - - /** @var ConfigService|MockObject */ - private $configService; - - /** @var FormsService|MockObject */ - private $formsService; - - /** @var IGroupManager|MockObject */ - private $groupManager; - - /** @var LoggerInterface|MockObject */ - private $logger; - - /** @var IRequest|MockObject */ - private $request; - - /** @var IUserManager|MockObject */ - private $userManager; - - /** @var ISecureRandom|MockObject */ - private $secureRandom; - - /** @var CirclesService|MockObject */ - private $circlesService; - - /** @var IRootFolder|MockObject */ - private $storage; - - /** @var IManager|MockObject */ - private $shareManager; + private ShareApiController $shareApiController; + private FormMapper|MockObject $formMapper; + private ShareMapper|MockObject $shareMapper; + private ConfigService|MockObject $configService; + private FormsService|MockObject $formsService; + private IGroupManager|MockObject $groupManager; + private LoggerInterface|MockObject $logger; + private IRequest|MockObject $request; + private IUserManager|MockObject $userManager; + private ISecureRandom|MockObject $secureRandom; + private CirclesService|MockObject $circlesService; + private IRootFolder|MockObject $storage; + private IManager|MockObject $shareManager; public function setUp(): void { $this->formMapper = $this->createMock(FormMapper::class); diff --git a/tests/Unit/FormsMigratorTest.php b/tests/Unit/FormsMigratorTest.php index 97f584a6c..e8b340df6 100644 --- a/tests/Unit/FormsMigratorTest.php +++ b/tests/Unit/FormsMigratorTest.php @@ -30,35 +30,16 @@ class FormsMigratorTest extends TestCase { - /** @var FormsMigrator */ - private $formsMigrator; - - /** @var AnswerMapper|MockObject */ - private $answerMapper; - - /** @var FormMapper|MockObject */ - private $formMapper; - - /** @var OptionMapper|MockObject */ - private $optionMapper; - - /** @var QuestionMapper|MockObject */ - private $questionMapper; - - /** @var SubmissionMapper|MockObject */ - private $submissionMapper; - - /** @var FormsService|MockObject */ - private $formsService; - - /** @var SubmissionService|MockObject */ - private $submissionService; - - /** @var IL10N|MockObject */ - private $l10n; - - /** @var IUserManager|MockObject */ - private $userManager; + private FormsMigrator $formsMigrator; + private AnswerMapper|MockObject $answerMapper; + private FormMapper|MockObject $formMapper; + private OptionMapper|MockObject $optionMapper; + private QuestionMapper|MockObject $questionMapper; + private SubmissionMapper|MockObject $submissionMapper; + private FormsService|MockObject $formsService; + private SubmissionService|MockObject $submissionService; + private IL10N|MockObject $l10n; + private IUserManager|MockObject $userManager; public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/Listener/UserDeletedListenerTest.php b/tests/Unit/Listener/UserDeletedListenerTest.php index d9b4ffb65..105a49404 100644 --- a/tests/Unit/Listener/UserDeletedListenerTest.php +++ b/tests/Unit/Listener/UserDeletedListenerTest.php @@ -20,14 +20,9 @@ use Test\TestCase; class UserDeletedListenerTest extends TestCase { - /** @var UserDeletedListener */ - private $userDeletedListener; - - /** @var IJobList|MockObject */ - private $jobList; - - /** @var LoggerInterface|MockObject */ - private $logger; + private UserDeletedListener $userDeletedListener; + private IJobList|MockObject $jobList; + private LoggerInterface|MockObject $logger; public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/Service/CirclesServiceTest.php b/tests/Unit/Service/CirclesServiceTest.php index ba07cdbe4..8e4245062 100644 --- a/tests/Unit/Service/CirclesServiceTest.php +++ b/tests/Unit/Service/CirclesServiceTest.php @@ -20,9 +20,9 @@ use Throwable; class CirclesServiceTest extends TestCase { - private ContainerInterface&MockObject $container; - private IAppManager&MockObject $appManager; - private LoggerInterface&MockObject $logger; + private ContainerInterface|MockObject $container; + private IAppManager|MockObject $appManager; + private LoggerInterface|MockObject $logger; public function setUp(): void { if (!class_exists(CirclesManager::class)) { diff --git a/tests/Unit/Service/ConfigServiceTest.php b/tests/Unit/Service/ConfigServiceTest.php index d0ff7a420..b22d8f7af 100644 --- a/tests/Unit/Service/ConfigServiceTest.php +++ b/tests/Unit/Service/ConfigServiceTest.php @@ -21,17 +21,10 @@ class ConfigServiceTest extends TestCase { - /** @var ConfigService */ - private $configService; - - /** @var IConfig|MockObject */ - private $config; - - /** @var IGroupManager|MockObject */ - private $groupManager; - - /** @var IUser|MockObject */ - private $currentUser; + private ConfigService $configService; + private IConfig|MockObject $config; + private IGroupManager|MockObject $groupManager; + private IUser|MockObject $currentUser; public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/Service/FormsServiceTest.php b/tests/Unit/Service/FormsServiceTest.php index 0ae0378de..297a5068c 100644 --- a/tests/Unit/Service/FormsServiceTest.php +++ b/tests/Unit/Service/FormsServiceTest.php @@ -66,50 +66,21 @@ function microtime(bool|float $asFloat = false) { class FormsServiceTest extends TestCase { - /** @var FormsService */ - private $formsService; - - /** @var ActivityManager|MockObject */ - private $activityManager; - - /** @var FormMapper|MockObject */ - private $formMapper; - - /** @var OptionMapper|MockObject */ - private $optionMapper; - - /** @var QuestionMapper|MockObject */ - private $questionMapper; - - /** @var ShareMapper|MockObject */ - private $shareMapper; - - /** @var SubmissionMapper|MockObject */ - private $submissionMapper; - - /** @var ConfigService|MockObject */ - private $configService; - - /** @var IGroupManager|MockObject */ - private $groupManager; - - /** @var IUserManager|MockObject */ - private $userManager; - - /** @var ISecureRandom|MockObject */ - private $secureRandom; - - /** @var CirclesService|MockObject */ - private $circlesService; - - /** @var IRootFolder|MockObject */ - private $storage; - - /** @var IL10N|MockObject */ - private $l10n; - - /** @var LoggerInterface|MockObject */ - private $logger; + private FormsService $formsService; + private ActivityManager|MockObject $activityManager; + private FormMapper|MockObject $formMapper; + private OptionMapper|MockObject $optionMapper; + private QuestionMapper|MockObject $questionMapper; + private ShareMapper|MockObject $shareMapper; + private SubmissionMapper|MockObject $submissionMapper; + private ConfigService|MockObject $configService; + private IGroupManager|MockObject $groupManager; + private IUserManager|MockObject $userManager; + private ISecureRandom|MockObject $secureRandom; + private CirclesService|MockObject $circlesService; + private IRootFolder|MockObject $storage; + private IL10N|MockObject $l10n; + private LoggerInterface|MockObject $logger; public function setUp(): void { parent::setUp(); diff --git a/tests/Unit/Service/SubmissionServiceTest.php b/tests/Unit/Service/SubmissionServiceTest.php index 746e42404..b92f6c1b0 100644 --- a/tests/Unit/Service/SubmissionServiceTest.php +++ b/tests/Unit/Service/SubmissionServiceTest.php @@ -41,53 +41,22 @@ class SubmissionServiceTest extends TestCase { - /** @var SubmissionService */ - private $submissionService; - - /** @var FormMapper|MockObject */ - private $formMapper; - - /** @var QuestionMapper|MockObject */ - private $questionMapper; - - /** @var SubmissionMapper|MockObject */ - private $submissionMapper; - - /** @var AnswerMapper|MockObject */ - private $answerMapper; - - /** @var IRootFolder|MockObject */ - private $storage; - - /** @var IConfig|MockObject */ - private $config; - - /** @var IL10N|MockObject */ - private $l10n; - - /** @var LoggerInterface|MockObject */ - private $logger; - - /** @var IUserManager|MockObject */ - private $userManager; - - /** @var IMailer|MockObject */ - private $mailer; - - /** @var ITempManager|MockObject */ - private $tempManager; - - /** @var FormsService|MockObject */ - private $formsService; - - /** @var IURLGenerator|MockObject */ - private $urlGenerator; - - /** @var UploadedFileMapper|MockObject */ - private $uploadedFileMapper; - - /** @var OptionMapper|MockObject */ - private $optionMapper; + private SubmissionService $submissionService; + private FormMapper|MockObject $formMapper; + private QuestionMapper|MockObject $questionMapper; + private SubmissionMapper|MockObject $submissionMapper; + private AnswerMapper|MockObject $answerMapper; + private IRootFolder|MockObject $storage; + private IConfig|MockObject $config; + private IL10N|MockObject $l10n; + private LoggerInterface|MockObject $logger; + private IUserManager|MockObject $userManager; + private IMailer|MockObject $mailer; + private ITempManager|MockObject $tempManager; + private FormsService|MockObject $formsService; + private IURLGenerator|MockObject $urlGenerator; + private UploadedFileMapper|MockObject $uploadedFileMapper; + private OptionMapper|MockObject $optionMapper; public function setUp(): void { parent::setUp();