From c832e6180bcefbd82748c8e240438d6c2e21b358 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Sun, 22 Nov 2020 21:56:00 +0100
Subject: Remove unused dependencies in encryption app setup
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
apps/encryption/lib/Users/Setup.php | 31 +++----------------------------
apps/encryption/tests/Users/SetupTest.php | 11 +----------
2 files changed, 4 insertions(+), 38 deletions(-)
diff --git a/apps/encryption/lib/Users/Setup.php b/apps/encryption/lib/Users/Setup.php
index 2c4dd1fc63d..f68e06a3de0 100644
--- a/apps/encryption/lib/Users/Setup.php
+++ b/apps/encryption/lib/Users/Setup.php
@@ -29,40 +29,15 @@ namespace OCA\Encryption\Users;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\KeyManager;
-use OCP\ILogger;
-use OCP\IUserSession;
class Setup {
- /**
- * @var Crypt
- */
+ /** @var Crypt */
private $crypt;
- /**
- * @var KeyManager
- */
+ /** @var KeyManager */
private $keyManager;
- /**
- * @var ILogger
- */
- private $logger;
- /**
- * @var bool|string
- */
- private $user;
-
- /**
- * @param ILogger $logger
- * @param IUserSession $userSession
- * @param Crypt $crypt
- * @param KeyManager $keyManager
- */
- public function __construct(ILogger $logger,
- IUserSession $userSession,
- Crypt $crypt,
+ public function __construct(Crypt $crypt,
KeyManager $keyManager) {
- $this->logger = $logger;
- $this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
$this->crypt = $crypt;
$this->keyManager = $keyManager;
}
diff --git a/apps/encryption/tests/Users/SetupTest.php b/apps/encryption/tests/Users/SetupTest.php
index dfc020d5e02..1ab2fde21c5 100644
--- a/apps/encryption/tests/Users/SetupTest.php
+++ b/apps/encryption/tests/Users/SetupTest.php
@@ -30,8 +30,6 @@ namespace OCA\Encryption\Tests\Users;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Users\Setup;
-use OCP\ILogger;
-use OCP\IUserSession;
use Test\TestCase;
class SetupTest extends TestCase {
@@ -50,10 +48,6 @@ class SetupTest extends TestCase {
protected function setUp(): void {
parent::setUp();
- $logMock = $this->createMock(ILogger::class);
- $userSessionMock = $this->getMockBuilder(IUserSession::class)
- ->disableOriginalConstructor()
- ->getMock();
$this->cryptMock = $this->getMockBuilder(Crypt::class)
->disableOriginalConstructor()
->getMock();
@@ -62,10 +56,7 @@ class SetupTest extends TestCase {
->disableOriginalConstructor()
->getMock();
- /** @var \OCP\ILogger $logMock */
- /** @var \OCP\IUserSession $userSessionMock */
- $this->instance = new Setup($logMock,
- $userSessionMock,
+ $this->instance = new Setup(
$this->cryptMock,
$this->keyManagerMock);
}
--
cgit v1.2.3