Skip to content
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

use PHP8's constructor property promotion #793

Merged
merged 2 commits into from
Jul 16, 2023
Merged

use PHP8's constructor property promotion #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd9045
use PHP8's constructor property promotion
shdehnavi Jul 5, 2023
20d8d8c
make adjustments based on the review
shdehnavi Jul 5, 2023
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
10 changes: 4 additions & 6 deletions lib/Activity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@ class Activity implements \OCP\Activity\IExtension {
const SUBJECT_ITEM_RENAMED_SELF = 'item_renamed_self';


protected $URLGenerator;
protected $factory;

public function __construct(IURLGenerator $URLGenerator, IFactory $factory) {
$this->URLGenerator = $URLGenerator;
$this->factory = $factory;
public function __construct(
protected IURLGenerator $URLGenerator,
protected IFactory $factory,
) {
}


Expand Down
6 changes: 5 additions & 1 deletion lib/BackgroundJob/ExpireCredentials.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ class ExpireCredentials extends TimedJob {
* @param IConfig $config
* @param CronService $cronService
*/
public function __construct(ITimeFactory $timeFactory, protected IConfig $config, private CronService $cronService) {
public function __construct(
ITimeFactory $timeFactory,
protected IConfig $config,
private CronService $cronService,
) {
parent::__construct($timeFactory);

// Run once per minute
Expand Down
39 changes: 13 additions & 26 deletions lib/Controller/AdminController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,18 @@

class AdminController extends ApiController {
private $userId;
private $vaultService;
private $credentialService;
private $fileService;
private $revisionService;
private $deleteVaultRequestService;
private $config;
private $userManager;

public function __construct($AppName,
IRequest $request,
$UserId,
VaultService $vaultService,
CredentialService $credentialService,
FileService $fileService,
CredentialRevisionService $revisionService,
DeleteVaultRequestService $deleteVaultRequestService,
IConfig $config,
IUserManager $userManager

public function __construct(
$AppName,
IRequest $request,
$UserId,
private VaultService $vaultService,
private CredentialService $credentialService,
private FileService $fileService,
private CredentialRevisionService $revisionService,
private DeleteVaultRequestService $deleteVaultRequestService,
private IConfig $config,
private IUserManager $userManager,
) {
parent::__construct(
$AppName,
Expand All @@ -55,14 +49,7 @@ public function __construct($AppName,
'Authorization, Content-Type, Accept',
86400);
$this->userId = $UserId;
$this->vaultService = $vaultService;
$this->credentialService = $credentialService;
$this->fileService = $fileService;
$this->revisionService = $revisionService;
$this->deleteVaultRequestService = $deleteVaultRequestService;

$this->config = $config;
$this->userManager = $userManager;

}


Expand Down
28 changes: 9 additions & 19 deletions lib/Controller/CredentialController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,16 @@

class CredentialController extends ApiController {
private $userId;
private $credentialService;
private $activityService;
private $credentialRevisionService;
private $sharingService;
private $settings;

public function __construct($AppName,
IRequest $request,
$userId,
CredentialService $credentialService,
ActivityService $activityService,
CredentialRevisionService $credentialRevisionService,
ShareService $sharingService,
SettingsService $settings

public function __construct(
$AppName,
IRequest $request,
$userId,
private CredentialService $credentialService,
private ActivityService $activityService,
private CredentialRevisionService $credentialRevisionService,
private ShareService $sharingService,
private SettingsService $settings,
) {
parent::__construct(
$AppName,
Expand All @@ -52,11 +47,6 @@ public function __construct($AppName,
'Authorization, Content-Type, Accept',
86400);
$this->userId = $userId;
$this->credentialService = $credentialService;
$this->activityService = $activityService;
$this->credentialRevisionService = $credentialRevisionService;
$this->sharingService = $sharingService;
$this->settings = $settings;
}


Expand Down
16 changes: 7 additions & 9 deletions lib/Controller/FileController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,21 @@

class FileController extends ApiController {
private $userId;
private $fileService;
private $logger;

public function __construct($AppName,
IRequest $request,
$UserId,
FileService $fileService,
LoggerInterface $logger) {
public function __construct(
$AppName,
IRequest $request,
$UserId,
private FileService $fileService,
private LoggerInterface $logger,
) {
parent::__construct(
$AppName,
$request,
'GET, POST, DELETE, PUT, PATCH, OPTIONS',
'Authorization, Content-Type, Accept',
86400);
$this->userId = $UserId;
$this->fileService = $fileService;
$this->logger = $logger;
}


Expand Down
19 changes: 7 additions & 12 deletions lib/Controller/IconController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,15 @@

class IconController extends ApiController {
private $userId;
private $credentialService;
private $am;
private $urlGenerator;
const ICON_CACHE_OFFSET = 2592000; // 3600 * 24 * 30

public function __construct($AppName,
IRequest $request,
$UserId,
CredentialService $credentialService,
AppManager $am,
IURLGenerator $urlGenerator
public function __construct(
$AppName,
IRequest $request,
$UserId,
private CredentialService $credentialService,
private AppManager $am,
private IURLGenerator $urlGenerator,
) {
parent::__construct(
$AppName,
Expand All @@ -44,9 +42,6 @@ public function __construct($AppName,
'Authorization, Content-Type, Accept',
86400);
$this->userId = $UserId;
$this->credentialService = $credentialService;
$this->am = $am;
$this->urlGenerator = $urlGenerator;

}

Expand Down
23 changes: 8 additions & 15 deletions lib/Controller/InternalController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,15 @@

class InternalController extends ApiController {
private $userId;
private $credentialService;
private $config;
private $manager;
private $appManager;

public function __construct($AppName,
IRequest $request,
$UserId,
CredentialService $credentialService,
IConfig $config,
IManager $IManager,
IAppManager $appManager
public function __construct(
$AppName,
IRequest $request,
$UserId,
private CredentialService $credentialService,
private IConfig $config,
private IManager $manager,
private IAppManager $appManager,
) {
parent::__construct(
$AppName,
Expand All @@ -41,10 +38,6 @@ public function __construct($AppName,
'Authorization, Content-Type, Accept',
86400);
$this->userId = $UserId;
$this->credentialService = $credentialService;
$this->config = $config;
$this->manager = $IManager;
$this->appManager = $appManager;
}

/**
Expand Down
12 changes: 4 additions & 8 deletions lib/Controller/SettingsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,20 @@
use OCP\IRequest;

class SettingsController extends ApiController {
private $userId;
private $settings;

public function __construct(
$AppName,
IRequest $request,
$userId,
SettingsService $settings,
IL10N $l) {
private $userId,
private SettingsService $settings,
private IL10N $l,
) {
parent::__construct(
$AppName,
$request,
'GET, POST, DELETE, PUT, PATCH, OPTIONS',
'Authorization, Content-Type, Accept',
86400);
$this->settings = $settings;
$this->l = $l;
$this->userId = $userId;
}

/**
Expand Down
47 changes: 14 additions & 33 deletions lib/Controller/ShareController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,33 +36,24 @@

class ShareController extends ApiController {
private $userId;
private $activityService;
private $groupManager;
private $userManager;
private $vaultService;
private $shareService;
private $credentialService;
private $notificationService;
private $fileService;
private $settings;
private $manager;

private $limit = 50;
private $offset = 0;

public function __construct($AppName,
IRequest $request,
$UserId,
IGroupManager $groupManager,
IUserManager $userManager,
ActivityService $activityService,
VaultService $vaultService,
ShareService $shareService,
CredentialService $credentialService,
NotificationService $notificationService,
FileService $fileService,
SettingsService $config,
IManager $IManager
public function __construct(
$AppName,
IRequest $request,
$UserId,
private IGroupManager $groupManager,
private IUserManager $userManager,
private ActivityService $activityService,
private VaultService $vaultService,
private ShareService $shareService,
private CredentialService $credentialService,
private NotificationService $notificationService,
private FileService $fileService,
private SettingsService $settings,
private IManager $manager,
) {
parent::__construct(
$AppName,
Expand All @@ -72,16 +63,6 @@ public function __construct($AppName,
86400);

$this->userId = $UserId;
$this->userManager = $userManager;
$this->groupManager = $groupManager;
$this->activityService = $activityService;
$this->vaultService = $vaultService;
$this->shareService = $shareService;
$this->credentialService = $credentialService;
$this->notificationService = $notificationService;
$this->fileService = $fileService;
$this->settings = $config;
$this->manager = $IManager;
}


Expand Down
9 changes: 4 additions & 5 deletions lib/Controller/TranslationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@
use OCP\IRequest;

class TranslationController extends ApiController {
private $trans;

public function __construct($AppName,
IRequest $request,
IL10N $trans
public function __construct(
$AppName,
IRequest $request,
private IL10N $trans,
) {
parent::__construct(
$AppName,
$request,
'GET, POST, DELETE, PUT, PATCH, OPTIONS',
'Authorization, Content-Type, Accept',
86400);
$this->trans = $trans;
}


Expand Down
34 changes: 12 additions & 22 deletions lib/Controller/VaultController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,35 +26,25 @@

class VaultController extends ApiController {
private $userId;
private $vaultService;
private $credentialService;
private $settings;
private $fileService;
private $logger;
private $deleteVaultRequestService;

public function __construct($AppName,
IRequest $request,
$UserId,
VaultService $vaultService,
CredentialService $credentialService,
DeleteVaultRequestService $deleteVaultRequestService,
SettingsService $settings,
FileService $fileService,
LoggerInterface $logger) {

public function __construct(
$AppName,
IRequest $request,
$UserId,
private VaultService $vaultService,
private CredentialService $credentialService,
private DeleteVaultRequestService $deleteVaultRequestService,
private SettingsService $settings,
private FileService $fileService,
private LoggerInterface $logger,
) {
parent::__construct(
$AppName,
$request,
'GET, POST, DELETE, PUT, PATCH, OPTIONS',
'Authorization, Content-Type, Accept',
86400);
$this->userId = $UserId;
$this->vaultService = $vaultService;
$this->credentialService = $credentialService;
$this->deleteVaultRequestService = $deleteVaultRequestService;
$this->settings = $settings;
$this->fileService = $fileService;
$this->logger = $logger;
}

/**
Expand Down
Loading