From 2ee65f177e4f7e09ad2287f14d564e7068d322fb Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Wed, 25 Mar 2020 22:21:27 +0100
Subject: Use the shorter phpunit syntax for mocked return values

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 apps/files_trashbin/tests/StorageTest.php  | 8 ++++----
 apps/files_trashbin/tests/TrashbinTest.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'apps/files_trashbin')

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';
-- 
cgit v1.2.3