diff options
Diffstat (limited to 'apps/encryption/lib/Controller')
| -rw-r--r-- | apps/encryption/lib/Controller/RecoveryController.php | 28 | ||||
| -rw-r--r-- | apps/encryption/lib/Controller/SettingsController.php | 53 | ||||
| -rw-r--r-- | apps/encryption/lib/Controller/StatusController.php | 23 |
3 files changed, 24 insertions, 80 deletions
diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php index 66011fe2439..d75406e6319 100644 --- a/apps/encryption/lib/Controller/RecoveryController.php +++ b/apps/encryption/lib/Controller/RecoveryController.php @@ -18,34 +18,20 @@ use OCP\IRequest; class RecoveryController extends Controller { /** - * @var IConfig - */ - private $config; - /** - * @var IL10N - */ - private $l; - /** - * @var Recovery - */ - private $recovery; - - /** * @param string $AppName * @param IRequest $request * @param IConfig $config - * @param IL10N $l10n + * @param IL10N $l * @param Recovery $recovery */ - public function __construct($AppName, + public function __construct( + $AppName, IRequest $request, - IConfig $config, - IL10N $l10n, - Recovery $recovery) { + private IConfig $config, + private IL10N $l, + private Recovery $recovery, + ) { parent::__construct($AppName, $request); - $this->config = $config; - $this->l = $l10n; - $this->recovery = $recovery; } /** diff --git a/apps/encryption/lib/Controller/SettingsController.php b/apps/encryption/lib/Controller/SettingsController.php index df896e52fa5..8548ea51c04 100644 --- a/apps/encryption/lib/Controller/SettingsController.php +++ b/apps/encryption/lib/Controller/SettingsController.php @@ -24,34 +24,10 @@ use OCP\IUserSession; class SettingsController extends Controller { - /** @var IL10N */ - private $l; - - /** @var IUserManager */ - private $userManager; - - /** @var IUserSession */ - private $userSession; - - /** @var KeyManager */ - private $keyManager; - - /** @var Crypt */ - private $crypt; - - /** @var Session */ - private $session; - - /** @var ISession */ - private $ocSession; - - /** @var Util */ - private $util; - /** * @param string $AppName * @param IRequest $request - * @param IL10N $l10n + * @param IL10N $l * @param IUserManager $userManager * @param IUserSession $userSession * @param KeyManager $keyManager @@ -60,26 +36,19 @@ class SettingsController extends Controller { * @param ISession $ocSession * @param Util $util */ - public function __construct($AppName, + public function __construct( + $AppName, IRequest $request, - IL10N $l10n, - IUserManager $userManager, - IUserSession $userSession, - KeyManager $keyManager, - Crypt $crypt, - Session $session, - ISession $ocSession, - Util $util, + private IL10N $l, + private IUserManager $userManager, + private IUserSession $userSession, + private KeyManager $keyManager, + private Crypt $crypt, + private Session $session, + private ISession $ocSession, + private Util $util, ) { parent::__construct($AppName, $request); - $this->l = $l10n; - $this->userSession = $userSession; - $this->userManager = $userManager; - $this->keyManager = $keyManager; - $this->crypt = $crypt; - $this->session = $session; - $this->ocSession = $ocSession; - $this->util = $util; } diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php index 5c6a950d0a3..341ad6bc49f 100644 --- a/apps/encryption/lib/Controller/StatusController.php +++ b/apps/encryption/lib/Controller/StatusController.php @@ -17,32 +17,21 @@ use OCP\IRequest; class StatusController extends Controller { - /** @var IL10N */ - private $l; - - /** @var Session */ - private $session; - - /** @var IManager */ - private $encryptionManager; - /** * @param string $AppName * @param IRequest $request - * @param IL10N $l10n + * @param IL10N $l * @param Session $session * @param IManager $encryptionManager */ - public function __construct($AppName, + public function __construct( + $AppName, IRequest $request, - IL10N $l10n, - Session $session, - IManager $encryptionManager, + private IL10N $l, + private Session $session, + private IManager $encryptionManager, ) { parent::__construct($AppName, $request); - $this->l = $l10n; - $this->session = $session; - $this->encryptionManager = $encryptionManager; } /** |