diff options
| -rw-r--r-- | settings/Controller/UsersController.php | 12 | ||||
| -rw-r--r-- | tests/Settings/Controller/UsersControllerTest.php | 14 |
2 files changed, 0 insertions, 26 deletions
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index f92f073e879..d311b9dcb80 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -45,7 +45,6 @@ use OC\Security\IdentityProof\Manager; use OCP\App\IAppManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\DataResponse; -use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; use OCP\Files\Config\IUserMountCache; use OCP\Encryption\IEncryptionModule; @@ -61,7 +60,6 @@ use OCP\IUserManager; use OCP\IUserSession; use OCP\Mail\IMailer; use OCP\IAvatarManager; -use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; use OCP\Util; use OC\Settings\BackgroundJobs\VerifyUserData; @@ -100,10 +98,6 @@ class UsersController extends Controller { private $secureRandom; /** @var NewUserMailHelper */ private $newUserMailHelper; - /** @var ITimeFactory */ - private $timeFactory; - /** @var ICrypto */ - private $crypto; /** @var Manager */ private $keyManager; /** @var IJobList */ @@ -133,8 +127,6 @@ class UsersController extends Controller { * @param AccountManager $accountManager * @param ISecureRandom $secureRandom * @param NewUserMailHelper $newUserMailHelper - * @param ITimeFactory $timeFactory - * @param ICrypto $crypto * @param Manager $keyManager * @param IJobList $jobList * @param IUserMountCache $userMountCache @@ -156,8 +148,6 @@ class UsersController extends Controller { AccountManager $accountManager, ISecureRandom $secureRandom, NewUserMailHelper $newUserMailHelper, - ITimeFactory $timeFactory, - ICrypto $crypto, Manager $keyManager, IJobList $jobList, IUserMountCache $userMountCache, @@ -176,8 +166,6 @@ class UsersController extends Controller { $this->accountManager = $accountManager; $this->secureRandom = $secureRandom; $this->newUserMailHelper = $newUserMailHelper; - $this->timeFactory = $timeFactory; - $this->crypto = $crypto; $this->keyManager = $keyManager; $this->jobList = $jobList; $this->userMountCache = $userMountCache; diff --git a/tests/Settings/Controller/UsersControllerTest.php b/tests/Settings/Controller/UsersControllerTest.php index 15c18fb7f08..1b59f15efb0 100644 --- a/tests/Settings/Controller/UsersControllerTest.php +++ b/tests/Settings/Controller/UsersControllerTest.php @@ -19,7 +19,6 @@ use OC\SubAdmin; use OCP\App\IAppManager; use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; -use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\IJobList; use OCP\Files\Config\IUserMountCache; use OCP\Encryption\IEncryptionModule; @@ -38,7 +37,6 @@ use OCP\IUserManager; use OCP\IUserSession; use OCP\Mail\IEMailTemplate; use OCP\Mail\IMailer; -use OCP\Security\ICrypto; use OCP\Security\ISecureRandom; use OC\User\User; use Test\Util\User\Dummy; @@ -74,12 +72,8 @@ class UsersControllerTest extends \Test\TestCase { private $accountManager; /** @var ISecureRandom | \PHPUnit_Framework_MockObject_MockObject */ private $secureRandom; - /** @var ITimeFactory | \PHPUnit_Framework_MockObject_MockObject */ - private $timeFactory; /** @var NewUserMailHelper|\PHPUnit_Framework_MockObject_MockObject */ private $newUserMailHelper; - /** @var ICrypto | \PHPUnit_Framework_MockObject_MockObject */ - private $crypto; /** @var IJobList | \PHPUnit_Framework_MockObject_MockObject */ private $jobList; /** @var \OC\Security\IdentityProof\Manager |\PHPUnit_Framework_MockObject_MockObject */ @@ -105,11 +99,7 @@ class UsersControllerTest extends \Test\TestCase { $this->avatarManager = $this->createMock(IAvatarManager::class); $this->accountManager = $this->createMock(AccountManager::class); $this->secureRandom = $this->createMock(ISecureRandom::class); - $this->timeFactory = $this->createMock(ITimeFactory::class); - $this->crypto = $this->createMock(ICrypto::class); $this->newUserMailHelper = $this->createMock(NewUserMailHelper::class); - $this->timeFactory = $this->createMock(ITimeFactory::class); - $this->crypto = $this->createMock(ICrypto::class); $this->securityManager = $this->getMockBuilder(\OC\Security\IdentityProof\Manager::class)->disableOriginalConstructor()->getMock(); $this->jobList = $this->createMock(IJobList::class); $this->encryptionManager = $this->createMock(IManager::class); @@ -163,8 +153,6 @@ class UsersControllerTest extends \Test\TestCase { $this->accountManager, $this->secureRandom, $this->newUserMailHelper, - $this->timeFactory, - $this->crypto, $this->securityManager, $this->jobList, $this->userMountCache, @@ -190,8 +178,6 @@ class UsersControllerTest extends \Test\TestCase { $this->accountManager, $this->secureRandom, $this->newUserMailHelper, - $this->timeFactory, - $this->crypto, $this->securityManager, $this->jobList, $this->userMountCache, |