diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-03-25 22:21:27 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-03-25 22:21:27 +0100 |
| commit | 2ee65f177e4f7e09ad2287f14d564e7068d322fb (patch) | |
| tree | 39075e87ea7927e20e8956824cb7c49bf626b178 /apps/encryption/tests/Controller | |
| parent | 3cf321fdfc4235a87015a9af2f59c63220016c65 (diff) | |
| download | nextcloud-server-2ee65f177e4f7e09ad2287f14d564e7068d322fb.tar.gz nextcloud-server-2ee65f177e4f7e09ad2287f14d564e7068d322fb.zip | |
Use the shorter phpunit syntax for mocked return values
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'apps/encryption/tests/Controller')
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/encryption/tests/Controller/RecoveryControllerTest.php b/apps/encryption/tests/Controller/RecoveryControllerTest.php index e3614b918c3..c6f7a8649b6 100644 --- a/apps/encryption/tests/Controller/RecoveryControllerTest.php +++ b/apps/encryption/tests/Controller/RecoveryControllerTest.php @@ -108,10 +108,10 @@ class RecoveryControllerTest extends TestCase { $this->recoveryMock->expects($this->any()) ->method('changeRecoveryKeyPassword') ->with($password, $oldPassword) - ->will($this->returnValueMap([ + ->willReturnMap([ ['test', 'oldTestFail', false], ['test', 'oldtest', true] - ])); + ]); $response = $this->controller->changeRecoveryPassword($password, $oldPassword, @@ -140,10 +140,10 @@ class RecoveryControllerTest extends TestCase { $this->recoveryMock->expects($this->any()) ->method('setRecoveryForUser') ->with($enableRecovery) - ->will($this->returnValueMap([ + ->willReturnMap([ ['1', true], ['0', false] - ])); + ]); $response = $this->controller->userSetRecovery($enableRecovery); diff --git a/apps/encryption/tests/Controller/SettingsControllerTest.php b/apps/encryption/tests/Controller/SettingsControllerTest.php index 62c5ebf608c..c2f67478bb7 100644 --- a/apps/encryption/tests/Controller/SettingsControllerTest.php +++ b/apps/encryption/tests/Controller/SettingsControllerTest.php @@ -85,9 +85,9 @@ class SettingsControllerTest extends TestCase { $this->l10nMock->expects($this->any()) ->method('t') - ->will($this->returnCallback(function($message) { + ->willReturnCallback(function($message) { return $message; - })); + }); $this->userManagerMock = $this->getMockBuilder(IUserManager::class) ->disableOriginalConstructor()->getMock(); diff --git a/apps/encryption/tests/Controller/StatusControllerTest.php b/apps/encryption/tests/Controller/StatusControllerTest.php index 8e217bfa473..f93be963989 100644 --- a/apps/encryption/tests/Controller/StatusControllerTest.php +++ b/apps/encryption/tests/Controller/StatusControllerTest.php @@ -63,9 +63,9 @@ class StatusControllerTest extends TestCase { ->disableOriginalConstructor()->getMock(); $this->l10nMock->expects($this->any()) ->method('t') - ->will($this->returnCallback(function($message) { + ->willReturnCallback(function($message) { return $message; - })); + }); $this->encryptionManagerMock = $this->createMock(IManager::class); $this->controller = new StatusController('encryptionTest', |