Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Merge pull request #38762 from fsamapoor/constructor_property_promotion_in_core_command_part1 

Uses PHP8's constructor property promotion in core/Command/Encryption
pull/38915/head
Louis 3 years ago
committed by GitHub
parent
6d33356ede 90035e98c1
commit
358ce60b10
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 44 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      core/Command/Encryption/ChangeKeyStorageRoot.php
  2. 25
      core/Command/Encryption/DecryptAll.php
  3. 7
      core/Command/Encryption/Disable.php
  4. 13
      core/Command/Encryption/Enable.php
  5. 18
      core/Command/Encryption/EncryptAll.php
  6. 9
      core/Command/Encryption/ListModules.php
  7. 21
      core/Command/Encryption/MigrateKeyStorage.php
  8. 9
      core/Command/Encryption/SetDefaultModule.php
  9. 7
      core/Command/Encryption/ShowKeyStorageRoot.php
  10. 7
      core/Command/Encryption/Status.php

19
core/Command/Encryption/ChangeKeyStorageRoot.php
View File

@ -40,19 +40,14 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
class ChangeKeyStorageRoot extends Command {
protected View $rootView;
protected IUserManager $userManager;
protected IConfig $config;
protected Util $util;
protected QuestionHelper $questionHelper;
public function __construct(View $view, IUserManager $userManager, IConfig $config, Util $util, QuestionHelper $questionHelper) {
public function __construct(
protected View $rootView,
protected IUserManager $userManager,
protected IConfig $config,
protected Util $util,
protected QuestionHelper $questionHelper,
) {
parent::__construct();
$this->rootView = $view;
$this->userManager = $userManager;
$this->config = $config;
$this->util = $util;
$this->questionHelper = $questionHelper;
}
protected function configure() {

25
core/Command/Encryption/DecryptAll.php
View File

@ -41,28 +41,17 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
class DecryptAll extends Command {
protected IManager $encryptionManager;
protected IAppManager $appManager;
protected IConfig $config;
protected QuestionHelper $questionHelper;
protected bool $wasTrashbinEnabled;
protected bool $wasMaintenanceModeEnabled;
protected \OC\Encryption\DecryptAll $decryptAll;
protected bool $wasTrashbinEnabled = false;
protected bool $wasMaintenanceModeEnabled = false;
public function __construct(
IManager $encryptionManager,
IAppManager $appManager,
IConfig $config,
\OC\Encryption\DecryptAll $decryptAll,
QuestionHelper $questionHelper
protected IManager $encryptionManager,
protected IAppManager $appManager,
protected IConfig $config,
protected \OC\Encryption\DecryptAll $decryptAll,
protected QuestionHelper $questionHelper,
) {
parent::__construct();
$this->appManager = $appManager;
$this->encryptionManager = $encryptionManager;
$this->config = $config;
$this->decryptAll = $decryptAll;
$this->questionHelper = $questionHelper;
}
/**

7
core/Command/Encryption/Disable.php
View File

@ -27,11 +27,10 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Disable extends Command {
protected IConfig $config;
public function __construct(IConfig $config) {
public function __construct(
protected IConfig $config,
) {
parent::__construct();
$this->config = $config;
}
protected function configure() {

13
core/Command/Encryption/Enable.php
View File

@ -29,14 +29,11 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Enable extends Command {
protected IConfig $config;
protected IManager $encryptionManager;
public function __construct(IConfig $config, IManager $encryptionManager) {
public function __construct(
protected IConfig $config,
protected IManager $encryptionManager,
) {
parent::__construct();
$this->encryptionManager = $encryptionManager;
$this->config = $config;
}
protected function configure() {
@ -70,7 +67,7 @@ class Enable extends Command {
return 1;
}
$output->writeln('Default module: ' . $defaultModule);
return 0;
}
}

18
core/Command/Encryption/EncryptAll.php
View File

@ -36,24 +36,16 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
class EncryptAll extends Command {
protected IManager $encryptionManager;
protected IAppManager $appManager;
protected IConfig $config;
protected QuestionHelper $questionHelper;
protected bool $wasTrashbinEnabled = false;
protected bool $wasMaintenanceModeEnabled;
protected bool $wasMaintenanceModeEnabled = false;
public function __construct(
IManager $encryptionManager,
IAppManager $appManager,
IConfig $config,
QuestionHelper $questionHelper
protected IManager $encryptionManager,
protected IAppManager $appManager,
protected IConfig $config,
protected QuestionHelper $questionHelper,
) {
parent::__construct();
$this->appManager = $appManager;
$this->encryptionManager = $encryptionManager;
$this->config = $config;
$this->questionHelper = $questionHelper;
}
/**

9
core/Command/Encryption/ListModules.php
View File

@ -30,16 +30,11 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class ListModules extends Base {
protected IManager $encryptionManager;
protected IConfig $config;
public function __construct(
IManager $encryptionManager,
IConfig $config
protected IManager $encryptionManager,
protected IConfig $config,
) {
parent::__construct();
$this->encryptionManager = $encryptionManager;
$this->config = $config;
}
protected function configure() {

21
core/Command/Encryption/MigrateKeyStorage.php
View File

@ -33,25 +33,18 @@ use OCP\IUserManager;
use OCP\Security\ICrypto;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class MigrateKeyStorage extends Command {
protected View $rootView;
protected IUserManager $userManager;
protected IConfig $config;
protected Util $util;
protected QuestionHelper $questionHelper;
private ICrypto $crypto;
public function __construct(View $view, IUserManager $userManager, IConfig $config, Util $util, ICrypto $crypto) {
public function __construct(
protected View $rootView,
protected IUserManager $userManager,
protected IConfig $config,
protected Util $util,
private ICrypto $crypto,
) {
parent::__construct();
$this->rootView = $view;
$this->userManager = $userManager;
$this->config = $config;
$this->util = $util;
$this->crypto = $crypto;
}
protected function configure() {

9
core/Command/Encryption/SetDefaultModule.php
View File

@ -31,16 +31,11 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class SetDefaultModule extends Command {
protected IManager $encryptionManager;
protected IConfig $config;
public function __construct(
IManager $encryptionManager,
IConfig $config
protected IManager $encryptionManager,
protected IConfig $config,
) {
parent::__construct();
$this->encryptionManager = $encryptionManager;
$this->config = $config;
}
protected function configure() {

7
core/Command/Encryption/ShowKeyStorageRoot.php
View File

@ -29,11 +29,10 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class ShowKeyStorageRoot extends Command {
protected Util $util;
public function __construct(Util $util) {
public function __construct(
protected Util $util,
) {
parent::__construct();
$this->util = $util;
}
protected function configure() {

7
core/Command/Encryption/Status.php
View File

@ -27,11 +27,10 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Status extends Base {
protected IManager $encryptionManager;
public function __construct(IManager $encryptionManager) {
public function __construct(
protected IManager $encryptionManager,
) {
parent::__construct();
$this->encryptionManager = $encryptionManager;
}
protected function configure() {

Write Preview
Loading…
Cancel
Save