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/files_trashbin | |
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/files_trashbin')
-rw-r--r-- | apps/files_trashbin/tests/StorageTest.php | 8 | ||||
-rw-r--r-- | apps/files_trashbin/tests/TrashbinTest.php | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php index eb4e4635521..6b57d111ea9 100644 --- a/apps/files_trashbin/tests/StorageTest.php +++ b/apps/files_trashbin/tests/StorageTest.php @@ -476,13 +476,13 @@ class StorageTest extends \Test\TestCase { $storage->expects($this->any()) ->method('rename') - ->will($this->returnValue(false)); + ->willReturn(false); $storage->expects($this->any()) ->method('moveFromStorage') - ->will($this->returnValue(false)); + ->willReturn(false); $storage->expects($this->any()) ->method('unlink') - ->will($this->returnValue(false)); + ->willReturn(false); $cache = $storage->getCache(); @@ -513,7 +513,7 @@ class StorageTest extends \Test\TestCase { $storage->expects($this->any()) ->method('rmdir') - ->will($this->returnValue(false)); + ->willReturn(false); $cache = $storage->getCache(); diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php index e682d0dd51f..4465bfbab3c 100644 --- a/apps/files_trashbin/tests/TrashbinTest.php +++ b/apps/files_trashbin/tests/TrashbinTest.php @@ -122,13 +122,13 @@ class TrashbinTest extends \Test\TestCase { $mockConfig = $this->createMock(\OCP\IConfig::class); $mockConfig->expects($this->any()) ->method('getSystemValue') - ->will($this->returnCallback(function ($key, $default) use ($config) { + ->willReturnCallback(function ($key, $default) use ($config) { if ($key === 'filesystem_check_changes') { return \OC\Files\Cache\Watcher::CHECK_ONCE; } else { return $config->getSystemValue($key, $default); } - })); + }); $this->overwriteService(\OC\AllConfig::class, $mockConfig); $this->trashRoot1 = '/' . self::TEST_TRASHBIN_USER1 . '/files_trashbin'; |