Skip to content

refactor: replace @var tags with typed properties #3322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chartman123 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: replace @var tags with typed properties #3322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions lib/Db/Share.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
7 changes: 2 additions & 5 deletions lib/Migration/Version0010Date20190000000007.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions lib/Migration/Version010200Date20200323141300.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions lib/Migration/Version020202Date20210311150843.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
use OCP\Migration\SimpleMigrationStep;

class Version020202Date20210311150843 extends SimpleMigrationStep {
/** @var IDBConnection */
protected $connection;
protected IDBConnection $connection;

/**
* @param IDBConnection $connection
Expand Down
3 changes: 1 addition & 2 deletions lib/Migration/Version020300Date20210406114130.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
use OCP\Migration\SimpleMigrationStep;

class Version020300Date20210406114130 extends SimpleMigrationStep {
/** @var IDBConnection */
protected $connection;
protected IDBConnection $connection;

/**
* @param IDBConnection $connection
Expand Down
3 changes: 1 addition & 2 deletions lib/Migration/Version030000Date20211206213004.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@

class Version030000Date20211206213004 extends SimpleMigrationStep {

/** @var IDBConnection */
protected $connection;
protected IDBConnection $connection;

/**
* @param IDBConnection $connection
Expand Down
3 changes: 1 addition & 2 deletions lib/Migration/Version030000Date20220705192811.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
use OCP\Migration\SimpleMigrationStep;

class Version030000Date20220705192811 extends SimpleMigrationStep {
/** @var IDBConnection */
protected $connection;
protected IDBConnection $connection;

/**
* @param IDBConnection $connection
Expand Down
3 changes: 1 addition & 2 deletions lib/Migration/Version030000Date20220926200602.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
use OCP\Migration\SimpleMigrationStep;

class Version030000Date20220926200602 extends SimpleMigrationStep {
/** @var IDBConnection */
protected $connection;
protected IDBConnection $connection;

/**
* @param IDBConnection $connection
Expand Down
3 changes: 1 addition & 2 deletions tests/Integration/Api/ApiV3Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
* @group DB
*/
class ApiV3Test extends IntegrationBase {
/** @var GuzzleHttp\Client */
private $http;
private Client $http;

protected array $users = [
'test' => 'Test user',
Expand Down
3 changes: 1 addition & 2 deletions tests/Integration/Api/RespectAdminSettingsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
* @group DB
*/
class RespectAdminSettingsTest extends IntegrationBase {
/** @var GuzzleHttp\Client */
private $http;
private Client $http;

protected array $users = [
'test' => 'Test user',
Expand Down
3 changes: 1 addition & 2 deletions tests/Integration/DB/SubmissionMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
* @group DB
*/
class SubmissionMapperTest extends IntegrationBase {
/** @var SubmissionMapper */
private $submissionMapper;
private SubmissionMapper $submissionMapper;

protected array $users = [
'test' => 'Test user',
Expand Down
3 changes: 1 addition & 2 deletions tests/Integration/IntegrationBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Activity/ActivityManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
11 changes: 3 additions & 8 deletions tests/Unit/Activity/FilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
43 changes: 11 additions & 32 deletions tests/Unit/Activity/ProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 2 additions & 6 deletions tests/Unit/Activity/Settings/FormsActivitySettingsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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();
Expand Down
8 changes: 2 additions & 6 deletions tests/Unit/Activity/Settings/NewShareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 2 additions & 6 deletions tests/Unit/Activity/Settings/NewSharedSubmissionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 2 additions & 6 deletions tests/Unit/Activity/Settings/NewSubmissionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
19 changes: 5 additions & 14 deletions tests/Unit/BackgroundJob/CleanupUploadedFilesJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
31 changes: 8 additions & 23 deletions tests/Unit/BackgroundJob/SyncSubmissionsWithLinkedFileJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
11 changes: 3 additions & 8 deletions tests/Unit/BackgroundJob/UserDeletedJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading
Loading