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/dav/tests/unit/AppInfo/PluginManagerTest.php  |   8 +-
 .../CleanupInvitationTokenJobTest.php              |  20 +-
 .../GenerateBirthdayCalendarBackgroundJobTest.php  |  14 +-
 .../unit/BackgroundJob/RefreshWebcalJobTest.php    |   2 +-
 .../RegisterRegenerateBirthdayCalendarsTest.php    |  10 +-
 ...dateCalendarResourcesRoomsBackgroundJobTest.php |  88 ++++-----
 .../CalDAV/BirthdayCalendar/EnablePluginTest.php   |  30 +--
 .../unit/CalDAV/CachedSubscriptionObjectTest.php   |   4 +-
 .../tests/unit/CalDAV/CachedSubscriptionTest.php   |  22 +--
 apps/dav/tests/unit/CalDAV/CalDavBackendTest.php   |   4 +-
 apps/dav/tests/unit/CalDAV/CalendarHomeTest.php    |   6 +-
 apps/dav/tests/unit/CalDAV/CalendarImplTest.php    |  18 +-
 apps/dav/tests/unit/CalDAV/CalendarManagerTest.php |  12 +-
 apps/dav/tests/unit/CalDAV/CalendarTest.php        |   8 +-
 apps/dav/tests/unit/CalDAV/OutboxTest.php          |   4 +-
 .../NotificationProvider/EmailProviderTest.php     |  16 +-
 .../AbstractPrincipalBackendTest.php               |  40 ++--
 .../tests/unit/CalDAV/Schedule/IMipPluginTest.php  |  14 +-
 .../tests/unit/CalDAV/Search/SearchPluginTest.php  |  12 +-
 .../tests/unit/CalDAV/WebcalCaching/PluginTest.php |   8 +-
 .../WebcalCaching/RefreshWebcalServiceTest.php     |  22 +--
 .../dav/tests/unit/CardDAV/BirthdayServiceTest.php |  20 +-
 apps/dav/tests/unit/Comments/CommentsNodeTest.php  |  96 +++++-----
 .../dav/tests/unit/Comments/CommentsPluginTest.php | 118 ++++++------
 .../tests/unit/Comments/EntityCollectionTest.php   |  12 +-
 .../dav/tests/unit/Comments/RootCollectionTest.php |   4 +-
 apps/dav/tests/unit/Connector/Sabre/AuthTest.php   | 116 ++++++------
 .../Sabre/BlockLegacyClientPluginTest.php          |  10 +-
 .../Sabre/CommentsPropertiesPluginTest.php         |  10 +-
 .../Sabre/CustomPropertiesBackendTest.php          |   6 +-
 .../tests/unit/Connector/Sabre/DirectoryTest.php   |  56 +++---
 .../unit/Connector/Sabre/FakeLockerPluginTest.php  |   2 +-
 apps/dav/tests/unit/Connector/Sabre/FileTest.php   |  46 ++---
 .../tests/unit/Connector/Sabre/FilesPluginTest.php |  36 ++--
 .../unit/Connector/Sabre/FilesReportPluginTest.php | 120 ++++++------
 .../unit/Connector/Sabre/MaintenancePluginTest.php |   2 +-
 apps/dav/tests/unit/Connector/Sabre/NodeTest.php   |   8 +-
 .../tests/unit/Connector/Sabre/ObjectTreeTest.php  |  20 +-
 .../tests/unit/Connector/Sabre/PrincipalTest.php   | 204 ++++++++++-----------
 .../tests/unit/Connector/Sabre/QuotaPluginTest.php |  10 +-
 .../Sabre/RequestTest/PartFileInRootUploadTest.php |   4 +-
 .../unit/Connector/Sabre/SharesPluginTest.php      |  26 +--
 .../tests/unit/Connector/Sabre/TagsPluginTest.php  |  34 ++--
 .../Controller/BirthdayCalendarControllerTest.php  |  10 +-
 .../InvitationResponseControllerTest.php           |  50 ++---
 .../tests/unit/DAV/CustomPropertiesBackendTest.php |  14 +-
 apps/dav/tests/unit/DAV/GroupPrincipalTest.php     |  40 ++--
 apps/dav/tests/unit/DAV/HookManagerTest.php        |   4 +-
 .../dav/tests/unit/Files/FileSearchBackendTest.php |  28 +--
 .../unit/Files/Sharing/FilesDropPluginTest.php     |   8 +-
 .../Migration/RefreshWebcalJobRegistrarTest.php    |  28 +--
 .../unit/SystemTag/SystemTagMappingNodeTest.php    |  12 +-
 .../dav/tests/unit/SystemTag/SystemTagNodeTest.php |  22 +--
 .../tests/unit/SystemTag/SystemTagPluginTest.php   |  76 ++++----
 .../SystemTag/SystemTagsByIdCollectionTest.php     |  22 +--
 .../SystemTagsObjectMappingCollectionTest.php      |  46 ++---
 .../SystemTagsObjectTypeCollectionTest.php         |  14 +-
 apps/dav/tests/unit/Upload/ChunkingPluginTest.php  |  12 +-
 58 files changed, 854 insertions(+), 854 deletions(-)

(limited to 'apps/dav')

diff --git a/apps/dav/tests/unit/AppInfo/PluginManagerTest.php b/apps/dav/tests/unit/AppInfo/PluginManagerTest.php
index 0d181f914a1..2fbf1271341 100644
--- a/apps/dav/tests/unit/AppInfo/PluginManagerTest.php
+++ b/apps/dav/tests/unit/AppInfo/PluginManagerTest.php
@@ -84,10 +84,10 @@ class PluginManagerTest extends TestCase {
 		];
 
 		$appManager->method('getAppInfo')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				['adavapp', false, null, $appInfo1],
 				['adavapp2', false, null, $appInfo2],
-			]));
+			]);
 
 		$pluginManager = new PluginManager($server, $appManager);
 
@@ -96,7 +96,7 @@ class PluginManagerTest extends TestCase {
 		$calendarPlugin3 = $this->createMock(ICalendarProvider::class);
 
 		$server->method('query')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				['\OCA\DAV\ADavApp\PluginOne', true, 'dummyplugin1'],
 				['\OCA\DAV\ADavApp\PluginTwo', true, 'dummyplugin2'],
 				['\OCA\DAV\ADavApp\CalendarPluginOne', true, $calendarPlugin1],
@@ -106,7 +106,7 @@ class PluginManagerTest extends TestCase {
 				['\OCA\DAV\ADavApp2\PluginOne', true, 'dummy2plugin1'],
 				['\OCA\DAV\ADavApp2\CalendarPluginOne', true, $calendarPlugin3],
 				['\OCA\DAV\ADavApp2\CollectionOne', true, 'dummy2collection1'],
-			]));
+			]);
 
 		$expectedPlugins = [
 			'dummyplugin1',
diff --git a/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php b/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php
index 37bc5195e57..9134186390f 100644
--- a/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php
+++ b/apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php
@@ -59,7 +59,7 @@ class CleanupInvitationTokenJobTest extends TestCase {
 		$this->timeFactory->expects($this->once())
 			->method('getTime')
 			->with()
-			->will($this->returnValue(1337));
+			->willReturn(1337);
 
 		$queryBuilder = $this->createMock(IQueryBuilder::class);
 		$expr = $this->createMock(\OCP\DB\QueryBuilder\IExpressionBuilder::class);
@@ -68,36 +68,36 @@ class CleanupInvitationTokenJobTest extends TestCase {
 		$this->dbConnection->expects($this->once())
 			->method('getQueryBuilder')
 			->with()
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 		$queryBuilder->method('expr')
-			->will($this->returnValue($expr));
+			->willReturn($expr);
 		$queryBuilder->method('createNamedParameter')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				[1337, \PDO::PARAM_STR, null, 'namedParameter1337']
-			]));
+			]);
 
 		$expr->expects($this->once())
 			->method('lt')
 			->with('expiration', 'namedParameter1337')
-			->will($this->returnValue('LT STATEMENT'));
+			->willReturn('LT STATEMENT');
 
 		$this->dbConnection->expects($this->once())
 			->method('getQueryBuilder')
 			->with()
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 
 		$queryBuilder->expects($this->at(0))
 			->method('delete')
 			->with('calendar_invitations')
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 		$queryBuilder->expects($this->at(3))
 			->method('where')
 			->with('LT STATEMENT')
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 		$queryBuilder->expects($this->at(4))
 			->method('execute')
 			->with()
-			->will($this->returnValue($stmt));
+			->willReturn($stmt);
 
 		$this->backgroundJob->run([]);
 	}
diff --git a/apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php b/apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php
index b053f9a3996..4529383c37c 100644
--- a/apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php
+++ b/apps/dav/tests/unit/BackgroundJob/GenerateBirthdayCalendarBackgroundJobTest.php
@@ -54,12 +54,12 @@ class GenerateBirthdayCalendarBackgroundJobTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->config->expects($this->once())
 			->method('getUserValue')
 			->with('user123', 'dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->birthdayService->expects($this->never())
 			->method('resetForUser')
@@ -76,12 +76,12 @@ class GenerateBirthdayCalendarBackgroundJobTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->config->expects($this->once())
 			->method('getUserValue')
 			->with('user123', 'dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->birthdayService->expects($this->once())
 			->method('resetForUser')
@@ -98,7 +98,7 @@ class GenerateBirthdayCalendarBackgroundJobTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('no'));
+			->willReturn('no');
 
 		$this->config->expects($this->never())
 			->method('getUserValue');
@@ -113,12 +113,12 @@ class GenerateBirthdayCalendarBackgroundJobTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->config->expects($this->once())
 			->method('getUserValue')
 			->with('user123', 'dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('no'));
+			->willReturn('no');
 
 		$this->birthdayService->expects($this->never())
 			->method('syncUser');
diff --git a/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php b/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php
index 95aebd449c7..fd0301c7782 100644
--- a/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php
+++ b/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php
@@ -96,7 +96,7 @@ class RefreshWebcalJobTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'calendarSubscriptionRefreshRate', 'P1W')
-			->will($this->returnValue('P1W'));
+			->willReturn('P1W');
 
 		$this->timeFactory->expects($this->once())
 			->method('getTime')
diff --git a/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php b/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php
index 7251fffc41f..19b3cd64d7d 100644
--- a/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php
+++ b/apps/dav/tests/unit/BackgroundJob/RegisterRegenerateBirthdayCalendarsTest.php
@@ -65,18 +65,18 @@ class RegisterRegenerateBirthdayCalendarsTest extends TestCase {
 	public function testRun() {
 		$this->userManager->expects($this->once())
 			->method('callForSeenUsers')
-			->will($this->returnCallback(function($closure) {
+			->willReturnCallback(function($closure) {
 				$user1 = $this->createMock(IUser::class);
-				$user1->method('getUID')->will($this->returnValue('uid1'));
+				$user1->method('getUID')->willReturn('uid1');
 				$user2 = $this->createMock(IUser::class);
-				$user2->method('getUID')->will($this->returnValue('uid2'));
+				$user2->method('getUID')->willReturn('uid2');
 				$user3 = $this->createMock(IUser::class);
-				$user3->method('getUID')->will($this->returnValue('uid3'));
+				$user3->method('getUID')->willReturn('uid3');
 
 				$closure($user1);
 				$closure($user2);
 				$closure($user3);
-			}));
+			});
 
 		$this->jobList->expects($this->at(0))
 			->method('add')
diff --git a/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php b/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php
index bc515383053..bd232ff852e 100644
--- a/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php
+++ b/apps/dav/tests/unit/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJobTest.php
@@ -112,7 +112,7 @@ class UpdateCalendarResourcesRoomsBackgroundJobTest extends TestCase {
 		$res9 = $this->createMock(IResource::class);
 
 		$backend2->method('getBackendIdentifier')
-			->will($this->returnValue('backend2'));
+			->willReturn('backend2');
 		$backend2->method('listAllResources')
 			->will($this->throwException(new BackendTemporarilyUnavailableException()));
 		$backend2->method('getResource')
@@ -120,32 +120,32 @@ class UpdateCalendarResourcesRoomsBackgroundJobTest extends TestCase {
 		$backend2->method('getAllResources')
 			->will($this->throwException(new BackendTemporarilyUnavailableException()));
 		$backend3->method('getBackendIdentifier')
-			->will($this->returnValue('backend3'));
+			->willReturn('backend3');
 		$backend3->method('listAllResources')
-			->will($this->returnValue(['res6', 'res7']));
+			->willReturn(['res6', 'res7']);
 		$backend3->method('getResource')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				['res6', $res6],
 				['res7', $res7],
-			]));
+			]);
 		$backend4->method('getBackendIdentifier')
-			->will($this->returnValue('backend4'));
+			->willReturn('backend4');
 		$backend4->method('listAllResources')
-			->will($this->returnValue(['res8', 'res9']));
+			->willReturn(['res8', 'res9']);
 		$backend4->method('getResource')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				['res8', $res8],
 				['res9', $res9],
-			]));
+			]);
 
-		$res6->method('getId')->will($this->returnValue('res6'));
-		$res6->method('getDisplayName')->will($this->returnValue('Pointer123'));
-		$res6->method('getGroupRestrictions')->will($this->returnValue(['foo', 'biz']));
-		$res6->method('getEMail')->will($this->returnValue('res6@foo.bar'));
-		$res6->method('getBackend')->will($this->returnValue($backend3));
+		$res6->method('getId')->willReturn('res6');
+		$res6->method('getDisplayName')->willReturn('Pointer123');
+		$res6->method('getGroupRestrictions')->willReturn(['foo', 'biz']);
+		$res6->method('getEMail')->willReturn('res6@foo.bar');
+		$res6->method('getBackend')->willReturn($backend3);
 
-		$res6->method('getAllAvailableMetadataKeys')->will($this->returnValue(['meta99', 'meta123']));
-		$res6->method('getMetadataForKey')->will($this->returnCallback(function($key) {
+		$res6->method('getAllAvailableMetadataKeys')->willReturn(['meta99', 'meta123']);
+		$res6->method('getMetadataForKey')->willReturnCallback(function($key) {
 			switch($key) {
 				case 'meta99':
 					return 'value99-new';
@@ -156,15 +156,15 @@ class UpdateCalendarResourcesRoomsBackgroundJobTest extends TestCase {
 				default:
 					return null;
 			}
-		}));
-
-		$res7->method('getId')->will($this->returnValue('res7'));
-		$res7->method('getDisplayName')->will($this->returnValue('Resource4'));
-		$res7->method('getGroupRestrictions')->will($this->returnValue(['biz']));
-		$res7->method('getEMail')->will($this->returnValue('res7@foo.bar'));
-		$res7->method('getBackend')->will($this->returnValue($backend3));
-		$res7->method('getAllAvailableMetadataKeys')->will($this->returnValue(['meta1']));
-		$res7->method('getMetadataForKey')->will($this->returnCallback(function($key) {
+		});
+
+		$res7->method('getId')->willReturn('res7');
+		$res7->method('getDisplayName')->willReturn('Resource4');
+		$res7->method('getGroupRestrictions')->willReturn(['biz']);
+		$res7->method('getEMail')->willReturn('res7@foo.bar');
+		$res7->method('getBackend')->willReturn($backend3);
+		$res7->method('getAllAvailableMetadataKeys')->willReturn(['meta1']);
+		$res7->method('getMetadataForKey')->willReturnCallback(function($key) {
 			switch($key) {
 				case 'meta1':
 					return 'value1';
@@ -172,15 +172,15 @@ class UpdateCalendarResourcesRoomsBackgroundJobTest extends TestCase {
 				default:
 					return null;
 			}
-		}));
-
-		$res8->method('getId')->will($this->returnValue('res8'));
-		$res8->method('getDisplayName')->will($this->returnValue('Beamer'));
-		$res8->method('getGroupRestrictions')->will($this->returnValue([]));
-		$res8->method('getEMail')->will($this->returnValue('res8@foo.bar'));
-		$res8->method('getBackend')->will($this->returnValue($backend4));
-		$res8->method('getAllAvailableMetadataKeys')->will($this->returnValue(['meta2']));
-		$res8->method('getMetadataForKey')->will($this->returnCallback(function($key) {
+		});
+
+		$res8->method('getId')->willReturn('res8');
+		$res8->method('getDisplayName')->willReturn('Beamer');
+		$res8->method('getGroupRestrictions')->willReturn([]);
+		$res8->method('getEMail')->willReturn('res8@foo.bar');
+		$res8->method('getBackend')->willReturn($backend4);
+		$res8->method('getAllAvailableMetadataKeys')->willReturn(['meta2']);
+		$res8->method('getMetadataForKey')->willReturnCallback(function($key) {
 			switch($key) {
 				case 'meta2':
 					return 'value2';
@@ -188,26 +188,26 @@ class UpdateCalendarResourcesRoomsBackgroundJobTest extends TestCase {
 				default:
 					return null;
 			}
-		}));
+		});
 
-		$res9->method('getId')->will($this->returnValue('res9'));
-		$res9->method('getDisplayName')->will($this->returnValue('Beamer2'));
-		$res9->method('getGroupRestrictions')->will($this->returnValue([]));
-		$res9->method('getEMail')->will($this->returnValue('res9@foo.bar'));
-		$res9->method('getBackend')->will($this->returnValue($backend4));
+		$res9->method('getId')->willReturn('res9');
+		$res9->method('getDisplayName')->willReturn('Beamer2');
+		$res9->method('getGroupRestrictions')->willReturn([]);
+		$res9->method('getEMail')->willReturn('res9@foo.bar');
+		$res9->method('getBackend')->willReturn($backend4);
 
 		$this->resourceManager
 			->method('getBackends')
-			->will($this->returnValue([
+			->willReturn([
 				$backend2, $backend3, $backend4
-			]));
+			]);
 		$this->resourceManager
 			->method('getBackend')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				['backend2', $backend2],
 				['backend3', $backend3],
 				['backend4', $backend4],
-			]));
+			]);
 
 		$this->backgroundJob->run([]);
 
diff --git a/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php b/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php
index ca58625ec58..f687555a7e4 100644
--- a/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php
@@ -92,11 +92,11 @@ class EnablePluginTest extends TestCase {
 
 		$this->server->expects($this->once())
 			->method('getRequestUri')
-			->will($this->returnValue('/bar/foo'));
+			->willReturn('/bar/foo');
 		$this->server->tree->expects($this->once())
 			->method('getNodeForPath')
 			->with('/bar/foo')
-			->will($this->returnValue($calendar));
+			->willReturn($calendar);
 
 		$this->config->expects($this->never())
 			->method('setUserValue');
@@ -112,25 +112,25 @@ class EnablePluginTest extends TestCase {
 
 		$this->server->expects($this->once())
 			->method('getRequestUri')
-			->will($this->returnValue('/bar/foo'));
+			->willReturn('/bar/foo');
 		$this->server->tree->expects($this->once())
 			->method('getNodeForPath')
 			->with('/bar/foo')
-			->will($this->returnValue($calendarHome));
+			->willReturn($calendarHome);
 
 		$this->request->expects($this->at(0))
 			->method('getBodyAsString')
-			->will($this->returnValue('<nc:disable-birthday-calendar xmlns:nc="http://nextcloud.com/ns"/>'));
+			->willReturn('<nc:disable-birthday-calendar xmlns:nc="http://nextcloud.com/ns"/>');
 
 		$this->request->expects($this->at(1))
 			->method('getUrl')
-			->will($this->returnValue('url_abc'));
+			->willReturn('url_abc');
 
 		$this->server->xml->expects($this->once())
 			->method('parse')
-			->will($this->returnCallback(function($requestBody, $url, &$documentType) {
+			->willReturnCallback(function($requestBody, $url, &$documentType) {
 				$documentType =  '{http://nextcloud.com/ns}disable-birthday-calendar';
-			}));
+			});
 
 		$this->config->expects($this->never())
 			->method('setUserValue');
@@ -146,29 +146,29 @@ class EnablePluginTest extends TestCase {
 
 		$this->server->expects($this->once())
 			->method('getRequestUri')
-			->will($this->returnValue('/bar/foo'));
+			->willReturn('/bar/foo');
 		$this->server->tree->expects($this->once())
 			->method('getNodeForPath')
 			->with('/bar/foo')
-			->will($this->returnValue($calendarHome));
+			->willReturn($calendarHome);
 
 		$calendarHome->expects($this->once())
 			->method('getOwner')
-			->will($this->returnValue('principals/users/BlaBlub'));
+			->willReturn('principals/users/BlaBlub');
 
 		$this->request->expects($this->at(0))
 			->method('getBodyAsString')
-			->will($this->returnValue('<nc:enable-birthday-calendar xmlns:nc="http://nextcloud.com/ns"/>'));
+			->willReturn('<nc:enable-birthday-calendar xmlns:nc="http://nextcloud.com/ns"/>');
 
 		$this->request->expects($this->at(1))
 			->method('getUrl')
-			->will($this->returnValue('url_abc'));
+			->willReturn('url_abc');
 
 		$this->server->xml->expects($this->once())
 			->method('parse')
-			->will($this->returnCallback(function($requestBody, $url, &$documentType) {
+			->willReturnCallback(function($requestBody, $url, &$documentType) {
 				$documentType = '{http://nextcloud.com/ns}enable-birthday-calendar';
-			}));
+			});
 
 		$this->config->expects($this->once())
 			->method('setUserValue')
diff --git a/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php b/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php
index f0357f203e2..28921e81ebf 100644
--- a/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php
+++ b/apps/dav/tests/unit/CalDAV/CachedSubscriptionObjectTest.php
@@ -46,9 +46,9 @@ class CachedSubscriptionObjectTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('getCalendarObject')
 			->with(666, 'foo123', 1)
-			->will($this->returnValue([
+			->willReturn([
 				'calendardata' => 'BEGIN...',
-			]));
+			]);
 
 		$calendarObject = new CachedSubscriptionObject($backend, $calendarInfo, $objectData);
 		$this->assertEquals('BEGIN...', $calendarObject->get());
diff --git a/apps/dav/tests/unit/CalDAV/CachedSubscriptionTest.php b/apps/dav/tests/unit/CalDAV/CachedSubscriptionTest.php
index ccf59672669..9cb46767375 100644
--- a/apps/dav/tests/unit/CalDAV/CachedSubscriptionTest.php
+++ b/apps/dav/tests/unit/CalDAV/CachedSubscriptionTest.php
@@ -158,14 +158,14 @@ class CachedSubscriptionTest extends \Test\TestCase {
 		$backend->expects($this->at(0))
 			->method('getCalendarObject')
 			->with(666, 'foo1', 1)
-			->will($this->returnValue([
+			->willReturn([
 				'id' => 99,
 				'uri' => 'foo1'
-			]));
+			]);
 		$backend->expects($this->at(1))
 			->method('getCalendarObject')
 			->with(666, 'foo2', 1)
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$calendar = new CachedSubscription($backend, $calendarInfo);
 
@@ -187,7 +187,7 @@ class CachedSubscriptionTest extends \Test\TestCase {
 		$backend->expects($this->at(0))
 			->method('getCalendarObjects')
 			->with(666, 1)
-			->will($this->returnValue([
+			->willReturn([
 				[
 					'id' => 99,
 					'uri' => 'foo1'
@@ -196,7 +196,7 @@ class CachedSubscriptionTest extends \Test\TestCase {
 					'id' => 100,
 					'uri' => 'foo2'
 				],
-			]));
+			]);
 
 		$calendar = new CachedSubscription($backend, $calendarInfo);
 
@@ -218,7 +218,7 @@ class CachedSubscriptionTest extends \Test\TestCase {
 		$backend->expects($this->at(0))
 			->method('getMultipleCalendarObjects')
 			->with(666, ['foo1', 'foo2'], 1)
-			->will($this->returnValue([
+			->willReturn([
 				[
 					'id' => 99,
 					'uri' => 'foo1'
@@ -227,7 +227,7 @@ class CachedSubscriptionTest extends \Test\TestCase {
 					'id' => 100,
 					'uri' => 'foo2'
 				],
-			]));
+			]);
 
 		$calendar = new CachedSubscription($backend, $calendarInfo);
 
@@ -266,14 +266,14 @@ class CachedSubscriptionTest extends \Test\TestCase {
 		$backend->expects($this->at(0))
 			->method('getCalendarObject')
 			->with(666, 'foo1', 1)
-			->will($this->returnValue([
+			->willReturn([
 				'id' => 99,
 				'uri' => 'foo1'
-			]));
+			]);
 		$backend->expects($this->at(1))
 			->method('getCalendarObject')
 			->with(666, 'foo2', 1)
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$calendar = new CachedSubscription($backend, $calendarInfo);
 
@@ -293,7 +293,7 @@ class CachedSubscriptionTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('calendarQuery')
 			->with(666, ['foo'], 1)
-			->will($this->returnValue([99]));
+			->willReturn([99]);
 
 		$calendar = new CachedSubscription($backend, $calendarInfo);
 
diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
index 8ac4961f19f..257c6665dfe 100644
--- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
@@ -130,9 +130,9 @@ class CalDavBackendTest extends AbstractCalDavBackend {
 		$l10n
 			->expects($this->any())
 			->method('t')
-			->will($this->returnCallback(function ($text, $parameters = array()) {
+			->willReturnCallback(function ($text, $parameters = array()) {
 				return vsprintf($text, $parameters);
-			}));
+			});
 
 		$config = $this->createMock(IConfig::class);
 
diff --git a/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php b/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
index 364286edd4b..d366db8dba6 100644
--- a/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalendarHomeTest.php
@@ -73,10 +73,10 @@ class CalendarHomeTest extends TestCase {
 		$mkCol = $this->createMock(MkCol::class);
 
 		$mkCol->method('getResourceType')
-			->will($this->returnValue(['{DAV:}collection',
-				'{urn:ietf:params:xml:ns:caldav}calendar']));
+			->willReturn(['{DAV:}collection',
+				'{urn:ietf:params:xml:ns:caldav}calendar']);
 		$mkCol->method('getRemainingValues')
-			->will($this->returnValue(['... properties ...']));
+			->willReturn(['... properties ...']);
 
 		$this->backend->expects($this->once())
 			->method('createCalendar')
diff --git a/apps/dav/tests/unit/CalDAV/CalendarImplTest.php b/apps/dav/tests/unit/CalDAV/CalendarImplTest.php
index 5a32b5defa5..c32d8128874 100644
--- a/apps/dav/tests/unit/CalDAV/CalendarImplTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalendarImplTest.php
@@ -74,7 +74,7 @@ class CalendarImplTest extends \Test\TestCase {
 		$this->backend->expects($this->once())
 			->method('search')
 			->with($this->calendarInfo, 'abc', ['def'], ['ghi'], 42, 1337)
-			->will($this->returnValue(['SEARCHRESULTS']));
+			->willReturn(['SEARCHRESULTS']);
 
 		$result = $this->calendarImpl->search('abc', ['def'], ['ghi'], 42, 1337);
 		$this->assertEquals($result, ['SEARCHRESULTS']);
@@ -84,9 +84,9 @@ class CalendarImplTest extends \Test\TestCase {
 		$this->calendar->expects($this->once())
 			->method('getACL')
 			->with()
-			->will($this->returnValue([
+			->willReturn([
 				['privilege' => '{DAV:}read']
-			]));
+			]);
 
 		$this->assertEquals(1, $this->calendarImpl->getPermissions());
 	}
@@ -95,9 +95,9 @@ class CalendarImplTest extends \Test\TestCase {
 		$this->calendar->expects($this->once())
 			->method('getACL')
 			->with()
-			->will($this->returnValue([
+			->willReturn([
 				['privilege' => '{DAV:}write']
-			]));
+			]);
 
 		$this->assertEquals(6, $this->calendarImpl->getPermissions());
 	}
@@ -106,10 +106,10 @@ class CalendarImplTest extends \Test\TestCase {
 		$this->calendar->expects($this->once())
 			->method('getACL')
 			->with()
-			->will($this->returnValue([
+			->willReturn([
 				['privilege' => '{DAV:}read'],
 				['privilege' => '{DAV:}write']
-			]));
+			]);
 
 		$this->assertEquals(7, $this->calendarImpl->getPermissions());
 	}
@@ -118,9 +118,9 @@ class CalendarImplTest extends \Test\TestCase {
 		$this->calendar->expects($this->once())
 			->method('getACL')
 			->with()
-			->will($this->returnValue([
+			->willReturn([
 				['privilege' => '{DAV:}all']
-			]));
+			]);
 
 		$this->assertEquals(31, $this->calendarImpl->getPermissions());
 	}
diff --git a/apps/dav/tests/unit/CalDAV/CalendarManagerTest.php b/apps/dav/tests/unit/CalDAV/CalendarManagerTest.php
index 5d5a86524a1..146bfe24fff 100644
--- a/apps/dav/tests/unit/CalDAV/CalendarManagerTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalendarManagerTest.php
@@ -60,28 +60,28 @@ class CalendarManagerTest extends \Test\TestCase {
 		$this->backend->expects($this->once())
 			->method('getCalendarsForUser')
 			->with('principals/users/user123')
-			->will($this->returnValue([
+			->willReturn([
 				['id' => 123, 'uri' => 'blablub1'],
 				['id' => 456, 'uri' => 'blablub2'],
-			]));
+			]);
 
 		/** @var IManager | \PHPUnit_Framework_MockObject_MockObject $calendarManager */
 		$calendarManager = $this->createMock(Manager::class);
 		$calendarManager->expects($this->at(0))
 			->method('registerCalendar')
-			->will($this->returnCallback(function() {
+			->willReturnCallback(function() {
 				$parameter = func_get_arg(0);
 				$this->assertInstanceOf(CalendarImpl::class, $parameter);
 				$this->assertEquals(123, $parameter->getKey());
-			}));
+			});
 
 		$calendarManager->expects($this->at(1))
 			->method('registerCalendar')
-			->will($this->returnCallback(function() {
+			->willReturnCallback(function() {
 				$parameter = func_get_arg(0);
 				$this->assertInstanceOf(CalendarImpl::class, $parameter);
 				$this->assertEquals(456, $parameter->getKey());
-			}));
+			});
 
 		$this->manager->setupCalendarProvider($calendarManager, 'user123');
 	}
diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php
index 80e75beca5f..9a9f36c9309 100644
--- a/apps/dav/tests/unit/CalDAV/CalendarTest.php
+++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php
@@ -53,9 +53,9 @@ class CalendarTest extends TestCase {
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->will($this->returnCallback(function ($text, $parameters = array()) {
+			->willReturnCallback(function ($text, $parameters = array()) {
 				return vsprintf($text, $parameters);
-			}));
+			});
 	}
 
 	public function testDelete() {
@@ -568,7 +568,7 @@ EOD;
 
 		$backend->expects($this->any())
 			->method('getCalendarObject')
-			->will($this->returnCallback(function($cId, $uri) use($publicObject, $confidentialObject) {
+			->willReturnCallback(function($cId, $uri) use($publicObject, $confidentialObject) {
 				switch($uri) {
 					case 'event-0':
 						return $publicObject;
@@ -579,7 +579,7 @@ EOD;
 					default:
 						throw new \Exception('unexpected uri');
 				}
-			}));
+			});
 
 		$backend->expects($this->any())
 			->method('applyShareAcl')
diff --git a/apps/dav/tests/unit/CalDAV/OutboxTest.php b/apps/dav/tests/unit/CalDAV/OutboxTest.php
index 96bc8ed921d..91e03182be4 100644
--- a/apps/dav/tests/unit/CalDAV/OutboxTest.php
+++ b/apps/dav/tests/unit/CalDAV/OutboxTest.php
@@ -47,7 +47,7 @@ class OutboxTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'disableFreeBusy', 'no')
-			->will($this->returnValue('no'));
+			->willReturn('no');
 
 		$this->assertEquals([
 			[
@@ -82,7 +82,7 @@ class OutboxTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'disableFreeBusy', 'no')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->assertEquals([
 			[
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
index 2d04c605fcf..dc1e89f34c4 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
@@ -118,15 +118,15 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 
 		$enL10N = $this->createMock(IL10N::class);
 		$enL10N->method('t')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 		$enL10N->method('l')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 
 		$deL10N = $this->createMock(IL10N::class);
 		$deL10N->method('t')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 		$deL10N->method('l')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 
 		$this->l10nFactory->expects($this->at(0))
 			->method('findLanguage')
@@ -240,15 +240,15 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 
 		$enL10N = $this->createMock(IL10N::class);
 		$enL10N->method('t')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 		$enL10N->method('l')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 
 		$deL10N = $this->createMock(IL10N::class);
 		$deL10N->method('t')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 		$deL10N->method('l')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 
 		$this->l10nFactory->expects($this->at(0))
 			->method('findLanguage')
diff --git a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
index 148e7627af6..b07fd70d9f1 100644
--- a/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/ResourceBooking/AbstractPrincipalBackendTest.php
@@ -285,11 +285,11 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->expects($this->once())
 			->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->searchPrincipals($this->principalPrefix, [
 			'{http://sabredav.org/ns}email-address' => 'foo',
@@ -325,11 +325,11 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->expects($this->once())
 			->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->searchPrincipals($this->principalPrefix, [
 			'{http://nextcloud.com/ns}meta3' => 'value',
@@ -344,10 +344,10 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$user = $this->createMock(IUser::class);
 		$this->userSession->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->searchPrincipals($this->principalPrefix, [
 			'{urn:ietf:params:xml:ns:caldav}calendar-user-address-set' => 'res2@foo.bar',
@@ -385,11 +385,11 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->expects($this->once())
 			->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->findByUri('mailto:res1@foo.bar', $this->principalPrefix);
 		$this->assertEquals($this->principalPrefix . '/backend1-res1', $actual);
@@ -400,11 +400,11 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->expects($this->once())
 			->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->findByUri('mailto:res5@foo.bar', $this->principalPrefix);
 		$this->assertEquals(null, $actual);
@@ -415,11 +415,11 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->expects($this->once())
 			->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->findByUri('mailto:res99@foo.bar', $this->principalPrefix);
 		$this->assertEquals(null, $actual);
@@ -430,11 +430,11 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->expects($this->once())
 			->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->findByUri('mailto:res6@foo.bar', $this->principalPrefix);
 		$this->assertEquals($this->principalPrefix . '/backend3-res6', $actual);
@@ -445,11 +445,11 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->expects($this->once())
 			->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->findByUri('principal:' . $this->principalPrefix . '/backend3-res5', $this->principalPrefix);
 		$this->assertEquals(null, $actual);
@@ -460,11 +460,11 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->expects($this->once())
 			->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->findByUri('principal:' . $this->principalPrefix . '/db-123', $this->principalPrefix);
 		$this->assertEquals(null, $actual);
@@ -475,11 +475,11 @@ abstract class AbstractPrincipalBackendTest extends TestCase {
 		$this->userSession->expects($this->once())
 			->method('getUser')
 			->with()
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->groupManager->expects($this->once())
 			->method('getUserGroupIds')
 			->with($user)
-			->will($this->returnValue(['group1', 'group2']));
+			->willReturn(['group1', 'group2']);
 
 		$actual = $this->principalBackend->findByUri('foobar:blub', $this->principalPrefix);
 		$this->assertEquals(null, $actual);
diff --git a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
index b1da96f4c03..0d48392686a 100644
--- a/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php
@@ -78,9 +78,9 @@ class IMipPluginTest extends TestCase {
 
 		$l10n = $this->createMock(IL10N::class);
 		$l10n->method('t')
-			->will($this->returnCallback(function($text, $parameters = []) {
+			->willReturnCallback(function($text, $parameters = []) {
 				return vsprintf($text, $parameters);
-			}));
+			});
 		$l10nFactory = $this->createMock(IFactory::class);
 		$l10nFactory->method('get')->willReturn($l10n);
 
@@ -90,16 +90,16 @@ class IMipPluginTest extends TestCase {
 		$db = $this->createMock(IDBConnection::class);
 		$db->method('getQueryBuilder')
 			->with()
-			->will($this->returnValue($this->queryBuilder));
+			->willReturn($this->queryBuilder);
 
 		$random = $this->createMock(ISecureRandom::class);
 		$random->method('generate')
 			->with(60, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789')
-			->will($this->returnValue('random_token'));
+			->willReturn('random_token');
 
 		$defaults = $this->createMock(Defaults::class);
 		$defaults->method('getName')
-			->will($this->returnValue('Instance Name 123'));
+			->willReturn('Instance Name 123');
 
 		$this->plugin = new IMipPlugin($this->config, $this->mailer, $logger, $this->timeFactory, $l10nFactory, $urlGenerator, $defaults, $random, $db, $this->userManager, 'user123');
 	}
@@ -269,10 +269,10 @@ class IMipPluginTest extends TestCase {
 			$this->queryBuilder->expects($this->at(0))
 				->method('insert')
 				->with('calendar_invitations')
-				->will($this->returnValue($this->queryBuilder));
+				->willReturn($this->queryBuilder);
 			$this->queryBuilder->expects($this->at(8))
 				->method('values')
-				->will($this->returnValue($this->queryBuilder));
+				->willReturn($this->queryBuilder);
 			$this->queryBuilder->expects($this->at(9))
 				->method('execute');
 		}
diff --git a/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php b/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php
index 91782531c17..a5662519a75 100644
--- a/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/Search/SearchPluginTest.php
@@ -88,15 +88,15 @@ class SearchPluginTest extends TestCase {
 		$this->server->expects($this->at(0))
 			->method('getRequestUri')
 			->with()
-			->will($this->returnValue('/re/quest/u/r/i'));
+			->willReturn('/re/quest/u/r/i');
 		$this->server->tree->expects($this->at(0))
 			->method('getNodeForPath')
 			->with('/re/quest/u/r/i')
-			->will($this->returnValue($calendarHome));
+			->willReturn($calendarHome);
 		$this->server->expects($this->at(1))
 			->method('getHTTPDepth')
 			->with(2)
-			->will($this->returnValue(2));
+			->willReturn(2);
 		$this->server
 			->method('getHTTPPrefer')
 			->willReturn([
@@ -104,7 +104,7 @@ class SearchPluginTest extends TestCase {
 			]);
 		$calendarHome->expects($this->at(0))
 			->method('calendarSearch')
-			->will($this->returnValue([]));
+			->willReturn([]);
 
 		$this->plugin->report('{http://nextcloud.com/ns}calendar-search', $report, '');
 	}
@@ -113,7 +113,7 @@ class SearchPluginTest extends TestCase {
 		$this->server->tree->expects($this->once())
 			->method('getNodeForPath')
 			->with('/foo/bar')
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$reports = $this->plugin->getSupportedReportSet('/foo/bar');
 		$this->assertEquals([], $reports);
@@ -125,7 +125,7 @@ class SearchPluginTest extends TestCase {
 		$this->server->tree->expects($this->once())
 			->method('getNodeForPath')
 			->with('/bar/foo')
-			->will($this->returnValue($calendarHome));
+			->willReturn($calendarHome);
 
 		$reports = $this->plugin->getSupportedReportSet('/bar/foo');
 		$this->assertEquals([
diff --git a/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php b/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php
index 410b233add9..2002bccbd3e 100644
--- a/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php
+++ b/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php
@@ -33,12 +33,12 @@ class PluginTest extends \Test\TestCase {
 		$request->expects($this->at(0))
 			->method('isUserAgent')
 			->with([])
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$request->expects($this->at(1))
 			->method('getHeader')
 			->with('X-NC-CalDAV-Webcal-Caching')
-			->will($this->returnValue(''));
+			->willReturn('');
 
 		$plugin = new Plugin($request);
 
@@ -50,12 +50,12 @@ class PluginTest extends \Test\TestCase {
 		$request->expects($this->at(0))
 			->method('isUserAgent')
 			->with([])
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$request->expects($this->at(1))
 			->method('getHeader')
 			->with('X-NC-CalDAV-Webcal-Caching')
-			->will($this->returnValue('On'));
+			->willReturn('On');
 
 		$plugin = new Plugin($request);
 
diff --git a/apps/dav/tests/unit/CalDAV/WebcalCaching/RefreshWebcalServiceTest.php b/apps/dav/tests/unit/CalDAV/WebcalCaching/RefreshWebcalServiceTest.php
index b1d341c2e4e..04f2a3cceab 100644
--- a/apps/dav/tests/unit/CalDAV/WebcalCaching/RefreshWebcalServiceTest.php
+++ b/apps/dav/tests/unit/CalDAV/WebcalCaching/RefreshWebcalServiceTest.php
@@ -81,7 +81,7 @@ class RefreshWebcalServiceTest extends TestCase {
 		$this->caldavBackend->expects($this->once())
 			->method('getSubscriptionsForUser')
 			->with('principals/users/testuser')
-			->will($this->returnValue([
+			->willReturn([
 				[
 					'id' => '99',
 					'uri' => 'sub456',
@@ -100,35 +100,35 @@ class RefreshWebcalServiceTest extends TestCase {
 					'{http://calendarserver.org/ns/}subscribed-strip-attachments' => '1',
 					'source' => 'webcal://foo.bar/bla2'
 				],
-			]));
+			]);
 
 		$client = $this->createMock(IClient::class);
 		$response = $this->createMock(IResponse::class);
 		$this->clientService->expects($this->once())
 			->method('newClient')
 			->with()
-			->will($this->returnValue($client));
+			->willReturn($client);
 
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'webcalAllowLocalAccess', 'no')
-			->will($this->returnValue('no'));
+			->willReturn('no');
 
 		$client->expects($this->once())
 			->method('get')
 			->with('https://foo.bar/bla2', $this->callback(function($obj) {
 				return $obj['allow_redirects']['redirects'] === 10 && $obj['handler'] instanceof HandlerStack;
 			}))
-			->will($this->returnValue($response));
+			->willReturn($response);
 
 		$response->expects($this->once())
 			->method('getBody')
 			->with()
-			->will($this->returnValue($body));
+			->willReturn($body);
 		$response->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue($contentType));
+			->willReturn($contentType);
 
 		$this->caldavBackend->expects($this->once())
 			->method('purgeAllCachedEventsForSubscription')
@@ -176,7 +176,7 @@ class RefreshWebcalServiceTest extends TestCase {
 		$this->caldavBackend->expects($this->once())
 			->method('getSubscriptionsForUser')
 			->with('principals/users/testuser')
-			->will($this->returnValue([
+			->willReturn([
 				[
 					'id' => 42,
 					'uri' => 'sub123',
@@ -186,18 +186,18 @@ class RefreshWebcalServiceTest extends TestCase {
 					'stripattachments' => 1,
 					'source' => $source
 				],
-			]));
+			]);
 
 		$client = $this->createMock(IClient::class);
 		$this->clientService->expects($this->once())
 			->method('newClient')
 			->with()
-			->will($this->returnValue($client));
+			->willReturn($client);
 
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'webcalAllowLocalAccess', 'no')
-			->will($this->returnValue('no'));
+			->willReturn('no');
 
 		$client->expects($this->never())
 			->method('get');
diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
index 9962cf4ca06..e38bd1810a8 100644
--- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
+++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
@@ -110,7 +110,7 @@ class BirthdayServiceTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('no'));
+			->willReturn('no');
 
 		$this->cardDav->expects($this->never())->method('getAddressBookById');
 
@@ -121,12 +121,12 @@ class BirthdayServiceTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->config->expects($this->once())
 			->method('getUserValue')
 			->with('user01', 'dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('no'));
+			->willReturn('no');
 
 		$this->cardDav->expects($this->once())->method('getAddressBookById')
 			->with(666)
@@ -145,12 +145,12 @@ class BirthdayServiceTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->config->expects($this->once())
 			->method('getUserValue')
 			->with('user01', 'dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->cardDav->expects($this->once())->method('getAddressBookById')
 			->with(666)
@@ -175,7 +175,7 @@ class BirthdayServiceTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('no'));
+			->willReturn('no');
 
 		$this->cardDav->expects($this->never())->method('getAddressBookById');
 
@@ -191,12 +191,12 @@ class BirthdayServiceTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->config->expects($this->once())
 			->method('getUserValue')
 			->with('user01', 'dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('no'));
+			->willReturn('no');
 
 		$this->cardDav->expects($this->once())->method('getAddressBookById')
 			->with(666)
@@ -223,12 +223,12 @@ class BirthdayServiceTest extends TestCase {
 		$this->config->expects($this->once())
 			->method('getAppValue')
 			->with('dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->config->expects($this->once())
 			->method('getUserValue')
 			->with('user01', 'dav', 'generateBirthdayCalendar', 'yes')
-			->will($this->returnValue('yes'));
+			->willReturn('yes');
 
 		$this->cardDav->expects($this->once())->method('getAddressBookById')
 			->with(666)
diff --git a/apps/dav/tests/unit/Comments/CommentsNodeTest.php b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
index 1c0551671f8..9d0e56041d0 100644
--- a/apps/dav/tests/unit/Comments/CommentsNodeTest.php
+++ b/apps/dav/tests/unit/Comments/CommentsNodeTest.php
@@ -82,23 +82,23 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->comment->expects($this->once())
 			->method('getId')
-			->will($this->returnValue('19'));
+			->willReturn('19');
 
 		$this->comment->expects($this->any())
 			->method('getActorType')
-			->will($this->returnValue('users'));
+			->willReturn('users');
 
 		$this->comment->expects($this->any())
 			->method('getActorId')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->commentsManager->expects($this->once())
 			->method('delete')
@@ -117,22 +117,22 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('mallory'));
+			->willReturn('mallory');
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->comment->expects($this->never())
 			->method('getId');
 
 		$this->comment->expects($this->any())
 			->method('getActorType')
-			->will($this->returnValue('users'));
+			->willReturn('users');
 
 		$this->comment->expects($this->any())
 			->method('getActorId')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->commentsManager->expects($this->never())
 			->method('delete');
@@ -144,7 +144,7 @@ class CommentsNodeTest extends \Test\TestCase {
 		$id = '19';
 		$this->comment->expects($this->once())
 			->method('getId')
-			->will($this->returnValue($id));
+			->willReturn($id);
 
 		$this->assertSame($this->node->getName(), $id);
 	}
@@ -169,11 +169,11 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->comment->expects($this->once())
 			->method('setMessage')
@@ -181,11 +181,11 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$this->comment->expects($this->any())
 			->method('getActorType')
-			->will($this->returnValue('users'));
+			->willReturn('users');
 
 		$this->comment->expects($this->any())
 			->method('getActorId')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->commentsManager->expects($this->once())
 			->method('save')
@@ -207,11 +207,11 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->comment->expects($this->once())
 			->method('setMessage')
@@ -220,11 +220,11 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$this->comment->expects($this->any())
 			->method('getActorType')
-			->will($this->returnValue('users'));
+			->willReturn('users');
 
 		$this->comment->expects($this->any())
 			->method('getActorId')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->commentsManager->expects($this->never())
 			->method('save');
@@ -246,11 +246,11 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->comment->expects($this->once())
 			->method('setMessage')
@@ -258,11 +258,11 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$this->comment->expects($this->any())
 			->method('getActorType')
-			->will($this->returnValue('users'));
+			->willReturn('users');
 
 		$this->comment->expects($this->any())
 			->method('getActorId')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->commentsManager->expects($this->never())
 			->method('save');
@@ -286,22 +286,22 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('mallory'));
+			->willReturn('mallory');
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->comment->expects($this->never())
 			->method('setMessage');
 
 		$this->comment->expects($this->any())
 			->method('getActorType')
-			->will($this->returnValue('users'));
+			->willReturn('users');
 
 		$this->comment->expects($this->any())
 			->method('getActorId')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->commentsManager->expects($this->never())
 			->method('save');
@@ -324,14 +324,14 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->comment->expects($this->never())
 			->method('setMessage');
 
 		$this->comment->expects($this->any())
 			->method('getActorType')
-			->will($this->returnValue('bots'));
+			->willReturn('bots');
 
 		$this->commentsManager->expects($this->never())
 			->method('save');
@@ -347,14 +347,14 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$this->comment->expects($this->never())
 			->method('setMessage');
 
 		$this->comment->expects($this->any())
 			->method('getActorType')
-			->will($this->returnValue('users'));
+			->willReturn('users');
 
 		$this->commentsManager->expects($this->never())
 			->method('save');
@@ -415,23 +415,23 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$this->comment->expects($this->once())
 			->method('getId')
-			->will($this->returnValue($expected[$ns . 'id']));
+			->willReturn($expected[$ns . 'id']);
 
 		$this->comment->expects($this->once())
 			->method('getParentId')
-			->will($this->returnValue($expected[$ns . 'parentId']));
+			->willReturn($expected[$ns . 'parentId']);
 
 		$this->comment->expects($this->once())
 			->method('getTopmostParentId')
-			->will($this->returnValue($expected[$ns . 'topmostParentId']));
+			->willReturn($expected[$ns . 'topmostParentId']);
 
 		$this->comment->expects($this->once())
 			->method('getChildrenCount')
-			->will($this->returnValue($expected[$ns . 'childrenCount']));
+			->willReturn($expected[$ns . 'childrenCount']);
 
 		$this->comment->expects($this->once())
 			->method('getMessage')
-			->will($this->returnValue($expected[$ns . 'message']));
+			->willReturn($expected[$ns . 'message']);
 
 		$this->comment->expects($this->once())
 			->method('getMentions')
@@ -442,43 +442,43 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$this->comment->expects($this->once())
 			->method('getVerb')
-			->will($this->returnValue($expected[$ns . 'verb']));
+			->willReturn($expected[$ns . 'verb']);
 
 		$this->comment->expects($this->exactly(2))
 			->method('getActorType')
-			->will($this->returnValue($expected[$ns . 'actorType']));
+			->willReturn($expected[$ns . 'actorType']);
 
 		$this->comment->expects($this->exactly(2))
 			->method('getActorId')
-			->will($this->returnValue($expected[$ns . 'actorId']));
+			->willReturn($expected[$ns . 'actorId']);
 
 		$this->comment->expects($this->once())
 			->method('getCreationDateTime')
-			->will($this->returnValue($expected[$ns . 'creationDateTime']));
+			->willReturn($expected[$ns . 'creationDateTime']);
 
 		$this->comment->expects($this->once())
 			->method('getLatestChildDateTime')
-			->will($this->returnValue($expected[$ns . 'latestChildDateTime']));
+			->willReturn($expected[$ns . 'latestChildDateTime']);
 
 		$this->comment->expects($this->once())
 			->method('getObjectType')
-			->will($this->returnValue($expected[$ns . 'objectType']));
+			->willReturn($expected[$ns . 'objectType']);
 
 		$this->comment->expects($this->once())
 			->method('getObjectId')
-			->will($this->returnValue($expected[$ns . 'objectId']));
+			->willReturn($expected[$ns . 'objectId']);
 
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->once())
 			->method('getDisplayName')
-			->will($this->returnValue($expected[$ns . 'actorDisplayName']));
+			->willReturn($expected[$ns . 'actorDisplayName']);
 
 		$this->userManager->expects($this->once())
 			->method('get')
 			->with('alice')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$properties = $this->node->getProperties(null);
 
@@ -509,7 +509,7 @@ class CommentsNodeTest extends \Test\TestCase {
 	public function testGetPropertiesUnreadProperty($creationDT, $readDT, $expected) {
 		$this->comment->expects($this->any())
 			->method('getCreationDateTime')
-			->will($this->returnValue($creationDT));
+			->willReturn($creationDT);
 
 		$this->comment->expects($this->any())
 			->method('getMentions')
@@ -517,15 +517,15 @@ class CommentsNodeTest extends \Test\TestCase {
 
 		$this->commentsManager->expects($this->once())
 			->method('getReadMark')
-			->will($this->returnValue($readDT));
+			->willReturn($readDT);
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue(
+			->willReturn(
 				$this->getMockBuilder(IUser::class)
 					->disableOriginalConstructor()
 					->getMock()
-			));
+			);
 
 		$properties = $this->node->getProperties(null);
 
diff --git a/apps/dav/tests/unit/Comments/CommentsPluginTest.php b/apps/dav/tests/unit/Comments/CommentsPluginTest.php
index 0ffcf145d81..4929eac3ecc 100644
--- a/apps/dav/tests/unit/Comments/CommentsPluginTest.php
+++ b/apps/dav/tests/unit/Comments/CommentsPluginTest.php
@@ -99,17 +99,17 @@ class CommentsPluginTest extends \Test\TestCase {
 			->getMock();
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$node = $this->getMockBuilder(EntityCollection::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('files'));
+			->willReturn('files');
 		$node->expects($this->once())
 			->method('getId')
-			->will($this->returnValue('42'));
+			->willReturn('42');
 
 		$node->expects($this->once())
 			->method('setReadMarker')
@@ -118,11 +118,11 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->commentsManager->expects($this->once())
 			->method('create')
 			->with('users', 'alice', 'files', '42')
-			->will($this->returnValue($comment));
+			->willReturn($comment);
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		// technically, this is a shortcut. Inbetween EntityTypeCollection would
 		// be returned, but doing it exactly right would not be really
@@ -131,7 +131,7 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
@@ -143,20 +143,20 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/' . $path));
+			->willReturn('/' . $path);
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/json'));
+			->willReturn('application/json');
 
 		$request->expects($this->once())
 			->method('getUrl')
-			->will($this->returnValue('http://example.com/dav/' . $path));
+			->willReturn('http://example.com/dav/' . $path);
 
 		$response->expects($this->once())
 			->method('setHeader')
@@ -164,7 +164,7 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->plugin->httpPost($request, $response);
@@ -229,7 +229,7 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/' . $path));
+			->willReturn('/' . $path);
 
 		$request->expects($this->never())
 			->method('getBodyAsString');
@@ -246,7 +246,7 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->plugin->httpPost($request, $response);
@@ -285,10 +285,10 @@ class CommentsPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('files'));
+			->willReturn('files');
 		$node->expects($this->once())
 			->method('getId')
-			->will($this->returnValue('42'));
+			->willReturn('42');
 
 		$this->commentsManager->expects($this->never())
 			->method('create');
@@ -303,7 +303,7 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
@@ -315,16 +315,16 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/' . $path));
+			->willReturn('/' . $path);
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/json'));
+			->willReturn('application/json');
 
 		$request->expects($this->never())
 			->method('getUrl');
@@ -334,7 +334,7 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->plugin->httpPost($request, $response);
@@ -373,10 +373,10 @@ class CommentsPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('files'));
+			->willReturn('files');
 		$node->expects($this->once())
 			->method('getId')
-			->will($this->returnValue('42'));
+			->willReturn('42');
 
 		$this->commentsManager->expects($this->never())
 			->method('create');
@@ -391,7 +391,7 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
@@ -403,16 +403,16 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/' . $path));
+			->willReturn('/' . $path);
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/trumpscript'));
+			->willReturn('application/trumpscript');
 
 		$request->expects($this->never())
 			->method('getUrl');
@@ -422,7 +422,7 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->plugin->httpPost($request, $response);
@@ -457,26 +457,26 @@ class CommentsPluginTest extends \Test\TestCase {
 			->getMock();
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$node = $this->getMockBuilder(EntityCollection::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('files'));
+			->willReturn('files');
 		$node->expects($this->once())
 			->method('getId')
-			->will($this->returnValue('42'));
+			->willReturn('42');
 
 		$this->commentsManager->expects($this->once())
 			->method('create')
 			->with('users', 'alice', 'files', '42')
-			->will($this->returnValue($comment));
+			->willReturn($comment);
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		// technically, this is a shortcut. Inbetween EntityTypeCollection would
 		// be returned, but doing it exactly right would not be really
@@ -485,7 +485,7 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
@@ -497,16 +497,16 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/' . $path));
+			->willReturn('/' . $path);
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/json'));
+			->willReturn('application/json');
 
 		$request->expects($this->never())
 			->method('getUrl');
@@ -516,7 +516,7 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->plugin->httpPost($request, $response);
@@ -551,17 +551,17 @@ class CommentsPluginTest extends \Test\TestCase {
 			->getMock();
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$node = $this->getMockBuilder(EntityCollection::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('files'));
+			->willReturn('files');
 		$node->expects($this->once())
 			->method('getId')
-			->will($this->returnValue('42'));
+			->willReturn('42');
 
 		$node->expects($this->never())
 			->method('setReadMarker');
@@ -569,11 +569,11 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->commentsManager->expects($this->once())
 			->method('create')
 			->with('users', 'alice', 'files', '42')
-			->will($this->returnValue($comment));
+			->willReturn($comment);
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		// technically, this is a shortcut. Inbetween EntityTypeCollection would
 		// be returned, but doing it exactly right would not be really
@@ -582,7 +582,7 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
@@ -594,23 +594,23 @@ class CommentsPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/' . $path));
+			->willReturn('/' . $path);
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/json'));
+			->willReturn('application/json');
 
 		$response->expects($this->never())
 			->method('setHeader');
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->plugin->httpPost($request, $response);
@@ -625,15 +625,15 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue(
+			->willReturn(
 				$this->getMockBuilder(INode::class)
 					->disableOriginalConstructor()
 					->getMock()
-			));
+			);
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->plugin->onReport(CommentsPluginImplementation::REPORT_NAME, [], '/' . $path);
@@ -648,15 +648,15 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue(
+			->willReturn(
 				$this->getMockBuilder(INode::class)
 					->disableOriginalConstructor()
 					->getMock()
-			));
+			);
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->plugin->onReport('{whoever}whatever', [], '/' . $path);
@@ -686,7 +686,7 @@ class CommentsPluginTest extends \Test\TestCase {
 		$node->expects($this->once())
 			->method('findChildren')
 			->with(5, 10, null)
-			->will($this->returnValue([]));
+			->willReturn([]);
 
 		$response = $this->getMockBuilder(ResponseInterface::class)
 			->disableOriginalConstructor()
@@ -706,11 +706,11 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->server->httpResponse = $response;
 		$this->plugin->initialize($this->server);
 
@@ -741,7 +741,7 @@ class CommentsPluginTest extends \Test\TestCase {
 		$node->expects($this->once())
 			->method('findChildren')
 			->with(5, 10, new \DateTime($parameters[2]['value']))
-			->will($this->returnValue([]));
+			->willReturn([]);
 
 		$response = $this->getMockBuilder(ResponseInterface::class)
 			->disableOriginalConstructor()
@@ -761,11 +761,11 @@ class CommentsPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->server->httpResponse = $response;
 		$this->plugin->initialize($this->server);
 
diff --git a/apps/dav/tests/unit/Comments/EntityCollectionTest.php b/apps/dav/tests/unit/Comments/EntityCollectionTest.php
index a11d22b956a..50f7a42d222 100644
--- a/apps/dav/tests/unit/Comments/EntityCollectionTest.php
+++ b/apps/dav/tests/unit/Comments/EntityCollectionTest.php
@@ -79,11 +79,11 @@ class EntityCollectionTest extends \Test\TestCase {
 		$this->commentsManager->expects($this->once())
 			->method('get')
 			->with('55')
-			->will($this->returnValue(
+			->willReturn(
 				$this->getMockBuilder(IComment::class)
 					->disableOriginalConstructor()
 					->getMock()
-			));
+			);
 
 		$node = $this->collection->getChild('55');
 		$this->assertTrue($node instanceof \OCA\DAV\Comments\CommentNode);
@@ -105,11 +105,11 @@ class EntityCollectionTest extends \Test\TestCase {
 		$this->commentsManager->expects($this->once())
 			->method('getForObject')
 			->with('files', '19')
-			->will($this->returnValue([
+			->willReturn([
 				$this->getMockBuilder(IComment::class)
 					->disableOriginalConstructor()
 					->getMock()
-			]));
+			]);
 
 		$result = $this->collection->getChildren();
 
@@ -122,11 +122,11 @@ class EntityCollectionTest extends \Test\TestCase {
 		$this->commentsManager->expects($this->once())
 			->method('getForObject')
 			->with('files', '19', 5, 15, $dt)
-			->will($this->returnValue([
+			->willReturn([
 				$this->getMockBuilder(IComment::class)
 					->disableOriginalConstructor()
 					->getMock()
-			]));
+			]);
 
 		$result = $this->collection->findChildren(5, 15, $dt);
 
diff --git a/apps/dav/tests/unit/Comments/RootCollectionTest.php b/apps/dav/tests/unit/Comments/RootCollectionTest.php
index c228aab9e20..1a7a3fb128e 100644
--- a/apps/dav/tests/unit/Comments/RootCollectionTest.php
+++ b/apps/dav/tests/unit/Comments/RootCollectionTest.php
@@ -93,11 +93,11 @@ class RootCollectionTest extends \Test\TestCase {
 	protected function prepareForInitCollections() {
 		$this->user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('alice'));
+			->willReturn('alice');
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($this->user));
+			->willReturn($this->user);
 
 		$this->dispatcher->addListener(CommentsEntityEvent::EVENT_ENTITY, function(CommentsEntityEvent $event) {
 			$event->addEntityCollection('files', function() {
diff --git a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
index b110066aee1..9fca779d58a 100644
--- a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
@@ -89,7 +89,7 @@ class AuthTest extends TestCase {
 			->expects($this->once())
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$this->assertFalse($this->invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
 	}
@@ -99,7 +99,7 @@ class AuthTest extends TestCase {
 			->expects($this->exactly(2))
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue('AnotherUser'));
+			->willReturn('AnotherUser');
 
 		$this->assertFalse($this->invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
 	}
@@ -109,7 +109,7 @@ class AuthTest extends TestCase {
 			->expects($this->exactly(2))
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue('MyTestUser'));
+			->willReturn('MyTestUser');
 
 		$this->assertTrue($this->invokePrivate($this->auth, 'isDavAuthenticated', ['MyTestUser']));
 	}
@@ -120,20 +120,20 @@ class AuthTest extends TestCase {
 			->getMock();
 		$user->expects($this->exactly(2))
 			->method('getUID')
-			->will($this->returnValue('MyTestUser'));
+			->willReturn('MyTestUser');
 		$this->userSession
 			->expects($this->once())
 			->method('isLoggedIn')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->userSession
 			->expects($this->exactly(2))
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->session
 			->expects($this->exactly(2))
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue('MyTestUser'));
+			->willReturn('MyTestUser');
 		$this->session
 			->expects($this->once())
 			->method('close');
@@ -147,20 +147,20 @@ class AuthTest extends TestCase {
 			->getMock();
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('MyTestUser'));
+			->willReturn('MyTestUser');
 		$this->userSession
 			->expects($this->once())
 			->method('isLoggedIn')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->userSession
 			->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->session
 			->expects($this->exactly(2))
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue('AnotherUser'));
+			->willReturn('AnotherUser');
 		$this->session
 			->expects($this->once())
 			->method('close');
@@ -174,25 +174,25 @@ class AuthTest extends TestCase {
 			->getMock();
 		$user->expects($this->exactly(3))
 			->method('getUID')
-			->will($this->returnValue('MyTestUser'));
+			->willReturn('MyTestUser');
 		$this->userSession
 			->expects($this->once())
 			->method('isLoggedIn')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->userSession
 			->expects($this->exactly(3))
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->session
 			->expects($this->exactly(2))
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue('AnotherUser'));
+			->willReturn('AnotherUser');
 		$this->userSession
 			->expects($this->once())
 			->method('logClientIn')
 			->with('MyTestUser', 'MyTestPassword', $this->request)
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->session
 			->expects($this->once())
 			->method('set')
@@ -208,12 +208,12 @@ class AuthTest extends TestCase {
 		$this->userSession
 			->expects($this->once())
 			->method('isLoggedIn')
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$this->userSession
 			->expects($this->once())
 			->method('logClientIn')
 			->with('MyTestUser', 'MyTestPassword')
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$this->session
 			->expects($this->once())
 			->method('close');
@@ -228,7 +228,7 @@ class AuthTest extends TestCase {
 		$this->userSession
 			->expects($this->once())
 			->method('isLoggedIn')
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$this->userSession
 			->expects($this->once())
 			->method('logClientIn')
@@ -251,7 +251,7 @@ class AuthTest extends TestCase {
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->request
 			->expects($this->any())
 			->method('getMethod')
@@ -260,17 +260,17 @@ class AuthTest extends TestCase {
 			->expects($this->any())
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue(null));
+			->willReturn(null);
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('MyWrongDavUser'));
+			->willReturn('MyWrongDavUser');
 		$this->userSession
 			->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->request
 			->expects($this->once())
 			->method('passesCSRFCheck')
@@ -312,17 +312,17 @@ class AuthTest extends TestCase {
 			->expects($this->any())
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue('LoggedInUser'));
+			->willReturn('LoggedInUser');
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('LoggedInUser'));
+			->willReturn('LoggedInUser');
 		$this->userSession
 			->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->request
 			->expects($this->once())
 			->method('passesCSRFCheck')
@@ -362,17 +362,17 @@ class AuthTest extends TestCase {
 			->expects($this->any())
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue('LoggedInUser'));
+			->willReturn('LoggedInUser');
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('LoggedInUser'));
+			->willReturn('LoggedInUser');
 		$this->userSession
 			->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->request
 			->expects($this->once())
 			->method('passesCSRFCheck')
@@ -380,7 +380,7 @@ class AuthTest extends TestCase {
 		$this->twoFactorManager->expects($this->once())
 			->method('needsSecondFactor')
 			->with($user)
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->auth->check($request, $response);
 	}
 
@@ -416,17 +416,17 @@ class AuthTest extends TestCase {
 			->expects($this->any())
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue('AnotherUser'));
+			->willReturn('AnotherUser');
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('LoggedInUser'));
+			->willReturn('LoggedInUser');
 		$this->userSession
 			->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->request
 			->expects($this->once())
 			->method('passesCSRFCheck')
@@ -444,7 +444,7 @@ class AuthTest extends TestCase {
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->request
 			->expects($this->any())
 			->method('getMethod')
@@ -462,17 +462,17 @@ class AuthTest extends TestCase {
 			->expects($this->any())
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue(null));
+			->willReturn(null);
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('MyWrongDavUser'));
+			->willReturn('MyWrongDavUser');
 		$this->userSession
 			->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->request
 			->expects($this->once())
 			->method('passesCSRFCheck')
@@ -491,22 +491,22 @@ class AuthTest extends TestCase {
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->session
 			->expects($this->any())
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue(null));
+			->willReturn(null);
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('MyWrongDavUser'));
+			->willReturn('MyWrongDavUser');
 		$this->userSession
 			->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->request
 			->expects($this->any())
 			->method('getMethod')
@@ -526,22 +526,22 @@ class AuthTest extends TestCase {
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->session
 			->expects($this->any())
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue(null));
+			->willReturn(null);
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('MyWrongDavUser'));
+			->willReturn('MyWrongDavUser');
 		$this->userSession
 			->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->request
 			->expects($this->once())
 			->method('passesCSRFCheck')
@@ -581,12 +581,12 @@ class AuthTest extends TestCase {
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$httpRequest
 			->expects($this->once())
 			->method('getHeader')
 			->with('X-Requested-With')
-			->will($this->returnValue('XMLHttpRequest'));
+			->willReturn('XMLHttpRequest');
 		$this->auth->check($httpRequest, $httpResponse);
 	}
 
@@ -607,7 +607,7 @@ class AuthTest extends TestCase {
 		$this->userSession
 			->expects($this->any())
 			->method('isLoggedIn')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->userSession
 			->expects($this->any())
 			->method('getUser')
@@ -616,7 +616,7 @@ class AuthTest extends TestCase {
 			->expects($this->atLeastOnce())
 			->method('get')
 			->with('AUTHENTICATED_TO_DAV_BACKEND')
-			->will($this->returnValue('MyTestUser'));
+			->willReturn('MyTestUser');
 		$this->request
 			->expects($this->once())
 			->method('getMethod')
@@ -625,7 +625,7 @@ class AuthTest extends TestCase {
 			->expects($this->atLeastOnce())
 			->method('getHeader')
 			->with('Authorization')
-			->will($this->returnValue(null));
+			->willReturn(null);
 		$this->assertEquals(
 			[true, 'principals/users/MyTestUser'],
 			$this->auth->check($httpRequest, $httpResponse)
@@ -643,12 +643,12 @@ class AuthTest extends TestCase {
 			->expects($this->at(0))
 			->method('getHeader')
 			->with('X-Requested-With')
-			->will($this->returnValue(null));
+			->willReturn(null);
 		$server->httpRequest
 			->expects($this->at(1))
 			->method('getHeader')
 			->with('Authorization')
-			->will($this->returnValue('basic dXNlcm5hbWU6cGFzc3dvcmQ='));
+			->willReturn('basic dXNlcm5hbWU6cGFzc3dvcmQ=');
 		$server->httpResponse = $this->getMockBuilder(ResponseInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -656,17 +656,17 @@ class AuthTest extends TestCase {
 			->expects($this->once())
 			->method('logClientIn')
 			->with('username', 'password')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->exactly(3))
 			->method('getUID')
-			->will($this->returnValue('MyTestUser'));
+			->willReturn('MyTestUser');
 		$this->userSession
 			->expects($this->exactly(4))
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$response = $this->auth->check($server->httpRequest, $server->httpResponse);
 		$this->assertEquals([true, 'principals/users/MyTestUser'], $response);
 	}
@@ -682,12 +682,12 @@ class AuthTest extends TestCase {
 			->expects($this->at(0))
 			->method('getHeader')
 			->with('X-Requested-With')
-			->will($this->returnValue(null));
+			->willReturn(null);
 		$server->httpRequest
 			->expects($this->at(1))
 			->method('getHeader')
 			->with('Authorization')
-			->will($this->returnValue('basic dXNlcm5hbWU6cGFzc3dvcmQ='));
+			->willReturn('basic dXNlcm5hbWU6cGFzc3dvcmQ=');
 		$server->httpResponse = $this->getMockBuilder(ResponseInterface::class)
 			->disableOriginalConstructor()
 			->getMock();
@@ -695,7 +695,7 @@ class AuthTest extends TestCase {
 			->expects($this->once())
 			->method('logClientIn')
 			->with('username', 'password')
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$response = $this->auth->check($server->httpRequest, $server->httpResponse);
 		$this->assertEquals([false, 'Username or password was incorrect'], $response);
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
index d06c70d7ad1..605b365475f 100644
--- a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
@@ -78,13 +78,13 @@ class BlockLegacyClientPluginTest extends TestCase {
 			->expects($this->once())
 			->method('getHeader')
 			->with('User-Agent')
-			->will($this->returnValue($userAgent));
+			->willReturn($userAgent);
 
 		$this->config
 			->expects($this->once())
 			->method('getSystemValue')
 			->with('minimum.supported.desktop.version', '2.0.0')
-			->will($this->returnValue('1.7.0'));
+			->willReturn('1.7.0');
 
 		$this->blockLegacyClientVersionPlugin->beforeHandler($request);
 	}
@@ -113,13 +113,13 @@ class BlockLegacyClientPluginTest extends TestCase {
 			->expects($this->once())
 			->method('getHeader')
 			->with('User-Agent')
-			->will($this->returnValue($userAgent));
+			->willReturn($userAgent);
 
 		$this->config
 			->expects($this->once())
 			->method('getSystemValue')
 			->with('minimum.supported.desktop.version', '2.0.0')
-			->will($this->returnValue('1.7.0'));
+			->willReturn('1.7.0');
 
 		$this->blockLegacyClientVersionPlugin->beforeHandler($request);
 	}
@@ -131,7 +131,7 @@ class BlockLegacyClientPluginTest extends TestCase {
 			->expects($this->once())
 			->method('getHeader')
 			->with('User-Agent')
-			->will($this->returnValue(null));
+			->willReturn(null);
 		$this->blockLegacyClientVersionPlugin->beforeHandler($request);
 	}
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
index 250ccffcd78..9260acd9492 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
@@ -114,11 +114,11 @@ class CommentsPropertiesPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getId')
-			->will($this->returnValue($fid));
+			->willReturn($fid);
 
 		$this->server->expects($this->once())
 			->method('getBaseUri')
-			->will($this->returnValue($baseUri));
+			->willReturn($baseUri);
 
 		$href = $this->plugin->getCommentsLink($node);
 		$this->assertSame($expectedHref, $href);
@@ -145,15 +145,15 @@ class CommentsPropertiesPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getId')
-			->will($this->returnValue('4567'));
+			->willReturn('4567');
 
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->commentsManager->expects($this->any())
 			->method('getNumberOfCommentsForObject')
-			->will($this->returnValue(42));
+			->willReturn(42);
 
 		$unread = $this->plugin->getUnreadCount($node);
 		if(is_null($user)) {
diff --git a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
index a78d64f9c94..5cd4e69b7f5 100644
--- a/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/CustomPropertiesBackendTest.php
@@ -81,7 +81,7 @@ class CustomPropertiesBackendTest extends \Test\TestCase {
 			->getMock();
 		$this->user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue($userId));
+			->willReturn($userId);
 
 		$this->plugin = new \OCA\DAV\DAV\CustomPropertiesBackend(
 			$this->tree,
@@ -110,11 +110,11 @@ class CustomPropertiesBackendTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(123));
+			->willReturn(123);
 
 		$node->expects($this->any())
 			->method('getPath')
-			->will($this->returnValue('/dummypath'));
+			->willReturn('/dummypath');
 
 		return $node;
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
index 528327a681a..1bf0b533966 100644
--- a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
@@ -89,11 +89,11 @@ class DirectoryTest extends \Test\TestCase {
 	private function getDir($path = '/') {
 		$this->view->expects($this->once())
 			->method('getRelativePath')
-			->will($this->returnValue($path));
+			->willReturn($path);
 
 		$this->info->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue($path));
+			->willReturn($path);
 
 		return new Directory($this->view, $this->info);
 	}
@@ -104,7 +104,7 @@ class DirectoryTest extends \Test\TestCase {
 
 		$this->info->expects($this->any())
 			->method('isDeletable')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->view->expects($this->never())
 			->method('rmdir');
 		$dir = $this->getDir();
@@ -118,7 +118,7 @@ class DirectoryTest extends \Test\TestCase {
 		// deletion allowed
 		$this->info->expects($this->once())
 			->method('isDeletable')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		// but fails
 		$this->view->expects($this->once())
@@ -135,13 +135,13 @@ class DirectoryTest extends \Test\TestCase {
 		// deletion allowed
 		$this->info->expects($this->once())
 			->method('isDeletable')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		// but fails
 		$this->view->expects($this->once())
 			->method('rmdir')
 			->with('sub')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$dir = $this->getDir('sub');
 		$dir->delete();
@@ -153,7 +153,7 @@ class DirectoryTest extends \Test\TestCase {
 
 		$this->info->expects($this->once())
 			->method('isDeletable')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$dir = $this->getDir('sub');
 		$dir->delete();
@@ -166,13 +166,13 @@ class DirectoryTest extends \Test\TestCase {
 		// deletion allowed
 		$this->info->expects($this->once())
 			->method('isDeletable')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		// but fails
 		$this->view->expects($this->once())
 			->method('rmdir')
 			->with('sub')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$dir = $this->getDir('sub');
 		$dir->delete();
@@ -187,25 +187,25 @@ class DirectoryTest extends \Test\TestCase {
 			->getMock();
 		$info1->expects($this->any())
 			->method('getName')
-			->will($this->returnValue('first'));
+			->willReturn('first');
 		$info1->expects($this->any())
 			->method('getEtag')
-			->will($this->returnValue('abc'));
+			->willReturn('abc');
 		$info2->expects($this->any())
 			->method('getName')
-			->will($this->returnValue('second'));
+			->willReturn('second');
 		$info2->expects($this->any())
 			->method('getEtag')
-			->will($this->returnValue('def'));
+			->willReturn('def');
 
 		$this->view->expects($this->once())
 			->method('getDirectoryContent')
 			->with('')
-			->will($this->returnValue(array($info1, $info2)));
+			->willReturn(array($info1, $info2));
 
 		$this->view->expects($this->any())
 			->method('getRelativePath')
-			->will($this->returnValue(''));
+			->willReturn('');
 
 		$dir = new Directory($this->view, $this->info);
 		$nodes = $dir->getChildren();
@@ -224,7 +224,7 @@ class DirectoryTest extends \Test\TestCase {
 		$info = $this->createMock(FileInfo::class);
 		$info->expects($this->any())
 			->method('isReadable')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$dir = new Directory($this->view, $info);
 		$dir->getChildren();
@@ -236,7 +236,7 @@ class DirectoryTest extends \Test\TestCase {
 
 		$this->info->expects($this->any())
 			->method('isReadable')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$dir = new Directory($this->view, $this->info);
 		$dir->getChild('test');
@@ -275,25 +275,25 @@ class DirectoryTest extends \Test\TestCase {
 
 		$storage->expects($this->any())
 			->method('instanceOfStorage')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				'\OCA\Files_Sharing\SharedStorage' => false,
 				'\OC\Files\Storage\Wrapper\Quota' => false,
-			]));
+			]);
 
 		$storage->expects($this->never())
 			->method('getQuota');
 
 		$storage->expects($this->once())
 			->method('free_space')
-			->will($this->returnValue(800));
+			->willReturn(800);
 
 		$this->info->expects($this->once())
 			->method('getSize')
-			->will($this->returnValue(200));
+			->willReturn(200);
 
 		$this->info->expects($this->once())
 			->method('getStorage')
-			->will($this->returnValue($storage));
+			->willReturn($storage);
 
 		$dir = new Directory($this->view, $this->info);
 		$this->assertEquals([200, -3], $dir->getQuotaInfo()); //200 used, unlimited
@@ -306,26 +306,26 @@ class DirectoryTest extends \Test\TestCase {
 
 		$storage->expects($this->any())
 			->method('instanceOfStorage')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				['\OCA\Files_Sharing\SharedStorage', false],
 				['\OC\Files\Storage\Wrapper\Quota', true],
-			]));
+			]);
 
 		$storage->expects($this->once())
 			->method('getQuota')
-			->will($this->returnValue(1000));
+			->willReturn(1000);
 
 		$storage->expects($this->once())
 			->method('free_space')
-			->will($this->returnValue(800));
+			->willReturn(800);
 
 		$this->info->expects($this->once())
 			->method('getSize')
-			->will($this->returnValue(200));
+			->willReturn(200);
 
 		$this->info->expects($this->once())
 			->method('getStorage')
-			->will($this->returnValue($storage));
+			->willReturn($storage);
 
 		$dir = new Directory($this->view, $this->info);
 		$this->assertEquals([200, 800], $dir->getQuotaInfo()); //200 used, 800 free
diff --git a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
index 2c9ca1be27f..473c0164d06 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FakeLockerPluginTest.php
@@ -168,7 +168,7 @@ class FakeLockerPluginTest extends TestCase {
 
 		$request->expects($this->exactly(2))
 			->method('getPath')
-			->will($this->returnValue('MyPath'));
+			->willReturn('MyPath');
 
 		$this->assertSame(false, $this->fakeLockerPlugin->fakeLockProvider($request, $response));
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
index 8842d8be316..96f5a2c385c 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FileTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -182,11 +182,11 @@ class FileTest extends TestCase {
 			->getMock();
 		$view->expects($this->atLeastOnce())
 			->method('resolvePath')
-			->will($this->returnCallback(
+			->willReturnCallback(
 				function ($path) use ($storage) {
 					return [$storage, $path];
 				}
-			));
+			);
 
 		if ($thrownException !== null) {
 			$storage->expects($this->once())
@@ -195,12 +195,12 @@ class FileTest extends TestCase {
 		} else {
 			$storage->expects($this->once())
 				->method('writeStream')
-				->will($this->returnValue(0));
+				->willReturn(0);
 		}
 
 		$view->expects($this->any())
 			->method('getRelativePath')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 
 		$info = new \OC\Files\FileInfo('/test.txt', $this->getMockStorage(), null, array(
 			'permissions' => \OCP\Constants::PERMISSION_ALL
@@ -241,11 +241,11 @@ class FileTest extends TestCase {
 			->getMock();
 		$view->expects($this->atLeastOnce())
 			->method('resolvePath')
-			->will($this->returnCallback(
+			->willReturnCallback(
 				function ($path) use ($storage) {
 					return [$storage, $path];
 				}
-			));
+			);
 
 		if ($thrownException !== null) {
 			$storage->expects($this->once())
@@ -254,12 +254,12 @@ class FileTest extends TestCase {
 		} else {
 			$storage->expects($this->once())
 				->method('fopen')
-				->will($this->returnValue(false));
+				->willReturn(false);
 		}
 
 		$view->expects($this->any())
 			->method('getRelativePath')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 
 		$_SERVER['HTTP_OC_CHUNKED'] = true;
 
@@ -671,14 +671,14 @@ class FileTest extends TestCase {
 		$view->expects($this->any())
 			->method('rename')
 			->withAnyParameters()
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$view->expects($this->any())
 			->method('getRelativePath')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 
 		$view->expects($this->any())
 			->method('filesize')
-			->will($this->returnValue(123456));
+			->willReturn(123456);
 
 		$_SERVER['CONTENT_LENGTH'] = 123456;
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
@@ -788,7 +788,7 @@ class FileTest extends TestCase {
 			->getMock();
 		$view->expects($this->any())
 			->method('getRelativePath')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 
 		$info = new \OC\Files\FileInfo('/*', $this->getMockStorage(), null, array(
 			'permissions' => \OCP\Constants::PERMISSION_ALL
@@ -827,7 +827,7 @@ class FileTest extends TestCase {
 
 		$view->expects($this->any())
 			->method('getRelativePath')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 
 		$info = new \OC\Files\FileInfo('/*', $this->getMockStorage(), null, array(
 			'permissions' => \OCP\Constants::PERMISSION_ALL
@@ -845,13 +845,13 @@ class FileTest extends TestCase {
 		$view->expects($this->any())
 			->method('rename')
 			->withAnyParameters()
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$view->expects($this->any())
 			->method('getRelativePath')
-			->will($this->returnArgument(0));
+			->willReturnArgument(0);
 		$view->expects($this->any())
 			->method('filesize')
-			->will($this->returnValue(123456));
+			->willReturn(123456);
 
 		$_SERVER['CONTENT_LENGTH'] = 12345;
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
@@ -888,7 +888,7 @@ class FileTest extends TestCase {
 
 		$view->expects($this->once())
 			->method('unlink')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$info = new \OC\Files\FileInfo('/test.txt', $this->getMockStorage(), null, array(
 			'permissions' => \OCP\Constants::PERMISSION_ALL
@@ -929,7 +929,7 @@ class FileTest extends TestCase {
 		// but fails
 		$view->expects($this->once())
 			->method('unlink')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$info = new \OC\Files\FileInfo('/test.txt', $this->getMockStorage(), null, array(
 			'permissions' => \OCP\Constants::PERMISSION_ALL
@@ -1016,20 +1016,20 @@ class FileTest extends TestCase {
 		// so only shared lock is acceptable
 		$eventHandler->expects($this->once())
 			->method('writeCallback')
-			->will($this->returnCallback(
+			->willReturnCallback(
 				function () use ($view, $path, &$wasLockedPre) {
 					$wasLockedPre = $this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_SHARED);
 					$wasLockedPre = $wasLockedPre && !$this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE);
 				}
-			));
+			);
 		$eventHandler->expects($this->once())
 			->method('postWriteCallback')
-			->will($this->returnCallback(
+			->willReturnCallback(
 				function () use ($view, $path, &$wasLockedPost) {
 					$wasLockedPost = $this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_SHARED);
 					$wasLockedPost = $wasLockedPost && !$this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE);
 				}
-			));
+			);
 
 		\OCP\Util::connectHook(
 			Filesystem::CLASSNAME,
@@ -1120,7 +1120,7 @@ class FileTest extends TestCase {
 			->getMock();
 		$view->expects($this->atLeastOnce())
 			->method('fopen')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$info = new \OC\Files\FileInfo('/test.txt', $this->getMockStorage(), null, array(
 			'permissions' => \OCP\Constants::PERMISSION_ALL
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
index 35362da177c..d1e863b18ba 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -143,25 +143,25 @@ class FilesPluginTest extends TestCase {
 
 		$node->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(123));
+			->willReturn(123);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with($path)
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$node->expects($this->any())
 			->method('getFileId')
-			->will($this->returnValue('00000123instanceid'));
+			->willReturn('00000123instanceid');
 		$node->expects($this->any())
 			->method('getInternalFileId')
-			->will($this->returnValue('123'));
+			->willReturn('123');
 		$node->expects($this->any())
 			->method('getEtag')
-			->will($this->returnValue('"abc"'));
+			->willReturn('"abc"');
 		$node->expects($this->any())
 			->method('getDavPermissions')
-			->will($this->returnValue('DWCKMSR'));
+			->willReturn('DWCKMSR');
 
 		$fileInfo = $this->createMock(FileInfo::class);
 		$fileInfo->expects($this->any())
@@ -200,18 +200,18 @@ class FilesPluginTest extends TestCase {
 		$user
 			->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('foo'));
+			->willReturn('foo');
 		$user
 			->expects($this->once())
 			->method('getDisplayName')
-			->will($this->returnValue('M. Foo'));
+			->willReturn('M. Foo');
 
 		$node->expects($this->once())
 			->method('getDirectDownload')
-			->will($this->returnValue(array('url' => 'http://example.com/')));
+			->willReturn(array('url' => 'http://example.com/'));
 		$node->expects($this->exactly(2))
 			->method('getOwner')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->plugin->handleGetProperties(
 			$propFind,
@@ -277,7 +277,7 @@ class FilesPluginTest extends TestCase {
 		$node = $this->createTestNode('\OCA\DAV\Connector\Sabre\File');
 		$node->expects($this->any())
 			->method('getDavPermissions')
-			->will($this->returnValue('DWCKMSR'));
+			->willReturn('DWCKMSR');
 
 		$this->plugin->handleGetProperties(
 			$propFind,
@@ -306,7 +306,7 @@ class FilesPluginTest extends TestCase {
 
 		$node->expects($this->once())
 			->method('getSize')
-			->will($this->returnValue(1025));
+			->willReturn(1025);
 
 		$this->plugin->handleGetProperties(
 			$propFind,
@@ -402,7 +402,7 @@ class FilesPluginTest extends TestCase {
 		$node->expects($this->once())
 			->method('setEtag')
 			->with('newetag')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		// properties to set
 		$propPatch = new PropPatch(array(
@@ -553,7 +553,7 @@ class FilesPluginTest extends TestCase {
 		$request
 			->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('test/somefile.xml'));
+			->willReturn('test/somefile.xml');
 
 		$node = $this->getMockBuilder(File::class)
 			->disableOriginalConstructor()
@@ -561,18 +561,18 @@ class FilesPluginTest extends TestCase {
 		$node
 			->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('somefile.xml'));
+			->willReturn('somefile.xml');
 
 		$this->tree
 			->expects($this->once())
 			->method('getNodeForPath')
 			->with('test/somefile.xml')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$this->request
 			->expects($this->once())
 			->method('isUserAgent')
-			->will($this->returnValue($isClumsyAgent));
+			->willReturn($isClumsyAgent);
 
 		$response
 			->expects($this->once())
@@ -596,7 +596,7 @@ class FilesPluginTest extends TestCase {
 
 		$this->previewManager->expects($this->once())
 			->method('isAvailable')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$this->plugin->handleGetProperties(
 			$propFind,
diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
index 14dd87ccb98..2614640ba0b 100644
--- a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
@@ -102,7 +102,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 
 		$this->server->expects($this->any())
 			->method('getBaseUri')
-			->will($this->returnValue('http://example.com/owncloud/remote.php/dav'));
+			->willReturn('http://example.com/owncloud/remote.php/dav');
 
 		$this->groupManager = $this->getMockBuilder(IGroupManager::class)
 			->disableOriginalConstructor()
@@ -128,17 +128,17 @@ class FilesReportPluginTest extends \Test\TestCase {
 		$privateTagManager->expects($this->any())
 			->method('load')
 			->with('files')
-			->will($this->returnValue($this->privateTags));
+			->willReturn($this->privateTags);
 
 		$user = $this->getMockBuilder(IUser::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('testuser'));
+			->willReturn('testuser');
 		$this->userSession->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 
 		$this->plugin = new FilesReportPluginImplementation(
 			$this->tree,
@@ -159,15 +159,15 @@ class FilesReportPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue(
+			->willReturn(
 				$this->getMockBuilder(INode::class)
 					->disableOriginalConstructor()
 					->getMock()
-			));
+			);
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->assertNull($this->plugin->onReport(FilesReportPluginImplementation::REPORT_NAME, [], '/' . $path));
@@ -179,15 +179,15 @@ class FilesReportPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue(
+			->willReturn(
 				$this->getMockBuilder(INode::class)
 					->disableOriginalConstructor()
 					->getMock()
-			));
+			);
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->plugin->initialize($this->server);
 
 		$this->assertNull($this->plugin->onReport('{whoever}whatever', [], '/' . $path));
@@ -215,16 +215,16 @@ class FilesReportPluginTest extends \Test\TestCase {
 
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagMapper->expects($this->at(0))
 			->method('getObjectIdsForTags')
 			->with('123', 'files')
-			->will($this->returnValue(['111', '222']));
+			->willReturn(['111', '222']);
 		$this->tagMapper->expects($this->at(1))
 			->method('getObjectIdsForTags')
 			->with('456', 'files')
-			->will($this->returnValue(['111', '222', '333']));
+			->willReturn(['111', '222', '333']);
 
 		$reportTargetNode = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
@@ -248,7 +248,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/' . $path)
-			->will($this->returnValue($reportTargetNode));
+			->willReturn($reportTargetNode);
 
 		$filesNode1 = $this->getMockBuilder(Folder::class)
 			->disableOriginalConstructor()
@@ -260,15 +260,15 @@ class FilesReportPluginTest extends \Test\TestCase {
 		$this->userFolder->expects($this->at(0))
 			->method('getById')
 			->with('111')
-			->will($this->returnValue([$filesNode1]));
+			->willReturn([$filesNode1]);
 		$this->userFolder->expects($this->at(1))
 			->method('getById')
 			->with('222')
-			->will($this->returnValue([$filesNode2]));
+			->willReturn([$filesNode2]);
 
 		$this->server->expects($this->any())
 			->method('getRequestUri')
-			->will($this->returnValue($path));
+			->willReturn($path);
 		$this->server->httpResponse = $response;
 		$this->plugin->initialize($this->server);
 
@@ -281,30 +281,30 @@ class FilesReportPluginTest extends \Test\TestCase {
 			->getMock();
 		$filesNode1->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('first node'));
+			->willReturn('first node');
 
 		$filesNode2 = $this->getMockBuilder(File::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$filesNode2->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('second node'));
+			->willReturn('second node');
 
 		$reportTargetNode = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$reportTargetNode->expects($this->any())
 			->method('getPath')
-			->will($this->returnValue('/'));
+			->willReturn('/');
 
 		$this->userFolder->expects($this->at(0))
 			->method('getById')
 			->with('111')
-			->will($this->returnValue([$filesNode1]));
+			->willReturn([$filesNode1]);
 		$this->userFolder->expects($this->at(1))
 			->method('getById')
 			->with('222')
-			->will($this->returnValue([$filesNode2]));
+			->willReturn([$filesNode2]);
 
 		/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit_Framework_MockObject_MockObject $reportTargetNode */
 		$result = $this->plugin->findNodesByFileIds($reportTargetNode, ['111', '222']);
@@ -322,21 +322,21 @@ class FilesReportPluginTest extends \Test\TestCase {
 			->getMock();
 		$filesNode1->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('first node'));
+			->willReturn('first node');
 
 		$filesNode2 = $this->getMockBuilder(File::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$filesNode2->expects($this->once())
 			->method('getName')
-			->will($this->returnValue('second node'));
+			->willReturn('second node');
 
 		$reportTargetNode = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$reportTargetNode->expects($this->any())
 			->method('getPath')
-			->will($this->returnValue('/sub1/sub2'));
+			->willReturn('/sub1/sub2');
 
 
 		$subNode = $this->getMockBuilder(Folder::class)
@@ -346,16 +346,16 @@ class FilesReportPluginTest extends \Test\TestCase {
 		$this->userFolder->expects($this->at(0))
 			->method('get')
 			->with('/sub1/sub2')
-			->will($this->returnValue($subNode));
+			->willReturn($subNode);
 
 		$subNode->expects($this->at(0))
 			->method('getById')
 			->with('111')
-			->will($this->returnValue([$filesNode1]));
+			->willReturn([$filesNode1]);
 		$subNode->expects($this->at(1))
 			->method('getById')
 			->with('222')
-			->will($this->returnValue([$filesNode2]));
+			->willReturn([$filesNode2]);
 
 		/** @var \OCA\DAV\Connector\Sabre\Directory|\PHPUnit_Framework_MockObject_MockObject $reportTargetNode */
 		$result = $this->plugin->findNodesByFileIds($reportTargetNode, ['111', '222']);
@@ -382,20 +382,20 @@ class FilesReportPluginTest extends \Test\TestCase {
 
 		$node1->expects($this->once())
 			->method('getInternalFileId')
-			->will($this->returnValue('111'));
+			->willReturn('111');
 		$node1->expects($this->any())
 			->method('getPath')
-			->will($this->returnValue('/node1'));
+			->willReturn('/node1');
 		$node1->method('getFileInfo')->willReturn($fileInfo);
 		$node2->expects($this->once())
 			->method('getInternalFileId')
-			->will($this->returnValue('222'));
+			->willReturn('222');
 		$node2->expects($this->once())
 			->method('getSize')
-			->will($this->returnValue(1024));
+			->willReturn(1024);
 		$node2->expects($this->any())
 			->method('getPath')
-			->will($this->returnValue('/sub/node2'));
+			->willReturn('/sub/node2');
 		$node2->method('getFileInfo')->willReturn($fileInfo);
 
 		$config = $this->getMockBuilder(IConfig::class)
@@ -440,7 +440,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 	public function testProcessFilterRulesSingle() {
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagMapper->expects($this->exactly(1))
 			->method('getObjectIdsForTags')
@@ -461,7 +461,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 	public function testProcessFilterRulesAndCondition() {
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagMapper->expects($this->exactly(2))
 			->method('getObjectIdsForTags')
@@ -485,7 +485,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 	public function testProcessFilterRulesAndConditionWithOneEmptyResult() {
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagMapper->expects($this->exactly(2))
 			->method('getObjectIdsForTags')
@@ -509,7 +509,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 	public function testProcessFilterRulesAndConditionWithFirstEmptyResult() {
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagMapper->expects($this->exactly(1))
 			->method('getObjectIdsForTags')
@@ -533,7 +533,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 	public function testProcessFilterRulesAndConditionWithEmptyMidResult() {
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagMapper->expects($this->exactly(2))
 			->method('getObjectIdsForTags')
@@ -560,27 +560,27 @@ class FilesReportPluginTest extends \Test\TestCase {
 	public function testProcessFilterRulesInvisibleTagAsAdmin() {
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$tag1 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag1->expects($this->any())
 			->method('getId')
-			->will($this->returnValue('123'));
+			->willReturn('123');
 		$tag1->expects($this->any())
 			->method('isUserVisible')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$tag2 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag2->expects($this->any())
 			->method('getId')
-			->will($this->returnValue('123'));
+			->willReturn('123');
 		$tag2->expects($this->any())
 			->method('isUserVisible')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		// no need to fetch tags to check permissions
 		$this->tagManager->expects($this->never())
@@ -589,11 +589,11 @@ class FilesReportPluginTest extends \Test\TestCase {
 		$this->tagMapper->expects($this->at(0))
 			->method('getObjectIdsForTags')
 			->with('123')
-			->will($this->returnValue(['111', '222']));
+			->willReturn(['111', '222']);
 		$this->tagMapper->expects($this->at(1))
 			->method('getObjectIdsForTags')
 			->with('456')
-			->will($this->returnValue(['222', '333']));
+			->willReturn(['222', '333']);
 
 		$rules = [
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
@@ -609,32 +609,32 @@ class FilesReportPluginTest extends \Test\TestCase {
 
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$tag1 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag1->expects($this->any())
 			->method('getId')
-			->will($this->returnValue('123'));
+			->willReturn('123');
 		$tag1->expects($this->any())
 			->method('isUserVisible')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$tag2 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag2->expects($this->any())
 			->method('getId')
-			->will($this->returnValue('123'));
+			->willReturn('123');
 		$tag2->expects($this->any())
 			->method('isUserVisible')
-			->will($this->returnValue(false)); // invisible
+			->willReturn(false); // invisible
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['123', '456'])
-			->will($this->returnValue([$tag1, $tag2]));
+			->willReturn([$tag1, $tag2]);
 
 		$rules = [
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
@@ -647,41 +647,41 @@ class FilesReportPluginTest extends \Test\TestCase {
 	public function testProcessFilterRulesVisibleTagAsUser() {
 		$this->groupManager->expects($this->any())
 			->method('isAdmin')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$tag1 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag1->expects($this->any())
 			->method('getId')
-			->will($this->returnValue('123'));
+			->willReturn('123');
 		$tag1->expects($this->any())
 			->method('isUserVisible')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$tag2 = $this->getMockBuilder(ISystemTag::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$tag2->expects($this->any())
 			->method('getId')
-			->will($this->returnValue('123'));
+			->willReturn('123');
 		$tag2->expects($this->any())
 			->method('isUserVisible')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['123', '456'])
-			->will($this->returnValue([$tag1, $tag2]));
+			->willReturn([$tag1, $tag2]);
 
 		$this->tagMapper->expects($this->at(0))
 			->method('getObjectIdsForTags')
 			->with('123')
-			->will($this->returnValue(['111', '222']));
+			->willReturn(['111', '222']);
 		$this->tagMapper->expects($this->at(1))
 			->method('getObjectIdsForTags')
 			->with('456')
-			->will($this->returnValue(['222', '333']));
+			->willReturn(['222', '333']);
 
 		$rules = [
 			['name' => '{http://owncloud.org/ns}systemtag', 'value' => '123'],
@@ -698,7 +698,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 
 		$this->privateTags->expects($this->once())
 			->method('getFavorites')
-			->will($this->returnValue(['456', '789']));
+			->willReturn(['456', '789']);
 
 		$this->assertEquals(['456', '789'], array_values($this->invokePrivate($this->plugin, 'processFilterRules', [$rules])));
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
index d3488088676..9564ad0cec3 100644
--- a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
@@ -56,7 +56,7 @@ class MaintenancePluginTest extends TestCase {
 			->expects($this->exactly(1))
 			->method('getSystemValueBool')
 			->with('maintenance')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->maintenancePlugin->checkMaintenanceMode();
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
index f0991d05992..5d71a705362 100644
--- a/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/NodeTest.php
@@ -67,16 +67,16 @@ class NodeTest extends \Test\TestCase {
 			->getMock();
 		$info->expects($this->any())
 			->method('getPermissions')
-			->will($this->returnValue($permissions));
+			->willReturn($permissions);
 		$info->expects($this->any())
 			->method('isShared')
-			->will($this->returnValue($shared));
+			->willReturn($shared);
 		$info->expects($this->any())
 			->method('isMounted')
-			->will($this->returnValue($mounted));
+			->willReturn($mounted);
 		$info->expects($this->any())
 			->method('getType')
-			->will($this->returnValue($type));
+			->willReturn($type);
 		$view = $this->getMockBuilder(View::class)
 			->disableOriginalConstructor()
 			->getMock();
diff --git a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
index 1ccfa2e479e..76ebbe30189 100644
--- a/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/ObjectTreeTest.php
@@ -64,7 +64,7 @@ class ObjectTreeTest extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('verifyPath')
 			->with($targetParent)
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$view->expects($this->once())
 			->method('file_exists')
 			->with($targetPath)
@@ -72,7 +72,7 @@ class ObjectTreeTest extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('copy')
 			->with($sourcePath, $targetPath)
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$info = $this->createMock(FileInfo::class);
 		$info->expects($this->once())
@@ -93,7 +93,7 @@ class ObjectTreeTest extends \Test\TestCase {
 		$objectTree->expects($this->once())
 			->method('getNodeForPath')
 			->with($this->identicalTo($sourcePath))
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		/** @var $objectTree \OCA\DAV\Connector\Sabre\ObjectTree */
 		$mountManager = Filesystem::getMountManager();
@@ -171,17 +171,17 @@ class ObjectTreeTest extends \Test\TestCase {
 			->getMock();
 		$fileInfo->expects($this->once())
 			->method('getType')
-			->will($this->returnValue($type));
+			->willReturn($type);
 		$fileInfo->expects($this->once())
 			->method('getName')
-			->will($this->returnValue($outputFileName));
+			->willReturn($outputFileName);
 		$fileInfo->method('getStorage')
 			->willReturn($this->createMock(\OC\Files\Storage\Common::class));
 
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with($fileInfoQueryPath)
-			->will($this->returnValue($fileInfo));
+			->willReturn($fileInfo);
 
 		$tree = new \OCA\DAV\Connector\Sabre\ObjectTree();
 		$tree->init($rootNode, $view, $mountManager);
@@ -283,9 +283,9 @@ class ObjectTreeTest extends \Test\TestCase {
 			->getMock();
 		$view->expects($this->once())
 			->method('resolvePath')
-			->will($this->returnCallback(function($path) use ($storage){
+			->willReturnCallback(function($path) use ($storage){
 			return [$storage, ltrim($path, '/')];
-		}));
+		});
 
 		$rootNode = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
@@ -310,9 +310,9 @@ class ObjectTreeTest extends \Test\TestCase {
 			->getMock();
 		$view->expects($this->any())
 			->method('resolvePath')
-			->will($this->returnCallback(function ($path) use ($storage) {
+			->willReturnCallback(function ($path) use ($storage) {
 				return [$storage, ltrim($path, '/')];
-			}));
+			});
 
 		$rootNode = $this->getMockBuilder(Directory::class)
 			->disableOriginalConstructor()
diff --git a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
index 99d8ea72bb0..57613c19f64 100644
--- a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
@@ -100,29 +100,29 @@ class PrincipalTest extends TestCase {
 		$fooUser
 				->expects($this->exactly(1))
 				->method('getUID')
-				->will($this->returnValue('foo'));
+				->willReturn('foo');
 		$fooUser
 				->expects($this->exactly(1))
 				->method('getDisplayName')
-				->will($this->returnValue('Dr. Foo-Bar'));
+				->willReturn('Dr. Foo-Bar');
 		$fooUser
 				->expects($this->exactly(1))
 				->method('getEMailAddress')
-				->will($this->returnValue(''));
+				->willReturn('');
 		$barUser = $this->createMock(User::class);
 		$barUser
 			->expects($this->exactly(1))
 			->method('getUID')
-			->will($this->returnValue('bar'));
+			->willReturn('bar');
 		$barUser
 				->expects($this->exactly(1))
 				->method('getEMailAddress')
-				->will($this->returnValue('bar@nextcloud.com'));
+				->willReturn('bar@nextcloud.com');
 		$this->userManager
 			->expects($this->once())
 			->method('search')
 			->with('')
-			->will($this->returnValue([$fooUser, $barUser]));
+			->willReturn([$fooUser, $barUser]);
 
 		$expectedResponse = [
 			0 => [
@@ -146,7 +146,7 @@ class PrincipalTest extends TestCase {
 			->expects($this->once())
 			->method('search')
 			->with('')
-			->will($this->returnValue([]));
+			->willReturn([]);
 
 		$response = $this->connector->getPrincipalsByPrefix('principals/users');
 		$this->assertSame([], $response);
@@ -157,12 +157,12 @@ class PrincipalTest extends TestCase {
 		$fooUser
 			->expects($this->exactly(1))
 			->method('getUID')
-			->will($this->returnValue('foo'));
+			->willReturn('foo');
 		$this->userManager
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue($fooUser));
+			->willReturn($fooUser);
 
 		$expectedResponse = [
 			'uri' => 'principals/users/foo',
@@ -178,16 +178,16 @@ class PrincipalTest extends TestCase {
 		$fooUser
 				->expects($this->exactly(1))
 				->method('getEMailAddress')
-				->will($this->returnValue('foo@nextcloud.com'));
+				->willReturn('foo@nextcloud.com');
 		$fooUser
 				->expects($this->exactly(1))
 				->method('getUID')
-				->will($this->returnValue('foo'));
+				->willReturn('foo');
 		$this->userManager
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue($fooUser));
+			->willReturn($fooUser);
 
 		$expectedResponse = [
 			'uri' => 'principals/users/foo',
@@ -204,7 +204,7 @@ class PrincipalTest extends TestCase {
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$response = $this->connector->getPrincipalByPath('principals/users/foo');
 		$this->assertSame(null, $response);
@@ -224,7 +224,7 @@ class PrincipalTest extends TestCase {
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$this->connector->getGroupMemberSet('principals/users/foo/calendar-proxy-read');
 	}
@@ -234,12 +234,12 @@ class PrincipalTest extends TestCase {
 		$fooUser
 			->expects($this->exactly(1))
 			->method('getUID')
-			->will($this->returnValue('foo'));
+			->willReturn('foo');
 		$this->userManager
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue($fooUser));
+			->willReturn($fooUser);
 
 		$proxy1 = new Proxy();
 		$proxy1->setProxyId('proxyId1');
@@ -266,12 +266,12 @@ class PrincipalTest extends TestCase {
 		$fooUser
 			->expects($this->exactly(1))
 			->method('getUID')
-			->will($this->returnValue('foo'));
+			->willReturn('foo');
 		$this->userManager
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue($fooUser));
+			->willReturn($fooUser);
 
 		$proxy1 = new Proxy();
 		$proxy1->setProxyId('proxyId1');
@@ -349,7 +349,7 @@ class PrincipalTest extends TestCase {
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$this->connector->getGroupMembership('principals/users/foo');
 	}
@@ -367,22 +367,22 @@ class PrincipalTest extends TestCase {
 		$fooUser
 			->expects($this->exactly(1))
 			->method('getUID')
-			->will($this->returnValue('foo'));
+			->willReturn('foo');
 		$barUser = $this->createMock(User::class);
 		$barUser
 			->expects($this->exactly(1))
 			->method('getUID')
-			->will($this->returnValue('bar'));
+			->willReturn('bar');
 		$this->userManager
 			->expects($this->at(0))
 			->method('get')
 			->with('foo')
-			->will($this->returnValue($fooUser));
+			->willReturn($fooUser);
 		$this->userManager
 			->expects($this->at(1))
 			->method('get')
 			->with('bar')
-			->will($this->returnValue($barUser));
+			->willReturn($barUser);
 
 		$this->proxyMapper->expects($this->at(0))
 			->method('getProxiesOf')
@@ -428,7 +428,7 @@ class PrincipalTest extends TestCase {
 	public function testSearchPrincipals($sharingEnabled, $groupsOnly, $test, $result) {
 		$this->shareManager->expects($this->once())
 			->method('shareAPIEnabled')
-			->will($this->returnValue($sharingEnabled));
+			->willReturn($sharingEnabled);
 
 		if ($sharingEnabled) {
 			$this->shareManager->expects($this->once())
@@ -437,18 +437,18 @@ class PrincipalTest extends TestCase {
 
 			$this->shareManager->expects($this->once())
 				->method('shareWithGroupMembersOnly')
-				->will($this->returnValue($groupsOnly));
+				->willReturn($groupsOnly);
 
 			if ($groupsOnly) {
 				$user = $this->createMock(IUser::class);
 				$this->userSession->expects($this->once())
 					->method('getUser')
-					->will($this->returnValue($user));
+					->willReturn($user);
 
 				$this->groupManager->expects($this->at(0))
 					->method('getUserGroupIds')
 					->with($user)
-					->will($this->returnValue(['group1', 'group2', 'group5']));
+					->willReturn(['group1', 'group2', 'group5']);
 			}
 		} else {
 			$this->config->expects($this->never())
@@ -460,22 +460,22 @@ class PrincipalTest extends TestCase {
 		}
 
 		$user2 = $this->createMock(IUser::class);
-		$user2->method('getUID')->will($this->returnValue('user2'));
+		$user2->method('getUID')->willReturn('user2');
 		$user3 = $this->createMock(IUser::class);
-		$user3->method('getUID')->will($this->returnValue('user3'));
+		$user3->method('getUID')->willReturn('user3');
 		$user4 = $this->createMock(IUser::class);
-		$user4->method('getUID')->will($this->returnValue('user4'));
+		$user4->method('getUID')->willReturn('user4');
 
 		if ($sharingEnabled) {
 			$this->userManager->expects($this->at(0))
 				->method('getByEmail')
 				->with('user@example.com')
-				->will($this->returnValue([$user2, $user3]));
+				->willReturn([$user2, $user3]);
 
 			$this->userManager->expects($this->at(1))
 				->method('searchDisplayName')
 				->with('User 12')
-				->will($this->returnValue([$user3, $user4]));
+				->willReturn([$user3, $user4]);
 		} else {
 			$this->userManager->expects($this->never())
 				->method('getByEmail');
@@ -488,19 +488,19 @@ class PrincipalTest extends TestCase {
 			$this->groupManager->expects($this->at(1))
 				->method('getUserGroupIds')
 				->with($user2)
-				->will($this->returnValue(['group1', 'group3']));
+				->willReturn(['group1', 'group3']);
 			$this->groupManager->expects($this->at(2))
 				->method('getUserGroupIds')
 				->with($user3)
-				->will($this->returnValue(['group3', 'group4']));
+				->willReturn(['group3', 'group4']);
 			$this->groupManager->expects($this->at(3))
 				->method('getUserGroupIds')
 				->with($user3)
-				->will($this->returnValue(['group3', 'group4']));
+				->willReturn(['group3', 'group4']);
 			$this->groupManager->expects($this->at(4))
 				->method('getUserGroupIds')
 				->with($user4)
-				->will($this->returnValue(['group4', 'group5']));
+				->willReturn(['group4', 'group5']);
 		}
 
 
@@ -523,7 +523,7 @@ class PrincipalTest extends TestCase {
 	public function testSearchPrincipalByCalendarUserAddressSet() {
 		$this->shareManager->expects($this->exactly(2))
 			->method('shareAPIEnabled')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->shareManager->expects($this->exactly(2))
 			->method('allowEnumeration')
@@ -531,17 +531,17 @@ class PrincipalTest extends TestCase {
 
 		$this->shareManager->expects($this->exactly(2))
 			->method('shareWithGroupMembersOnly')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$user2 = $this->createMock(IUser::class);
-		$user2->method('getUID')->will($this->returnValue('user2'));
+		$user2->method('getUID')->willReturn('user2');
 		$user3 = $this->createMock(IUser::class);
-		$user3->method('getUID')->will($this->returnValue('user3'));
+		$user3->method('getUID')->willReturn('user3');
 
 		$this->userManager->expects($this->at(0))
 			->method('getByEmail')
 			->with('user@example.com')
-			->will($this->returnValue([$user2, $user3]));
+			->willReturn([$user2, $user3]);
 
 		$this->assertEquals([
 				'principals/users/user2',
@@ -553,7 +553,7 @@ class PrincipalTest extends TestCase {
 	public function testSearchPrincipalWithEnumerationDisabledDisplayname() {
 		$this->shareManager->expects($this->once())
 			->method('shareAPIEnabled')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->shareManager->expects($this->once())
 			->method('allowEnumeration')
@@ -561,25 +561,25 @@ class PrincipalTest extends TestCase {
 
 		$this->shareManager->expects($this->once())
 			->method('shareWithGroupMembersOnly')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$user2 = $this->createMock(IUser::class);
-		$user2->method('getUID')->will($this->returnValue('user2'));
-		$user2->method('getDisplayName')->will($this->returnValue('User 2'));
-		$user2->method('getEMailAddress')->will($this->returnValue('user2@foo.bar'));
+		$user2->method('getUID')->willReturn('user2');
+		$user2->method('getDisplayName')->willReturn('User 2');
+		$user2->method('getEMailAddress')->willReturn('user2@foo.bar');
 		$user3 = $this->createMock(IUser::class);
-		$user3->method('getUID')->will($this->returnValue('user3'));
-		$user2->method('getDisplayName')->will($this->returnValue('User 22'));
-		$user2->method('getEMailAddress')->will($this->returnValue('user2@foo.bar123'));
+		$user3->method('getUID')->willReturn('user3');
+		$user2->method('getDisplayName')->willReturn('User 22');
+		$user2->method('getEMailAddress')->willReturn('user2@foo.bar123');
 		$user4 = $this->createMock(IUser::class);
-		$user4->method('getUID')->will($this->returnValue('user4'));
-		$user2->method('getDisplayName')->will($this->returnValue('User 222'));
-		$user2->method('getEMailAddress')->will($this->returnValue('user2@foo.bar456'));
+		$user4->method('getUID')->willReturn('user4');
+		$user2->method('getDisplayName')->willReturn('User 222');
+		$user2->method('getEMailAddress')->willReturn('user2@foo.bar456');
 
 		$this->userManager->expects($this->at(0))
 			->method('searchDisplayName')
 			->with('User 2')
-			->will($this->returnValue([$user2, $user3, $user4]));
+			->willReturn([$user2, $user3, $user4]);
 
 		$this->assertEquals(['principals/users/user2'], $this->connector->searchPrincipals('principals/users',
 			['{DAV:}displayname' => 'User 2']));
@@ -588,7 +588,7 @@ class PrincipalTest extends TestCase {
 	public function testSearchPrincipalWithEnumerationDisabledEmail() {
 		$this->shareManager->expects($this->once())
 			->method('shareAPIEnabled')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->shareManager->expects($this->once())
 			->method('allowEnumeration')
@@ -596,25 +596,25 @@ class PrincipalTest extends TestCase {
 
 		$this->shareManager->expects($this->once())
 			->method('shareWithGroupMembersOnly')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$user2 = $this->createMock(IUser::class);
-		$user2->method('getUID')->will($this->returnValue('user2'));
-		$user2->method('getDisplayName')->will($this->returnValue('User 2'));
-		$user2->method('getEMailAddress')->will($this->returnValue('user2@foo.bar'));
+		$user2->method('getUID')->willReturn('user2');
+		$user2->method('getDisplayName')->willReturn('User 2');
+		$user2->method('getEMailAddress')->willReturn('user2@foo.bar');
 		$user3 = $this->createMock(IUser::class);
-		$user3->method('getUID')->will($this->returnValue('user3'));
-		$user2->method('getDisplayName')->will($this->returnValue('User 22'));
-		$user2->method('getEMailAddress')->will($this->returnValue('user2@foo.bar123'));
+		$user3->method('getUID')->willReturn('user3');
+		$user2->method('getDisplayName')->willReturn('User 22');
+		$user2->method('getEMailAddress')->willReturn('user2@foo.bar123');
 		$user4 = $this->createMock(IUser::class);
-		$user4->method('getUID')->will($this->returnValue('user4'));
-		$user2->method('getDisplayName')->will($this->returnValue('User 222'));
-		$user2->method('getEMailAddress')->will($this->returnValue('user2@foo.bar456'));
+		$user4->method('getUID')->willReturn('user4');
+		$user2->method('getDisplayName')->willReturn('User 222');
+		$user2->method('getEMailAddress')->willReturn('user2@foo.bar456');
 
 		$this->userManager->expects($this->at(0))
 			->method('getByEmail')
 			->with('user2@foo.bar')
-			->will($this->returnValue([$user2, $user3, $user4]));
+			->willReturn([$user2, $user3, $user4]);
 
 		$this->assertEquals(['principals/users/user2'], $this->connector->searchPrincipals('principals/users',
 			['{http://sabredav.org/ns}email-address' => 'user2@foo.bar']));
@@ -623,7 +623,7 @@ class PrincipalTest extends TestCase {
 	public function testSearchPrincipalWithEnumerationLimitedDisplayname() {
 		$this->shareManager->expects($this->at(0))
 			->method('shareAPIEnabled')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->shareManager->expects($this->at(1))
 			->method('allowEnumeration')
@@ -635,20 +635,20 @@ class PrincipalTest extends TestCase {
 
 		$this->shareManager->expects($this->once())
 			->method('shareWithGroupMembersOnly')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$user2 = $this->createMock(IUser::class);
-		$user2->method('getUID')->will($this->returnValue('user2'));
-		$user2->method('getDisplayName')->will($this->returnValue('User 2'));
-		$user2->method('getEMailAddress')->will($this->returnValue('user2@foo.bar'));
+		$user2->method('getUID')->willReturn('user2');
+		$user2->method('getDisplayName')->willReturn('User 2');
+		$user2->method('getEMailAddress')->willReturn('user2@foo.bar');
 		$user3 = $this->createMock(IUser::class);
-		$user3->method('getUID')->will($this->returnValue('user3'));
-		$user3->method('getDisplayName')->will($this->returnValue('User 22'));
-		$user3->method('getEMailAddress')->will($this->returnValue('user2@foo.bar123'));
+		$user3->method('getUID')->willReturn('user3');
+		$user3->method('getDisplayName')->willReturn('User 22');
+		$user3->method('getEMailAddress')->willReturn('user2@foo.bar123');
 		$user4 = $this->createMock(IUser::class);
-		$user4->method('getUID')->will($this->returnValue('user4'));
-		$user4->method('getDisplayName')->will($this->returnValue('User 222'));
-		$user4->method('getEMailAddress')->will($this->returnValue('user2@foo.bar456'));
+		$user4->method('getUID')->willReturn('user4');
+		$user4->method('getDisplayName')->willReturn('User 222');
+		$user4->method('getEMailAddress')->willReturn('user2@foo.bar456');
 
 
 		$this->userSession->expects($this->at(0))
@@ -684,7 +684,7 @@ class PrincipalTest extends TestCase {
 	public function testSearchPrincipalWithEnumerationLimitedMail() {
 		$this->shareManager->expects($this->at(0))
 			->method('shareAPIEnabled')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->shareManager->expects($this->at(1))
 			->method('allowEnumeration')
@@ -696,20 +696,20 @@ class PrincipalTest extends TestCase {
 
 		$this->shareManager->expects($this->once())
 			->method('shareWithGroupMembersOnly')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$user2 = $this->createMock(IUser::class);
-		$user2->method('getUID')->will($this->returnValue('user2'));
-		$user2->method('getDisplayName')->will($this->returnValue('User 2'));
-		$user2->method('getEMailAddress')->will($this->returnValue('user2@foo.bar'));
+		$user2->method('getUID')->willReturn('user2');
+		$user2->method('getDisplayName')->willReturn('User 2');
+		$user2->method('getEMailAddress')->willReturn('user2@foo.bar');
 		$user3 = $this->createMock(IUser::class);
-		$user3->method('getUID')->will($this->returnValue('user3'));
-		$user3->method('getDisplayName')->will($this->returnValue('User 22'));
-		$user3->method('getEMailAddress')->will($this->returnValue('user2@foo.bar123'));
+		$user3->method('getUID')->willReturn('user3');
+		$user3->method('getDisplayName')->willReturn('User 22');
+		$user3->method('getEMailAddress')->willReturn('user2@foo.bar123');
 		$user4 = $this->createMock(IUser::class);
-		$user4->method('getUID')->will($this->returnValue('user4'));
-		$user4->method('getDisplayName')->will($this->returnValue('User 222'));
-		$user4->method('getEMailAddress')->will($this->returnValue('user2@foo.bar456'));
+		$user4->method('getUID')->willReturn('user4');
+		$user4->method('getDisplayName')->willReturn('User 222');
+		$user4->method('getEMailAddress')->willReturn('user2@foo.bar456');
 
 
 		$this->userSession->expects($this->at(0))
@@ -745,7 +745,7 @@ class PrincipalTest extends TestCase {
 	public function testFindByUriSharingApiDisabled() {
 		$this->shareManager->expects($this->once())
 			->method('shareApiEnabled')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$this->assertEquals(null, $this->connector->findByUri('mailto:user@foo.com', 'principals/users'));
 	}
@@ -756,42 +756,42 @@ class PrincipalTest extends TestCase {
 	public function testFindByUriWithGroupRestriction($uri, $email, $expects) {
 		$this->shareManager->expects($this->once())
 			->method('shareApiEnabled')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 			$this->shareManager->expects($this->once())
 				->method('shareWithGroupMembersOnly')
-				->will($this->returnValue(true));
+				->willReturn(true);
 
 			$user = $this->createMock(IUser::class);
 			$this->userSession->expects($this->once())
 				->method('getUser')
-				->will($this->returnValue($user));
+				->willReturn($user);
 
 			$this->groupManager->expects($this->at(0))
 				->method('getUserGroupIds')
 				->with($user)
-				->will($this->returnValue(['group1', 'group2']));
+				->willReturn(['group1', 'group2']);
 
 			$user2 = $this->createMock(IUser::class);
-			$user2->method('getUID')->will($this->returnValue('user2'));
+			$user2->method('getUID')->willReturn('user2');
 			$user3 = $this->createMock(IUser::class);
-			$user3->method('getUID')->will($this->returnValue('user3'));
+			$user3->method('getUID')->willReturn('user3');
 
 			$this->userManager->expects($this->once())
 				->method('getByEmail')
 				->with($email)
-				->will($this->returnValue([$email === 'user2@foo.bar' ? $user2 : $user3]));
+				->willReturn([$email === 'user2@foo.bar' ? $user2 : $user3]);
 
 			if ($email === 'user2@foo.bar') {
 				$this->groupManager->expects($this->at(1))
 					->method('getUserGroupIds')
 					->with($user2)
-					->will($this->returnValue(['group1', 'group3']));
+					->willReturn(['group1', 'group3']);
 			} else {
 				$this->groupManager->expects($this->at(1))
 					->method('getUserGroupIds')
 					->with($user3)
-					->will($this->returnValue(['group3', 'group3']));
+					->willReturn(['group3', 'group3']);
 			}
 
 		$this->assertEquals($expects, $this->connector->findByUri($uri, 'principals/users'));
@@ -810,21 +810,21 @@ class PrincipalTest extends TestCase {
 	public function testFindByUriWithoutGroupRestriction($uri, $email, $expects) {
 		$this->shareManager->expects($this->once())
 			->method('shareApiEnabled')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 			$this->shareManager->expects($this->once())
 				->method('shareWithGroupMembersOnly')
-				->will($this->returnValue(false));
+				->willReturn(false);
 
 			$user2 = $this->createMock(IUser::class);
-			$user2->method('getUID')->will($this->returnValue('user2'));
+			$user2->method('getUID')->willReturn('user2');
 			$user3 = $this->createMock(IUser::class);
-			$user3->method('getUID')->will($this->returnValue('user3'));
+			$user3->method('getUID')->willReturn('user3');
 
 			$this->userManager->expects($this->once())
 				->method('getByEmail')
 				->with($email)
-				->will($this->returnValue([$email === 'user2@foo.bar' ? $user2 : $user3]));
+				->willReturn([$email === 'user2@foo.bar' ? $user2 : $user3]);
 
 		$this->assertEquals($expects, $this->connector->findByUri($uri, 'principals/users'));
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
index 56ad3b36f73..50b3ff1c394 100644
--- a/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
@@ -184,11 +184,11 @@ class QuotaPluginTest extends TestCase {
 			->getMock();
 		$mockChunking->expects($this->once())
 			->method('getCurrentSize')
-			->will($this->returnValue($chunkTotalSize));
+			->willReturn($chunkTotalSize);
 
 		$this->plugin->expects($this->once())
 			->method('getFileChunking')
-			->will($this->returnValue($mockChunking));
+			->willReturn($mockChunking);
 
 		$headers['OC-CHUNKED'] = 1;
 		$this->server->httpRequest = new \Sabre\HTTP\Request(null, null, $headers);
@@ -221,11 +221,11 @@ class QuotaPluginTest extends TestCase {
 			->getMock();
 		$mockChunking->expects($this->once())
 			->method('getCurrentSize')
-			->will($this->returnValue($chunkTotalSize));
+			->willReturn($chunkTotalSize);
 
 		$this->plugin->expects($this->once())
 			->method('getFileChunking')
-			->will($this->returnValue($mockChunking));
+			->willReturn($mockChunking);
 
 		$headers['OC-CHUNKED'] = 1;
 		$this->server->httpRequest = new \Sabre\HTTP\Request(null, null, $headers);
@@ -241,7 +241,7 @@ class QuotaPluginTest extends TestCase {
 		$view->expects($this->any())
 			->method('free_space')
 			->with($this->identicalTo($checkedPath))
-			->will($this->returnValue($quota));
+			->willReturn($quota);
 
 		return $view;
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php
index 3aec6b9088a..9771b3f76b4 100644
--- a/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php
@@ -42,13 +42,13 @@ class PartFileInRootUploadTest extends UploadTest {
 			->getMock();
 		$mockConfig->expects($this->any())
 			->method('getSystemValue')
-			->will($this->returnCallback(function ($key, $default) use ($config) {
+			->willReturnCallback(function ($key, $default) use ($config) {
 				if ($key === 'part_file_in_storage') {
 					return false;
 				} else {
 					return $config->getSystemValue($key, $default);
 				}
-			}));
+			});
 		$this->overwriteService('AllConfig', $mockConfig);
 		parent::setUp();
 	}
diff --git a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
index a71cbb3ab6e..c3566ccc33a 100644
--- a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
@@ -75,11 +75,11 @@ class SharesPluginTest extends \Test\TestCase {
 		$user = $this->createMock(IUser::class);
 		$user->expects($this->once())
 			->method('getUID')
-			->will($this->returnValue('user1'));
+			->willReturn('user1');
 		$userSession = $this->createMock(IUserSession::class);
 		$userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->userFolder = $this->createMock(Folder::class);
 
 		$this->plugin = new \OCA\DAV\Connector\Sabre\SharesPlugin(
@@ -100,10 +100,10 @@ class SharesPluginTest extends \Test\TestCase {
 			->getMock();
 		$sabreNode->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(123));
+			->willReturn(123);
 		$sabreNode->expects($this->any())
 			->method('getPath')
-			->will($this->returnValue('/subdir'));
+			->willReturn('/subdir');
 
 		// node API nodes
 		$node = $this->getMockBuilder(Folder::class)
@@ -113,7 +113,7 @@ class SharesPluginTest extends \Test\TestCase {
 		$this->userFolder->expects($this->once())
 			->method('get')
 			->with('/subdir')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$this->shareManager->expects($this->any())
 			->method('getSharesBy')
@@ -124,7 +124,7 @@ class SharesPluginTest extends \Test\TestCase {
 				$this->equalTo(false),
 				$this->equalTo(-1)
 			)
-			->will($this->returnCallback(function($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes){
+			->willReturnCallback(function($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes){
 				if (in_array($requestedShareType, $shareTypes)) {
 					$share = $this->createMock(IShare::class);
 					$share->method('getShareType')
@@ -132,7 +132,7 @@ class SharesPluginTest extends \Test\TestCase {
 					return [$share];
 				}
 				return [];
-			}));
+			});
 
 		$propFind = new \Sabre\DAV\PropFind(
 			'/dummyPath',
@@ -173,7 +173,7 @@ class SharesPluginTest extends \Test\TestCase {
 			->method('getChildren');
 		$sabreNode->expects($this->any())
 			->method('getPath')
-			->will($this->returnValue('/subdir'));
+			->willReturn('/subdir');
 
 		// node API nodes
 		$node = $this->createMock(Folder::class);
@@ -194,7 +194,7 @@ class SharesPluginTest extends \Test\TestCase {
 			$share = $this->getMockBuilder(IShare::class)->getMock();
 			$share->expects($this->any())
 				->method('getShareType')
-				->will($this->returnValue($type));
+				->willReturn($type);
 			return $share;
 		}, $shareTypes);
 
@@ -207,7 +207,7 @@ class SharesPluginTest extends \Test\TestCase {
 				$this->equalTo(false),
 				$this->equalTo(-1)
 			)
-			->will($this->returnCallback(function($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes, $dummyShares){
+			->willReturnCallback(function($userId, $requestedShareType, $node, $flag, $limit) use ($shareTypes, $dummyShares){
 				if ($node->getId() === 111 && in_array($requestedShareType, $shareTypes)) {
 					foreach ($dummyShares as $dummyShare) {
 						if ($dummyShare->getShareType() === $requestedShareType) {
@@ -217,7 +217,7 @@ class SharesPluginTest extends \Test\TestCase {
 				}
 
 				return [];
-			}));
+			});
 
 		$this->shareManager->expects($this->any())
 			->method('getSharesInFolder')
@@ -226,9 +226,9 @@ class SharesPluginTest extends \Test\TestCase {
 				$this->anything(),
 				$this->equalTo(true)
 			)
-			->will($this->returnCallback(function ($userId, $node, $flag) use ($shareTypes, $dummyShares) {
+			->willReturnCallback(function ($userId, $node, $flag) use ($shareTypes, $dummyShares) {
 				return [111 => $dummyShares];
-			}));
+			});
 
 		// simulate sabre recursive PROPFIND traversal
 		$propFindRoot = new \Sabre\DAV\PropFind(
diff --git a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
index f417a27329a..c1eaaae42c3 100644
--- a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
@@ -85,7 +85,7 @@ class TagsPluginTest extends \Test\TestCase {
 		$this->tagManager->expects($this->any())
 			->method('load')
 			->with('files')
-			->will($this->returnValue($this->tagger));
+			->willReturn($this->tagger);
 		$this->plugin = new \OCA\DAV\Connector\Sabre\TagsPlugin($this->tree, $this->tagManager);
 		$this->plugin->initialize($this->server);
 	}
@@ -99,7 +99,7 @@ class TagsPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(123));
+			->willReturn(123);
 
 		$expectedCallCount = 0;
 		if (count($requestedProperties) > 0) {
@@ -109,7 +109,7 @@ class TagsPluginTest extends \Test\TestCase {
 		$this->tagger->expects($this->exactly($expectedCallCount))
 			->method('getTagsForObjects')
 			->with($this->equalTo(array(123)))
-			->will($this->returnValue(array(123 => $tags)));
+			->willReturn(array(123 => $tags));
 
 		$propFind = new \Sabre\DAV\PropFind(
 			'/dummyPath',
@@ -138,13 +138,13 @@ class TagsPluginTest extends \Test\TestCase {
 			->getMock();
 		$node1->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(111));
+			->willReturn(111);
 		$node2 = $this->getMockBuilder(File::class)
 			->disableOriginalConstructor()
 			->getMock();
 		$node2->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(222));
+			->willReturn(222);
 
 		$expectedCallCount = 0;
 		if (count($requestedProperties) > 0) {
@@ -159,20 +159,20 @@ class TagsPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(123));
+			->willReturn(123);
 		$node->expects($this->exactly($expectedCallCount))
 			->method('getChildren')
-			->will($this->returnValue(array($node1, $node2)));
+			->willReturn(array($node1, $node2));
 
 		$this->tagger->expects($this->exactly($expectedCallCount))
 			->method('getTagsForObjects')
 			->with($this->equalTo(array(123, 111, 222)))
-			->will($this->returnValue(
+			->willReturn(
 				array(
 					111 => $tags,
 					123 => $tags
 				)
-			));
+			);
 
 		// simulate sabre recursive PROPFIND traversal
 		$propFindRoot = new \Sabre\DAV\PropFind(
@@ -274,17 +274,17 @@ class TagsPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(123));
+			->willReturn(123);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/dummypath')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$this->tagger->expects($this->at(0))
 			->method('getTagsForObjects')
 			->with($this->equalTo(array(123)))
-			->will($this->returnValue(array(123 => array('tagkeep', 'tagremove', self::TAG_FAVORITE))));
+			->willReturn(array(123 => array('tagkeep', 'tagremove', self::TAG_FAVORITE)));
 
 		// then tag as tag1 and tag2
 		$this->tagger->expects($this->at(1))
@@ -325,17 +325,17 @@ class TagsPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(123));
+			->willReturn(123);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/dummypath')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$this->tagger->expects($this->at(0))
 			->method('getTagsForObjects')
 			->with($this->equalTo(array(123)))
-			->will($this->returnValue(array()));
+			->willReturn(array());
 
 		// then tag as tag1 and tag2
 		$this->tagger->expects($this->at(1))
@@ -373,12 +373,12 @@ class TagsPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getId')
-			->will($this->returnValue(123));
+			->willReturn(123);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/dummypath')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		// set favorite tag
 		$this->tagger->expects($this->once())
diff --git a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
index e847e3a036e..bfb789678b7 100644
--- a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
+++ b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php
@@ -81,18 +81,18 @@ class BirthdayCalendarControllerTest extends TestCase {
 
 		$this->userManager->expects($this->once())
 			->method('callForSeenUsers')
-			->will($this->returnCallback(function($closure) {
+			->willReturnCallback(function($closure) {
 				$user1 = $this->createMock(IUser::class);
-				$user1->method('getUID')->will($this->returnValue('uid1'));
+				$user1->method('getUID')->willReturn('uid1');
 				$user2 = $this->createMock(IUser::class);
-				$user2->method('getUID')->will($this->returnValue('uid2'));
+				$user2->method('getUID')->willReturn('uid2');
 				$user3 = $this->createMock(IUser::class);
-				$user3->method('getUID')->will($this->returnValue('uid3'));
+				$user3->method('getUID')->willReturn('uid3');
 
 				$closure($user1);
 				$closure($user2);
 				$closure($user3);
-			}));
+			});
 
 		$this->jobList->expects($this->at(0))
 			->method('add')
diff --git a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
index 811c4cac283..1c29ca7d80b 100644
--- a/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
+++ b/apps/dav/tests/unit/Controller/InvitationResponseControllerTest.php
@@ -108,7 +108,7 @@ EOF;
 		$called = false;
 		$this->responseServer->expects($this->once())
 			->method('handleITipMessage')
-			->will($this->returnCallback(function(Message $iTipMessage) use (&$called, $expected) {
+			->willReturnCallback(function(Message $iTipMessage) use (&$called, $expected) {
 				$called = true;
 				$this->assertEquals('this-is-the-events-uid', $iTipMessage->uid);
 				$this->assertEquals('VEVENT', $iTipMessage->component);
@@ -120,7 +120,7 @@ EOF;
 				$iTipMessage->scheduleStatus = '1.2;Message delivered locally';
 
 				$this->assertEquals($expected, $iTipMessage->message->serialize());
-			}));
+			});
 
 
 
@@ -164,7 +164,7 @@ EOF;
 		$called = false;
 		$this->responseServer->expects($this->once())
 			->method('handleITipMessage')
-			->will($this->returnCallback(function(Message $iTipMessage) use (&$called, $expected) {
+			->willReturnCallback(function(Message $iTipMessage) use (&$called, $expected) {
 				$called = true;
 				$this->assertEquals('this-is-the-events-uid', $iTipMessage->uid);
 				$this->assertEquals('VEVENT', $iTipMessage->component);
@@ -176,7 +176,7 @@ EOF;
 				$iTipMessage->scheduleStatus = '1.2;Message delivered locally';
 
 				$this->assertEquals($expected, $iTipMessage->message->serialize());
-			}));
+			});
 
 
 
@@ -221,7 +221,7 @@ EOF;
 		$called = false;
 		$this->responseServer->expects($this->once())
 			->method('handleITipMessage')
-			->will($this->returnCallback(function(Message $iTipMessage) use (&$called, $expected) {
+			->willReturnCallback(function(Message $iTipMessage) use (&$called, $expected) {
 				$called = true;
 				$this->assertEquals('this-is-the-events-uid', $iTipMessage->uid);
 				$this->assertEquals('VEVENT', $iTipMessage->component);
@@ -233,7 +233,7 @@ EOF;
 				$iTipMessage->scheduleStatus = '1.2;Message delivered locally';
 
 				$this->assertEquals($expected, $iTipMessage->message->serialize());
-			}));
+			});
 
 
 
@@ -304,7 +304,7 @@ EOF;
 		$called = false;
 		$this->responseServer->expects($this->once())
 			->method('handleITipMessage')
-			->will($this->returnCallback(function(Message $iTipMessage) use (&$called, $expected) {
+			->willReturnCallback(function(Message $iTipMessage) use (&$called, $expected) {
 				$called = true;
 				$this->assertEquals('this-is-the-events-uid', $iTipMessage->uid);
 				$this->assertEquals('VEVENT', $iTipMessage->component);
@@ -316,7 +316,7 @@ EOF;
 				$iTipMessage->scheduleStatus = '1.2;Message delivered locally';
 
 				$this->assertEquals($expected, $iTipMessage->message->serialize());
-			}));
+			});
 
 
 
@@ -338,15 +338,15 @@ EOF;
 		$this->request->expects($this->at(0))
 			->method('getParam')
 			->with('partStat')
-			->will($this->returnValue('TENTATIVE'));
+			->willReturn('TENTATIVE');
 		$this->request->expects($this->at(1))
 			->method('getParam')
 			->with('guests')
-			->will($this->returnValue('7'));
+			->willReturn('7');
 		$this->request->expects($this->at(2))
 			->method('getParam')
 			->with('comment')
-			->will($this->returnValue('Foo bar Bli blub'));
+			->willReturn('Foo bar Bli blub');
 
 		$this->buildQueryExpects('TOKEN123', [
 			'id' => 0,
@@ -382,7 +382,7 @@ EOF;
 		$called = false;
 		$this->responseServer->expects($this->once())
 			->method('handleITipMessage')
-			->will($this->returnCallback(function(Message $iTipMessage) use (&$called, $expected) {
+			->willReturnCallback(function(Message $iTipMessage) use (&$called, $expected) {
 				$called = true;
 				$this->assertEquals('this-is-the-events-uid', $iTipMessage->uid);
 				$this->assertEquals('VEVENT', $iTipMessage->component);
@@ -394,7 +394,7 @@ EOF;
 				$iTipMessage->scheduleStatus = '1.2;Message delivered locally';
 
 				$this->assertEquals($expected, $iTipMessage->message->serialize());
-			}));
+			});
 
 
 
@@ -413,47 +413,47 @@ EOF;
 		$this->dbConnection->expects($this->once())
 			->method('getQueryBuilder')
 			->with()
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 		$queryBuilder->method('expr')
-			->will($this->returnValue($expr));
+			->willReturn($expr);
 		$queryBuilder->method('createNamedParameter')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				[$token, \PDO::PARAM_STR, null, 'namedParameterToken']
-			]));
+			]);
 
 		$stmt->expects($this->once())
 			->method('fetch')
 			->with(\PDO::FETCH_ASSOC)
-			->will($this->returnValue($return));
+			->willReturn($return);
 
 		$expr->expects($this->once())
 			->method('eq')
 			->with('token', 'namedParameterToken')
-			->will($this->returnValue('EQ STATEMENT'));
+			->willReturn('EQ STATEMENT');
 
 		$this->dbConnection->expects($this->once())
 			->method('getQueryBuilder')
 			->with()
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 
 		$queryBuilder->expects($this->at(0))
 			->method('select')
 			->with('*')
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 		$queryBuilder->expects($this->at(1))
 			->method('from')
 			->with('calendar_invitations')
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 		$queryBuilder->expects($this->at(4))
 			->method('where')
 			->with('EQ STATEMENT')
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 		$queryBuilder->expects($this->at(5))
 			->method('execute')
 			->with()
-			->will($this->returnValue($stmt));
+			->willReturn($stmt);
 
 		$this->timeFactory->method('getTime')
-			->will($this->returnValue($time));
+			->willReturn($time);
 	}
 }
diff --git a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
index 45aab9af1f5..28af0715ea1 100644
--- a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
+++ b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
@@ -59,7 +59,7 @@ class CustomPropertiesBackendTest extends TestCase {
 		$this->user = $this->createMock(IUser::class);
 		$this->user->method('getUID')
 			->with()
-			->will($this->returnValue('dummy_user_42'));
+			->willReturn('dummy_user_42');
 		$this->dbConnection = \OC::$server->getDatabaseConnection();
 
 		$this->backend = new CustomPropertiesBackend(
@@ -125,12 +125,12 @@ class CustomPropertiesBackendTest extends TestCase {
 		$propFind->expects($this->at(0))
 			->method('get404Properties')
 			->with()
-			->will($this->returnValue([
+			->willReturn([
 				'{http://owncloud.org/ns}permissions',
 				'{http://owncloud.org/ns}downloadURL',
 				'{http://owncloud.org/ns}dDC',
 				'{http://owncloud.org/ns}size',
-			]));
+			]);
 
 		$db->expects($this->never())
 			->method($this->anything());
@@ -142,16 +142,16 @@ class CustomPropertiesBackendTest extends TestCase {
 		$propFind = $this->createMock(PropFind::class);
 		$propFind->method('get404Properties')
 			->with()
-			->will($this->returnValue([
+			->willReturn([
 				'{DAV:}getcontentlength',
 				'{DAV:}getcontenttype',
 				'{DAV:}getetag',
 				'{abc}def',
-			]));
+			]);
 
 		$propFind->method('getRequestedProperties')
 			->with()
-			->will($this->returnValue([
+			->willReturn([
 				'{DAV:}getcontentlength',
 				'{DAV:}getcontenttype',
 				'{DAV:}getetag',
@@ -159,7 +159,7 @@ class CustomPropertiesBackendTest extends TestCase {
 				'{urn:ietf:params:xml:ns:caldav}calendar-description',
 				'{urn:ietf:params:xml:ns:caldav}calendar-timezone',
 				'{abc}def',
-			]));
+			]);
 
 		$props = [
 			'{abc}def' => 'a',
diff --git a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php
index e60c2619303..08239dfd46a 100644
--- a/apps/dav/tests/unit/DAV/GroupPrincipalTest.php
+++ b/apps/dav/tests/unit/DAV/GroupPrincipalTest.php
@@ -74,7 +74,7 @@ class GroupPrincipalTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('search')
 			->with('')
-			->will($this->returnValue([$group1, $group2]));
+			->willReturn([$group1, $group2]);
 
 		$expectedResponse = [
 			0 => [
@@ -97,7 +97,7 @@ class GroupPrincipalTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('search')
 			->with('')
-			->will($this->returnValue([]));
+			->willReturn([]);
 
 		$response = $this->connector->getPrincipalsByPrefix('principals/groups');
 		$this->assertSame([], $response);
@@ -109,7 +109,7 @@ class GroupPrincipalTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue($group1));
+			->willReturn($group1);
 
 		$expectedResponse = [
 			'uri' => 'principals/groups/foo',
@@ -126,7 +126,7 @@ class GroupPrincipalTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue($fooUser));
+			->willReturn($fooUser);
 
 		$expectedResponse = [
 			'uri' => 'principals/groups/foo',
@@ -142,7 +142,7 @@ class GroupPrincipalTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('get')
 			->with('foo')
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$response = $this->connector->getPrincipalByPath('principals/groups/foo');
 		$this->assertSame(null, $response);
@@ -154,7 +154,7 @@ class GroupPrincipalTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('get')
 			->with('foo/bar')
-			->will($this->returnValue($group1));
+			->willReturn($group1);
 
 		$expectedResponse = [
 			'uri' => 'principals/groups/foo%2Fbar',
@@ -202,23 +202,23 @@ class GroupPrincipalTest extends \Test\TestCase {
 	public function testSearchPrincipals($sharingEnabled, $groupsOnly, $test, $result) {
 		$this->shareManager->expects($this->once())
 			->method('shareAPIEnabled')
-			->will($this->returnValue($sharingEnabled));
+			->willReturn($sharingEnabled);
 
 		if ($sharingEnabled) {
 			$this->shareManager->expects($this->once())
 				->method('shareWithGroupMembersOnly')
-				->will($this->returnValue($groupsOnly));
+				->willReturn($groupsOnly);
 
 			if ($groupsOnly) {
 				$user = $this->createMock(IUser::class);
 				$this->userSession->expects($this->once())
 					->method('getUser')
-					->will($this->returnValue($user));
+					->willReturn($user);
 
 				$this->groupManager->expects($this->once())
 					->method('getUserGroupIds')
 					->with($user)
-					->will($this->returnValue(['group1', 'group2', 'group5']));
+					->willReturn(['group1', 'group2', 'group5']);
 			}
 		} else {
 			$this->shareManager->expects($this->never())
@@ -228,21 +228,21 @@ class GroupPrincipalTest extends \Test\TestCase {
 		}
 
 		$group1 = $this->createMock(IGroup::class);
-		$group1->method('getGID')->will($this->returnValue('group1'));
+		$group1->method('getGID')->willReturn('group1');
 		$group2 = $this->createMock(IGroup::class);
-		$group2->method('getGID')->will($this->returnValue('group2'));
+		$group2->method('getGID')->willReturn('group2');
 		$group3 = $this->createMock(IGroup::class);
-		$group3->method('getGID')->will($this->returnValue('group3'));
+		$group3->method('getGID')->willReturn('group3');
 		$group4 = $this->createMock(IGroup::class);
-		$group4->method('getGID')->will($this->returnValue('group4'));
+		$group4->method('getGID')->willReturn('group4');
 		$group5 = $this->createMock(IGroup::class);
-		$group5->method('getGID')->will($this->returnValue('group5'));
+		$group5->method('getGID')->willReturn('group5');
 
 		if ($sharingEnabled) {
 			$this->groupManager->expects($this->once())
 				->method('search')
 				->with('Foo')
-				->will($this->returnValue([$group1, $group2, $group3, $group4, $group5]));
+				->willReturn([$group1, $group2, $group3, $group4, $group5]);
 		} else {
 			$this->groupManager->expects($this->never())
 				->method('search');
@@ -269,23 +269,23 @@ class GroupPrincipalTest extends \Test\TestCase {
 	public function testFindByUri($sharingEnabled, $groupsOnly, $findUri, $result) {
 		$this->shareManager->expects($this->once())
 			->method('shareAPIEnabled')
-			->will($this->returnValue($sharingEnabled));
+			->willReturn($sharingEnabled);
 
 		if ($sharingEnabled) {
 			$this->shareManager->expects($this->once())
 				->method('shareWithGroupMembersOnly')
-				->will($this->returnValue($groupsOnly));
+				->willReturn($groupsOnly);
 
 			if ($groupsOnly) {
 				$user = $this->createMock(IUser::class);
 				$this->userSession->expects($this->once())
 					->method('getUser')
-					->will($this->returnValue($user));
+					->willReturn($user);
 
 				$this->groupManager->expects($this->at(0))
 					->method('getUserGroupIds')
 					->with($user)
-					->will($this->returnValue(['group1', 'group2', 'group5']));
+					->willReturn(['group1', 'group2', 'group5']);
 			}
 		} else {
 			$this->shareManager->expects($this->never())
diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php
index ab95008585b..7b3388b9e74 100644
--- a/apps/dav/tests/unit/DAV/HookManagerTest.php
+++ b/apps/dav/tests/unit/DAV/HookManagerTest.php
@@ -54,9 +54,9 @@ class HookManagerTest extends TestCase {
 		$this->l10n
 			->expects($this->any())
 			->method('t')
-			->will($this->returnCallback(function ($text, $parameters = []) {
+			->willReturnCallback(function ($text, $parameters = []) {
 				return vsprintf($text, $parameters);
-			}));
+			});
 	}
 
 	public function test() {
diff --git a/apps/dav/tests/unit/Files/FileSearchBackendTest.php b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
index 2f8dec62480..167b68e076c 100644
--- a/apps/dav/tests/unit/Files/FileSearchBackendTest.php
+++ b/apps/dav/tests/unit/Files/FileSearchBackendTest.php
@@ -133,9 +133,9 @@ class FileSearchBackendTest extends TestCase {
 				[],
 				$this->user
 			))
-			->will($this->returnValue([
+			->willReturn([
 				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path')
-			]));
+			]);
 
 		$query = $this->getBasicQuery(\SearchDAV\Query\Operator::OPERATION_EQUAL, '{DAV:}displayname', 'foo');
 		$result = $this->search->search($query);
@@ -162,9 +162,9 @@ class FileSearchBackendTest extends TestCase {
 				[],
 				$this->user
 			))
-			->will($this->returnValue([
+			->willReturn([
 				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path')
-			]));
+			]);
 
 		$query = $this->getBasicQuery(\SearchDAV\Query\Operator::OPERATION_EQUAL, '{DAV:}getcontenttype', 'foo');
 		$result = $this->search->search($query);
@@ -191,9 +191,9 @@ class FileSearchBackendTest extends TestCase {
 				[],
 				$this->user
 			))
-			->will($this->returnValue([
+			->willReturn([
 				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path')
-			]));
+			]);
 
 		$query = $this->getBasicQuery(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, FilesPlugin::SIZE_PROPERTYNAME, 10);
 		$result = $this->search->search($query);
@@ -220,9 +220,9 @@ class FileSearchBackendTest extends TestCase {
 				[],
 				$this->user
 			))
-			->will($this->returnValue([
+			->willReturn([
 				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path')
-			]));
+			]);
 
 		$query = $this->getBasicQuery(\SearchDAV\Query\Operator::OPERATION_GREATER_THAN, '{DAV:}getlastmodified', 10);
 		$result = $this->search->search($query);
@@ -249,9 +249,9 @@ class FileSearchBackendTest extends TestCase {
 				[],
 				$this->user
 			))
-			->will($this->returnValue([
+			->willReturn([
 				new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path')
-			]));
+			]);
 
 		$query = $this->getBasicQuery(\SearchDAV\Query\Operator::OPERATION_IS_COLLECTION, 'yes');
 		$result = $this->search->search($query);
@@ -320,12 +320,12 @@ class FileSearchBackendTest extends TestCase {
 		$receivedQuery = null;
 		$this->searchFolder
 			->method('search')
-			->will($this->returnCallback(function ($query) use (&$receivedQuery) {
+			->willReturnCallback(function ($query) use (&$receivedQuery) {
 				$receivedQuery = $query;
 				return [
 					new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path')
 				];
-			}));
+			});
 
 		$query = $this->getBasicQuery(\SearchDAV\Query\Operator::OPERATION_EQUAL, FilesPlugin::OWNER_ID_PROPERTYNAME, $this->user->getUID());
 		$this->search->search($query);
@@ -349,12 +349,12 @@ class FileSearchBackendTest extends TestCase {
 		$receivedQuery = null;
 		$this->searchFolder
 			->method('search')
-			->will($this->returnCallback(function ($query) use (&$receivedQuery) {
+			->willReturnCallback(function ($query) use (&$receivedQuery) {
 				$receivedQuery = $query;
 				return [
 					new \OC\Files\Node\Folder($this->rootFolder, $this->view, '/test/path')
 				];
-			}));
+			});
 
 		$query = $this->getBasicQuery(\SearchDAV\Query\Operator::OPERATION_EQUAL, FilesPlugin::OWNER_ID_PROPERTYNAME, $this->user->getUID());
 		$query->where = new \SearchDAV\Query\Operator(
diff --git a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
index 852a22564c3..77646b2c9d1 100644
--- a/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
+++ b/apps/dav/tests/unit/Files/Sharing/FilesDropPluginTest.php
@@ -122,13 +122,13 @@ class FilesDropPluginTest extends TestCase {
 			->willReturn('https://example.com');
 
 		$this->view->method('file_exists')
-			->will($this->returnCallback(function($path) {
+			->willReturnCallback(function($path) {
 				if ($path === 'file.txt' || $path === '/file.txt') {
 					return true;
 				} else {
 					return false;
 				}
-			}));
+			});
 
 		$this->request->expects($this->once())
 			->method('setUrl')
@@ -163,13 +163,13 @@ class FilesDropPluginTest extends TestCase {
 			->willReturn('https://example.com');
 
 		$this->view->method('file_exists')
-			->will($this->returnCallback(function($path) {
+			->willReturnCallback(function($path) {
 				if ($path === 'file.txt' || $path === '/file.txt') {
 					return true;
 				} else {
 					return false;
 				}
-			}));
+			});
 
 		$this->request->expects($this->once())
 			->method('setUrl')
diff --git a/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php b/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
index ad56a0dd715..dc6c64f2abb 100644
--- a/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
+++ b/apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php
@@ -64,45 +64,45 @@ class RefreshWebcalJobRegistrarTest extends TestCase {
 
 		$this->db->expects($this->once())
 			->method('getQueryBuilder')
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 
 		$queryBuilder->expects($this->at(0))
 			->method('select')
 			->with(['principaluri', 'uri'])
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 		$queryBuilder->expects($this->at(1))
 			->method('from')
 			->with('calendarsubscriptions')
-			->will($this->returnValue($queryBuilder));
+			->willReturn($queryBuilder);
 		$queryBuilder->expects($this->at(2))
 			->method('execute')
-			->will($this->returnValue($statement));
+			->willReturn($statement);
 
 		$statement->expects($this->at(0))
 			->method('fetch')
 			->with(\PDO::FETCH_ASSOC)
-			->will($this->returnValue([
+			->willReturn([
 				'principaluri' => 'foo1',
 				'uri' => 'bar1',
-			]));
+			]);
 		$statement->expects($this->at(1))
 			->method('fetch')
 			->with(\PDO::FETCH_ASSOC)
-			->will($this->returnValue([
+			->willReturn([
 				'principaluri' => 'foo2',
 				'uri' => 'bar2',
-			]));
+			]);
 		$statement->expects($this->at(2))
 			->method('fetch')
 			->with(\PDO::FETCH_ASSOC)
-			->will($this->returnValue([
+			->willReturn([
 				'principaluri' => 'foo3',
 				'uri' => 'bar3',
-			]));
+			]);
 		$statement->expects($this->at(0))
 			->method('fetch')
 			->with(\PDO::FETCH_ASSOC)
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$this->jobList->expects($this->at(0))
 			->method('has')
@@ -110,7 +110,7 @@ class RefreshWebcalJobRegistrarTest extends TestCase {
 				'principaluri' => 'foo1',
 				'uri' => 'bar1',
 			])
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$this->jobList->expects($this->at(1))
 			->method('add')
 			->with(RefreshWebcalJob::class, [
@@ -123,14 +123,14 @@ class RefreshWebcalJobRegistrarTest extends TestCase {
 				'principaluri' => 'foo2',
 				'uri' => 'bar2',
 			])
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->jobList->expects($this->at(3))
 			->method('has')
 			->with(RefreshWebcalJob::class, [
 				'principaluri' => 'foo3',
 				'uri' => 'bar3',
 			])
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$this->jobList->expects($this->at(4))
 			->method('add')
 			->with(RefreshWebcalJob::class, [
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
index 5dac83c5d96..8e6cd85817b 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php
@@ -88,11 +88,11 @@ class SystemTagMappingNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($node->getSystemTag())
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->tagManager->expects($this->once())
 			->method('canUserAssignTag')
 			->with($node->getSystemTag())
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->tagManager->expects($this->never())
 			->method('deleteTags');
 		$this->tagMapper->expects($this->once())
@@ -124,11 +124,11 @@ class SystemTagMappingNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($this->any())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue($tag->isUserVisible()));
+			->willReturn($tag->isUserVisible());
 		$this->tagManager->expects($this->any())
 			->method('canUserAssignTag')
 			->with($tag)
-			->will($this->returnValue($tag->isUserAssignable()));
+			->willReturn($tag->isUserAssignable());
 		$this->tagManager->expects($this->never())
 			->method('deleteTags');
 		$this->tagMapper->expects($this->never())
@@ -154,11 +154,11 @@ class SystemTagMappingNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue($tag->isUserVisible()));
+			->willReturn($tag->isUserVisible());
 		$this->tagManager->expects($this->once())
 			->method('canUserAssignTag')
 			->with($tag)
-			->will($this->returnValue($tag->isUserAssignable()));
+			->willReturn($tag->isUserAssignable());
 		$this->tagMapper->expects($this->once())
 			->method('unassignTags')
 			->with(123, 'files', 1)
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
index bf3818309fa..b8f45fdae3c 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagNodeTest.php
@@ -118,11 +118,11 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($originalTag)
-			->will($this->returnValue($originalTag->isUserVisible() || $isAdmin));
+			->willReturn($originalTag->isUserVisible() || $isAdmin);
 		$this->tagManager->expects($this->once())
 			->method('canUserAssignTag')
 			->with($originalTag)
-			->will($this->returnValue($originalTag->isUserAssignable() || $isAdmin));
+			->willReturn($originalTag->isUserAssignable() || $isAdmin);
 		$this->tagManager->expects($this->once())
 			->method('updateTag')
 			->with(1, $changedArgs[0], $changedArgs[1], $changedArgs[2]);
@@ -178,11 +178,11 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($this->any())
 			->method('canUserSeeTag')
 			->with($originalTag)
-			->will($this->returnValue($originalTag->isUserVisible()));
+			->willReturn($originalTag->isUserVisible());
 		$this->tagManager->expects($this->any())
 			->method('canUserAssignTag')
 			->with($originalTag)
-			->will($this->returnValue($originalTag->isUserAssignable()));
+			->willReturn($originalTag->isUserAssignable());
 		$this->tagManager->expects($this->never())
 			->method('updateTag');
 
@@ -206,11 +206,11 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($this->any())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->tagManager->expects($this->any())
 			->method('canUserAssignTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->tagManager->expects($this->once())
 			->method('updateTag')
 			->with(1, 'Renamed', true, true)
@@ -226,11 +226,11 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($this->any())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->tagManager->expects($this->any())
 			->method('canUserAssignTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->tagManager->expects($this->once())
 			->method('updateTag')
 			->with(1, 'Renamed', true, true)
@@ -246,7 +246,7 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($isAdmin ? $this->once() : $this->never())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->tagManager->expects($isAdmin ? $this->once() : $this->never())
 			->method('deleteTags')
 			->with('1');
@@ -278,7 +278,7 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($this->any())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue($tag->isUserVisible()));
+			->willReturn($tag->isUserVisible());
 		$this->tagManager->expects($this->never())
 			->method('deleteTags');
 
@@ -294,7 +294,7 @@ class SystemTagNodeTest extends \Test\TestCase {
 		$this->tagManager->expects($this->any())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue($tag->isUserVisible()));
+			->willReturn($tag->isUserVisible());
 		$this->tagManager->expects($this->once())
 			->method('deleteTags')
 			->with('1')
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
index 93f9a4f4e22..f634c717093 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagPluginTest.php
@@ -202,20 +202,20 @@ class SystemTagPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getSystemTag')
-			->will($this->returnValue($systemTag));
+			->willReturn($systemTag);
 
 		$this->tagManager->expects($this->any())
 			->method('canUserAssignTag')
-			->will($this->returnValue($systemTag->isUserAssignable()));
+			->willReturn($systemTag->isUserAssignable());
 
 		$this->tagManager->expects($this->any())
 			->method('getTagGroups')
-			->will($this->returnValue($groups));
+			->willReturn($groups);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/systemtag/1')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$propFind = new \Sabre\DAV\PropFind(
 			'/systemtag/1',
@@ -257,12 +257,12 @@ class SystemTagPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getSystemTag')
-			->will($this->returnValue($systemTag));
+			->willReturn($systemTag);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/systemtag/1')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$propFind = new \Sabre\DAV\PropFind(
 			'/systemtag/1',
@@ -292,12 +292,12 @@ class SystemTagPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getSystemTag')
-			->will($this->returnValue($systemTag));
+			->willReturn($systemTag);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/systemtag/1')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$node->expects($this->once())
 			->method('update')
@@ -350,12 +350,12 @@ class SystemTagPluginTest extends \Test\TestCase {
 			->getMock();
 		$node->expects($this->any())
 			->method('getSystemTag')
-			->will($this->returnValue($systemTag));
+			->willReturn($systemTag);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/systemtag/1')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$node->expects($this->never())
 			->method('update');
@@ -420,7 +420,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/systemtags')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
@@ -431,16 +431,16 @@ class SystemTagPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/systemtags'));
+			->willReturn('/systemtags');
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/json'));
+			->willReturn('application/json');
 
 		$this->plugin->httpPost($request, $response);
 	}
@@ -460,12 +460,12 @@ class SystemTagPluginTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('createTag')
 			->with('Test', true, true)
-			->will($this->returnValue($systemTag));
+			->willReturn($systemTag);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/systemtags')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$request = $this->getMockBuilder(RequestInterface::class)
 			->disableOriginalConstructor()
@@ -476,20 +476,20 @@ class SystemTagPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/systemtags'));
+			->willReturn('/systemtags');
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/json'));
+			->willReturn('application/json');
 
 		$request->expects($this->once())
 			->method('getUrl')
-			->will($this->returnValue('http://example.com/dav/systemtags'));
+			->willReturn('http://example.com/dav/systemtags');
 
 		$response->expects($this->once())
 			->method('setHeader')
@@ -537,13 +537,13 @@ class SystemTagPluginTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('createTag')
 			->with('Test', $userVisible, $userAssignable)
-			->will($this->returnValue($systemTag));
+			->willReturn($systemTag);
 		
 		if (!empty($groups)) {
 			$this->tagManager->expects($this->once())
 				->method('setTagGroups')
 				->with($systemTag, explode('|', $groups))
-				->will($this->returnValue($systemTag));
+				->willReturn($systemTag);
 		} else {
 			$this->tagManager->expects($this->never())
 				->method('setTagGroups');
@@ -552,7 +552,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/systemtags')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$request = $this->getMockBuilder(RequestInterface::class)
 				->disableOriginalConstructor()
@@ -563,20 +563,20 @@ class SystemTagPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/systemtags'));
+			->willReturn('/systemtags');
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/json'));	
+			->willReturn('application/json');	
 
 		$request->expects($this->once())
 			->method('getUrl')
-			->will($this->returnValue('http://example.com/dav/systemtags'));
+			->willReturn('http://example.com/dav/systemtags');
 
 		$response->expects($this->once())
 			->method('setHeader')
@@ -617,12 +617,12 @@ class SystemTagPluginTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('createTag')
 			->with('Test', true, false)
-			->will($this->returnValue($systemTag));
+			->willReturn($systemTag);
 
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/systemtags-relations/files/12')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$node->expects($this->once())
 			->method('createFile')
@@ -637,20 +637,20 @@ class SystemTagPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/systemtags-relations/files/12'));
+			->willReturn('/systemtags-relations/files/12');
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/json'));	
+			->willReturn('application/json');	
 
 		$request->expects($this->once())
 			->method('getBaseUrl')
-			->will($this->returnValue('http://example.com/dav/'));
+			->willReturn('http://example.com/dav/');
 
 		$response->expects($this->once())
 			->method('setHeader')
@@ -686,7 +686,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/systemtags-relations/files/12'));
+			->willReturn('/systemtags-relations/files/12');
 
 		$this->plugin->httpPost($request, $response);
 	}
@@ -723,7 +723,7 @@ class SystemTagPluginTest extends \Test\TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('/systemtags')
-			->will($this->returnValue($node));
+			->willReturn($node);
 
 		$request = $this->getMockBuilder(RequestInterface::class)
 				->disableOriginalConstructor()
@@ -734,16 +734,16 @@ class SystemTagPluginTest extends \Test\TestCase {
 
 		$request->expects($this->once())
 			->method('getPath')
-			->will($this->returnValue('/systemtags'));
+			->willReturn('/systemtags');
 
 		$request->expects($this->once())
 			->method('getBodyAsString')
-			->will($this->returnValue($requestData));
+			->willReturn($requestData);
 
 		$request->expects($this->once())
 			->method('getHeader')
 			->with('Content-Type')
-			->will($this->returnValue('application/json'));	
+			->willReturn('application/json');	
 
 		$this->plugin->httpPost($request, $response);
 	}
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php
index c7e3a4a9146..17616227088 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagsByIdCollectionTest.php
@@ -57,18 +57,18 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 			->getMock();
 		$this->user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('testuser'));
+			->willReturn('testuser');
 		$userSession = $this->getMockBuilder(IUserSession::class)
 			->getMock();
 		$userSession->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($this->user));
+			->willReturn($this->user);
 		$groupManager = $this->getMockBuilder(IGroupManager::class)
 			->getMock();
 		$groupManager->expects($this->any())
 			->method('isAdmin')
 			->with('testuser')
-			->will($this->returnValue($isAdmin));
+			->willReturn($isAdmin);
 		return new \OCA\DAV\SystemTag\SystemTagsByIdCollection(
 			$this->tagManager,
 			$userSession,
@@ -99,12 +99,12 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['123'])
-			->will($this->returnValue([$tag]));
+			->willReturn([$tag]);
 
 		$childNode = $this->getNode()->getChild('123');
 
@@ -146,7 +146,7 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['123'])
-			->will($this->returnValue([$tag]));
+			->willReturn([$tag]);
 
 		$this->getNode(false)->getChild('123');
 	}
@@ -158,7 +158,7 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('getAllTags')
 			->with(null)
-			->will($this->returnValue([$tag1, $tag2]));
+			->willReturn([$tag1, $tag2]);
 
 		$children = $this->getNode(true)->getChildren();
 
@@ -177,7 +177,7 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('getAllTags')
 			->with(true)
-			->will($this->returnValue([$tag1, $tag2]));
+			->willReturn([$tag1, $tag2]);
 
 		$children = $this->getNode(false)->getChildren();
 
@@ -193,7 +193,7 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('getAllTags')
 			->with(null)
-			->will($this->returnValue([]));
+			->willReturn([]);
 		$this->assertCount(0, $this->getNode()->getChildren());
 	}
 
@@ -212,12 +212,12 @@ class SystemTagsByIdCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue($userVisible));
+			->willReturn($userVisible);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['123'])
-			->will($this->returnValue([$tag]));
+			->willReturn([$tag]);
 
 		$this->assertEquals($expectedResult, $this->getNode()->childExists('123'));
 	}
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
index 58de0dd54ab..b28590a5962 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php
@@ -76,16 +76,16 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->tagManager->expects($this->once())
 			->method('canUserAssignTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['555'])
-			->will($this->returnValue([$tag]));
+			->willReturn([$tag]);
 		$this->tagMapper->expects($this->once())
 			->method('assignTags')
 			->with(111, 'files', '555');
@@ -110,16 +110,16 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue($userVisible));
+			->willReturn($userVisible);
 		$this->tagManager->expects($this->any())
 			->method('canUserAssignTag')
 			->with($tag)
-			->will($this->returnValue($userAssignable));
+			->willReturn($userAssignable);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['555'])
-			->will($this->returnValue([$tag]));
+			->willReturn([$tag]);
 		$this->tagMapper->expects($this->never())
 			->method('assignTags');
 
@@ -157,17 +157,17 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', '555', true)
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['555'])
-			->will($this->returnValue(['555' => $tag]));
+			->willReturn(['555' => $tag]);
 
 		$childNode = $this->getNode()->getChild('555');
 
@@ -183,17 +183,17 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', '555', true)
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['555'])
-			->will($this->returnValue(['555' => $tag]));
+			->willReturn(['555' => $tag]);
 
 		$this->getNode()->getChild('555');
 	}
@@ -205,7 +205,7 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', '777')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$this->getNode()->getChild('777');
 	}
@@ -242,18 +242,18 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->tagMapper->expects($this->once())
 			->method('getTagIdsForObjects')
 			->with([111], 'files')
-			->will($this->returnValue(['111' => ['555', '556', '557']]));
+			->willReturn(['111' => ['555', '556', '557']]);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['555', '556', '557'])
-			->will($this->returnValue(['555' => $tag1, '556' => $tag2, '557' => $tag3]));
+			->willReturn(['555' => $tag1, '556' => $tag2, '557' => $tag3]);
 
 		$this->tagManager->expects($this->exactly(3))
 			->method('canUserSeeTag')
-			->will($this->returnCallback(function($tag) {
+			->willReturnCallback(function($tag) {
 				return $tag->isUserVisible();
-			}));
+			});
 
 		$children = $this->getNode()->getChildren();
 
@@ -277,17 +277,17 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', '555')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagManager->expects($this->once())
 			->method('canUserSeeTag')
 			->with($tag)
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['555'])
-			->will($this->returnValue([$tag]));
+			->willReturn([$tag]);
 
 		$this->assertTrue($this->getNode()->childExists('555'));
 	}
@@ -298,12 +298,12 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', '555')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->tagManager->expects($this->once())
 			->method('getTagsByIds')
 			->with(['555'])
-			->will($this->returnValue([$tag]));
+			->willReturn([$tag]);
 
 		$this->assertFalse($this->getNode()->childExists('555'));
 	}
@@ -312,7 +312,7 @@ class SystemTagsObjectMappingCollectionTest extends \Test\TestCase {
 		$this->tagMapper->expects($this->once())
 			->method('haveTag')
 			->with([111], 'files', '555')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$this->assertFalse($this->getNode()->childExists('555'));
 	}
diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php
index 7854360e0fd..0a98cfdc4e0 100644
--- a/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php
+++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectTypeCollectionTest.php
@@ -66,18 +66,18 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 			->getMock();
 		$user->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue('testuser'));
+			->willReturn('testuser');
 		$userSession = $this->getMockBuilder(IUserSession::class)
 			->getMock();
 		$userSession->expects($this->any())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$groupManager = $this->getMockBuilder(IGroupManager::class)
 			->getMock();
 		$groupManager->expects($this->any())
 			->method('isAdmin')
 			->with('testuser')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->userFolder = $this->getMockBuilder(Folder::class)
 			->getMock();
@@ -116,7 +116,7 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 		$this->userFolder->expects($this->once())
 			->method('getById')
 			->with('555')
-			->will($this->returnValue([true]));
+			->willReturn([true]);
 		$childNode = $this->node->getChild('555');
 
 		$this->assertInstanceOf('\OCA\DAV\SystemTag\SystemTagsObjectMappingCollection', $childNode);
@@ -130,7 +130,7 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 		$this->userFolder->expects($this->once())
 			->method('getById')
 			->with('555')
-			->will($this->returnValue([]));
+			->willReturn([]);
 		$this->node->getChild('555');
 	}
 
@@ -145,7 +145,7 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 		$this->userFolder->expects($this->once())
 			->method('getById')
 			->with('123')
-			->will($this->returnValue([true]));
+			->willReturn([true]);
 		$this->assertTrue($this->node->childExists('123'));
 	}
 
@@ -153,7 +153,7 @@ class SystemTagsObjectTypeCollectionTest extends \Test\TestCase {
 		$this->userFolder->expects($this->once())
 			->method('getById')
 			->with('555')
-			->will($this->returnValue([]));
+			->willReturn([]);
 		$this->assertFalse($this->node->childExists('555'));
 	}
 
diff --git a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php
index d0eeed78678..d338c5b31f1 100644
--- a/apps/dav/tests/unit/Upload/ChunkingPluginTest.php
+++ b/apps/dav/tests/unit/Upload/ChunkingPluginTest.php
@@ -80,7 +80,7 @@ class ChunkingPluginTest extends TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('source')
-			->will($this->returnValue($node));
+			->willReturn($node);
 		$this->response->expects($this->never())
 			->method('setStatus');
 
@@ -96,11 +96,11 @@ class ChunkingPluginTest extends TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('source')
-			->will($this->returnValue($sourceNode));
+			->willReturn($sourceNode);
 		$this->tree->expects($this->any())
 			->method('nodeExists')
 			->with('target')
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$this->response->expects($this->never())
 			->method('setStatus');
 		$this->request->expects($this->once())
@@ -120,11 +120,11 @@ class ChunkingPluginTest extends TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('source')
-			->will($this->returnValue($sourceNode));
+			->willReturn($sourceNode);
 		$this->tree->expects($this->any())
 			->method('nodeExists')
 			->with('target')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$this->tree->expects($this->once())
 			->method('move')
 			->with('source', 'target');
@@ -156,7 +156,7 @@ class ChunkingPluginTest extends TestCase {
 		$this->tree->expects($this->any())
 			->method('getNodeForPath')
 			->with('source')
-			->will($this->returnValue($sourceNode));
+			->willReturn($sourceNode);
 		$this->request->expects($this->once())
 			->method('getHeader')
 			->with('OC-Total-Length')
-- 
cgit v1.2.3

 value='share-reminder-sharding'>share-reminder-sharding</option>
<option value='share-root-meta-cache'>share-root-meta-cache</option>
<option value='shared-cache-watcher-update'>shared-cache-watcher-update</option>
<option value='shared-cache-watcher-update-30'>shared-cache-watcher-update-30</option>
<option value='skjnldbot/nextcloud-upload'>skjnldbot/nextcloud-upload</option>
<option value='skjnldsv-patch-1'>skjnldsv-patch-1</option>
<option value='smb-acl-fail-soft'>smb-acl-fail-soft</option>
<option value='smb-hasupdated-deleted'>smb-hasupdated-deleted</option>
<option value='smb-notify-test'>smb-notify-test</option>
<option value='smb-systembridge'>smb-systembridge</option>
<option value='solracsf-patch-1'>solracsf-patch-1</option>
<option value='stable-swift-v3'>stable-swift-v3</option>
<option value='stable10'>stable10</option>
<option value='stable11'>stable11</option>
<option value='stable12'>stable12</option>
<option value='stable13'>stable13</option>
<option value='stable14'>stable14</option>
<option value='stable15'>stable15</option>
<option value='stable16'>stable16</option>
<option value='stable17'>stable17</option>
<option value='stable18'>stable18</option>
<option value='stable19'>stable19</option>
<option value='stable20'>stable20</option>
<option value='stable21'>stable21</option>
<option value='stable22'>stable22</option>
<option value='stable23'>stable23</option>
<option value='stable24'>stable24</option>
<option value='stable25'>stable25</option>
<option value='stable26'>stable26</option>
<option value='stable27'>stable27</option>
<option value='stable28'>stable28</option>
<option value='stable28BackportMissingSetTTL'>stable28BackportMissingSetTTL</option>
<option value='stable29'>stable29</option>
<option value='stable30'>stable30</option>
<option value='stable30-admin-audit-listen-failed-login'>stable30-admin-audit-listen-failed-login</option>
<option value='stable30-fix-renaming-a-received-share-by-a-user-with-stale-shares'>stable30-fix-renaming-a-received-share-by-a-user-with-stale-shares</option>
<option value='stable31'>stable31</option>
<option value='stable9'>stable9</option>
<option value='storage-cache-not-exists'>storage-cache-not-exists</option>
<option value='storage-debug-info'>storage-debug-info</option>
<option value='storage-id-cache-memcache'>storage-id-cache-memcache</option>
<option value='stream-assembly-stream-size'>stream-assembly-stream-size</option>
<option value='techdebt/noid/add-parameter-typehints'>techdebt/noid/add-parameter-typehints</option>
<option value='techdebt/noid/more-useful-debug-logs'>techdebt/noid/more-useful-debug-logs</option>
<option value='test-scanner-no-transactions-26'>test-scanner-no-transactions-26</option>
<option value='test/cypress-flakyness'>test/cypress-flakyness</option>
<option value='test/eol-check'>test/eol-check</option>
<option value='test/eol-check-26'>test/eol-check-26</option>
<option value='test/fix-cypress'>test/fix-cypress</option>
<option value='test/folder-tree'>test/folder-tree</option>
<option value='test/integration/cleanup-logs'>test/integration/cleanup-logs</option>
<option value='test/widget-perf'>test/widget-perf</option>
<option value='tests/fix-jest-leftover'>tests/fix-jest-leftover</option>
<option value='tests/template-workflow'>tests/template-workflow</option>
<option value='transfer-share-skip-notfound'>transfer-share-skip-notfound</option>
<option value='trimBucketDnsName'>trimBucketDnsName</option>
<option value='try-non-recursive-source-27'>try-non-recursive-source-27</option>
<option value='update-phpdoc-for-folder-get'>update-phpdoc-for-folder-get</option>
<option value='update-stale-bot-configuration'>update-stale-bot-configuration</option>
<option value='updateLastSeen'>updateLastSeen</option>
<option value='updater-change-mimetype-objectstore'>updater-change-mimetype-objectstore</option>
<option value='uploadfolder-rework'>uploadfolder-rework</option>
<option value='useHttpFramework'>useHttpFramework</option>
<option value='useNameNotUrl'>useNameNotUrl</option>
<option value='useOCPClassesTrashbin'>useOCPClassesTrashbin</option>
<option value='usermountcache-filecache-joins'>usermountcache-filecache-joins</option>
<option value='validateProvidedEmail'>validateProvidedEmail</option>
<option value='wrapper-instanceof-resiliant-squash'>wrapper-instanceof-resiliant-squash</option>
<option value='zorn-v-patch-1'>zorn-v-patch-1</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server</td><td class='sub right'>www-data</td></tr></table>
<table class='tabs'><tr><td>
<a href='/nextcloud-server.git/?h=v19.0.0RC1'>summary</a><a href='/nextcloud-server.git/refs/?h=v19.0.0RC1&amp;id=e75406e7120271ebfecf2260b95040509dfcf168'>refs</a><a href='/nextcloud-server.git/log/l10n/tr/settings.po?h=v19.0.0RC1'>log</a><a class='active' href='/nextcloud-server.git/tree/l10n/tr/settings.po?h=v19.0.0RC1&amp;id=e75406e7120271ebfecf2260b95040509dfcf168'>tree</a><a href='/nextcloud-server.git/commit/l10n/tr/settings.po?h=v19.0.0RC1&amp;id=e75406e7120271ebfecf2260b95040509dfcf168'>commit</a><a href='/nextcloud-server.git/diff/l10n/tr/settings.po?h=v19.0.0RC1&amp;id=e75406e7120271ebfecf2260b95040509dfcf168'>diff</a><a href='/nextcloud-server.git/stats/l10n/tr/settings.po?h=v19.0.0RC1'>stats</a></td><td class='form'><form class='right' method='get' action='/nextcloud-server.git/log/l10n/tr/settings.po'>
<input type='hidden' name='h' value='v19.0.0RC1'/><input type='hidden' name='id' value='e75406e7120271ebfecf2260b95040509dfcf168'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/nextcloud-server.git/tree/?h=v19.0.0RC1&amp;id=e75406e7120271ebfecf2260b95040509dfcf168'>root</a>/<a href='/nextcloud-server.git/tree/l10n?h=v19.0.0RC1&amp;id=e75406e7120271ebfecf2260b95040509dfcf168'>l10n</a>/<a href='/nextcloud-server.git/tree/l10n/tr?h=v19.0.0RC1&amp;id=e75406e7120271ebfecf2260b95040509dfcf168'>tr</a>/<a href='/nextcloud-server.git/tree/l10n/tr/settings.po?h=v19.0.0RC1&amp;id=e75406e7120271ebfecf2260b95040509dfcf168'>settings.po</a></div><div class='content'>blob: 5f1b68bf3649574f800d7e6e315f2f5a99202aa4 (<a href='/nextcloud-server.git/plain/l10n/tr/settings.po?h=v19.0.0RC1&amp;id=e75406e7120271ebfecf2260b95040509dfcf168'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
<a id='n41' href='#n41'>41</a>
<a id='n42' href='#n42'>42</a>
<a id='n43' href='#n43'>43</a>
<a id='n44' href='#n44'>44</a>
<a id='n45' href='#n45'>45</a>
<a id='n46' href='#n46'>46</a>
<a id='n47' href='#n47'>47</a>
<a id='n48' href='#n48'>48</a>
<a id='n49' href='#n49'>49</a>
<a id='n50' href='#n50'>50</a>
<a id='n51' href='#n51'>51</a>
<a id='n52' href='#n52'>52</a>
<a id='n53' href='#n53'>53</a>
<a id='n54' href='#n54'>54</a>
<a id='n55' href='#n55'>55</a>
<a id='n56' href='#n56'>56</a>
<a id='n57' href='#n57'>57</a>
<a id='n58' href='#n58'>58</a>
<a id='n59' href='#n59'>59</a>
<a id='n60' href='#n60'>60</a>
<a id='n61' href='#n61'>61</a>
<a id='n62' href='#n62'>62</a>
<a id='n63' href='#n63'>63</a>
<a id='n64' href='#n64'>64</a>
<a id='n65' href='#n65'>65</a>
<a id='n66' href='#n66'>66</a>
<a id='n67' href='#n67'>67</a>
<a id='n68' href='#n68'>68</a>
<a id='n69' href='#n69'>69</a>
<a id='n70' href='#n70'>70</a>
<a id='n71' href='#n71'>71</a>
<a id='n72' href='#n72'>72</a>
<a id='n73' href='#n73'>73</a>
<a id='n74' href='#n74'>74</a>
<a id='n75' href='#n75'>75</a>
<a id='n76' href='#n76'>76</a>
<a id='n77' href='#n77'>77</a>
<a id='n78' href='#n78'>78</a>
<a id='n79' href='#n79'>79</a>
<a id='n80' href='#n80'>80</a>
<a id='n81' href='#n81'>81</a>
<a id='n82' href='#n82'>82</a>
<a id='n83' href='#n83'>83</a>
<a id='n84' href='#n84'>84</a>
<a id='n85' href='#n85'>85</a>
<a id='n86' href='#n86'>86</a>
<a id='n87' href='#n87'>87</a>
<a id='n88' href='#n88'>88</a>
<a id='n89' href='#n89'>89</a>
<a id='n90' href='#n90'>90</a>
<a id='n91' href='#n91'>91</a>
<a id='n92' href='#n92'>92</a>
<a id='n93' href='#n93'>93</a>
<a id='n94' href='#n94'>94</a>
<a id='n95' href='#n95'>95</a>
<a id='n96' href='#n96'>96</a>
<a id='n97' href='#n97'>97</a>
<a id='n98' href='#n98'>98</a>
<a id='n99' href='#n99'>99</a>
<a id='n100' href='#n100'>100</a>
<a id='n101' href='#n101'>101</a>
<a id='n102' href='#n102'>102</a>
<a id='n103' href='#n103'>103</a>
<a id='n104' href='#n104'>104</a>
<a id='n105' href='#n105'>105</a>
<a id='n106' href='#n106'>106</a>
<a id='n107' href='#n107'>107</a>
<a id='n108' href='#n108'>108</a>
<a id='n109' href='#n109'>109</a>
<a id='n110' href='#n110'>110</a>
<a id='n111' href='#n111'>111</a>
<a id='n112' href='#n112'>112</a>
<a id='n113' href='#n113'>113</a>
<a id='n114' href='#n114'>114</a>
<a id='n115' href='#n115'>115</a>
<a id='n116' href='#n116'>116</a>
<a id='n117' href='#n117'>117</a>
<a id='n118' href='#n118'>118</a>
<a id='n119' href='#n119'>119</a>
<a id='n120' href='#n120'>120</a>
<a id='n121' href='#n121'>121</a>
<a id='n122' href='#n122'>122</a>
<a id='n123' href='#n123'>123</a>
<a id='n124' href='#n124'>124</a>
<a id='n125' href='#n125'>125</a>
<a id='n126' href='#n126'>126</a>
<a id='n127' href='#n127'>127</a>
<a id='n128' href='#n128'>128</a>
<a id='n129' href='#n129'>129</a>
<a id='n130' href='#n130'>130</a>
<a id='n131' href='#n131'>131</a>
<a id='n132' href='#n132'>132</a>
<a id='n133' href='#n133'>133</a>
<a id='n134' href='#n134'>134</a>
<a id='n135' href='#n135'>135</a>
<a id='n136' href='#n136'>136</a>
<a id='n137' href='#n137'>137</a>
<a id='n138' href='#n138'>138</a>
<a id='n139' href='#n139'>139</a>
<a id='n140' href='#n140'>140</a>
<a id='n141' href='#n141'>141</a>
<a id='n142' href='#n142'>142</a>
<a id='n143' href='#n143'>143</a>
<a id='n144' href='#n144'>144</a>
<a id='n145' href='#n145'>145</a>
<a id='n146' href='#n146'>146</a>
<a id='n147' href='#n147'>147</a>
<a id='n148' href='#n148'>148</a>
<a id='n149' href='#n149'>149</a>
<a id='n150' href='#n150'>150</a>
<a id='n151' href='#n151'>151</a>
<a id='n152' href='#n152'>152</a>
<a id='n153' href='#n153'>153</a>
<a id='n154' href='#n154'>154</a>
<a id='n155' href='#n155'>155</a>
<a id='n156' href='#n156'>156</a>
<a id='n157' href='#n157'>157</a>
<a id='n158' href='#n158'>158</a>
<a id='n159' href='#n159'>159</a>
<a id='n160' href='#n160'>160</a>
<a id='n161' href='#n161'>161</a>
<a id='n162' href='#n162'>162</a>
<a id='n163' href='#n163'>163</a>
<a id='n164' href='#n164'>164</a>
<a id='n165' href='#n165'>165</a>
<a id='n166' href='#n166'>166</a>
<a id='n167' href='#n167'>167</a>
<a id='n168' href='#n168'>168</a>
<a id='n169' href='#n169'>169</a>
<a id='n170' href='#n170'>170</a>
<a id='n171' href='#n171'>171</a>
<a id='n172' href='#n172'>172</a>
<a id='n173' href='#n173'>173</a>
<a id='n174' href='#n174'>174</a>
<a id='n175' href='#n175'>175</a>
<a id='n176' href='#n176'>176</a>
<a id='n177' href='#n177'>177</a>
<a id='n178' href='#n178'>178</a>
<a id='n179' href='#n179'>179</a>
<a id='n180' href='#n180'>180</a>
<a id='n181' href='#n181'>181</a>
<a id='n182' href='#n182'>182</a>
<a id='n183' href='#n183'>183</a>
<a id='n184' href='#n184'>184</a>
<a id='n185' href='#n185'>185</a>
<a id='n186' href='#n186'>186</a>
<a id='n187' href='#n187'>187</a>
<a id='n188' href='#n188'>188</a>
<a id='n189' href='#n189'>189</a>
<a id='n190' href='#n190'>190</a>
<a id='n191' href='#n191'>191</a>
<a id='n192' href='#n192'>192</a>
<a id='n193' href='#n193'>193</a>
<a id='n194' href='#n194'>194</a>
<a id='n195' href='#n195'>195</a>
<a id='n196' href='#n196'>196</a>
<a id='n197' href='#n197'>197</a>
<a id='n198' href='#n198'>198</a>
<a id='n199' href='#n199'>199</a>
<a id='n200' href='#n200'>200</a>
<a id='n201' href='#n201'>201</a>
<a id='n202' href='#n202'>202</a>
<a id='n203' href='#n203'>203</a>
<a id='n204' href='#n204'>204</a>
<a id='n205' href='#n205'>205</a>
<a id='n206' href='#n206'>206</a>
<a id='n207' href='#n207'>207</a>
<a id='n208' href='#n208'>208</a>
<a id='n209' href='#n209'>209</a>
<a id='n210' href='#n210'>210</a>
<a id='n211' href='#n211'>211</a>
<a id='n212' href='#n212'>212</a>
<a id='n213' href='#n213'>213</a>
<a id='n214' href='#n214'>214</a>
<a id='n215' href='#n215'>215</a>
<a id='n216' href='#n216'>216</a>
<a id='n217' href='#n217'>217</a>
<a id='n218' href='#n218'>218</a>
<a id='n219' href='#n219'>219</a>
<a id='n220' href='#n220'>220</a>
<a id='n221' href='#n221'>221</a>
<a id='n222' href='#n222'>222</a>
<a id='n223' href='#n223'>223</a>
<a id='n224' href='#n224'>224</a>
<a id='n225' href='#n225'>225</a>
<a id='n226' href='#n226'>226</a>
<a id='n227' href='#n227'>227</a>
<a id='n228' href='#n228'>228</a>
<a id='n229' href='#n229'>229</a>
<a id='n230' href='#n230'>230</a>
<a id='n231' href='#n231'>231</a>
<a id='n232' href='#n232'>232</a>
<a id='n233' href='#n233'>233</a>
<a id='n234' href='#n234'>234</a>
<a id='n235' href='#n235'>235</a>
<a id='n236' href='#n236'>236</a>
<a id='n237' href='#n237'>237</a>
<a id='n238' href='#n238'>238</a>
<a id='n239' href='#n239'>239</a>
<a id='n240' href='#n240'>240</a>
<a id='n241' href='#n241'>241</a>
<a id='n242' href='#n242'>242</a>
<a id='n243' href='#n243'>243</a>
<a id='n244' href='#n244'>244</a>
<a id='n245' href='#n245'>245</a>
<a id='n246' href='#n246'>246</a>
<a id='n247' href='#n247'>247</a>
<a id='n248' href='#n248'>248</a>
<a id='n249' href='#n249'>249</a>
<a id='n250' href='#n250'>250</a>
<a id='n251' href='#n251'>251</a>
<a id='n252' href='#n252'>252</a>
<a id='n253' href='#n253'>253</a>
<a id='n254' href='#n254'>254</a>
<a id='n255' href='#n255'>255</a>
<a id='n256' href='#n256'>256</a>
<a id='n257' href='#n257'>257</a>
<a id='n258' href='#n258'>258</a>
<a id='n259' href='#n259'>259</a>
<a id='n260' href='#n260'>260</a>
<a id='n261' href='#n261'>261</a>
<a id='n262' href='#n262'>262</a>
<a id='n263' href='#n263'>263</a>
<a id='n264' href='#n264'>264</a>
<a id='n265' href='#n265'>265</a>
<a id='n266' href='#n266'>266</a>
<a id='n267' href='#n267'>267</a>
<a id='n268' href='#n268'>268</a>
<a id='n269' href='#n269'>269</a>
<a id='n270' href='#n270'>270</a>
<a id='n271' href='#n271'>271</a>
<a id='n272' href='#n272'>272</a>
<a id='n273' href='#n273'>273</a>
<a id='n274' href='#n274'>274</a>
<a id='n275' href='#n275'>275</a>
<a id='n276' href='#n276'>276</a>
<a id='n277' href='#n277'>277</a>
<a id='n278' href='#n278'>278</a>
<a id='n279' href='#n279'>279</a>
<a id='n280' href='#n280'>280</a>
<a id='n281' href='#n281'>281</a>
<a id='n282' href='#n282'>282</a>
<a id='n283' href='#n283'>283</a>
<a id='n284' href='#n284'>284</a>
<a id='n285' href='#n285'>285</a>
<a id='n286' href='#n286'>286</a>
<a id='n287' href='#n287'>287</a>
<a id='n288' href='#n288'>288</a>
<a id='n289' href='#n289'>289</a>
<a id='n290' href='#n290'>290</a>
<a id='n291' href='#n291'>291</a>
<a id='n292' href='#n292'>292</a>
<a id='n293' href='#n293'>293</a>
<a id='n294' href='#n294'>294</a>
<a id='n295' href='#n295'>295</a>
<a id='n296' href='#n296'>296</a>
<a id='n297' href='#n297'>297</a>
<a id='n298' href='#n298'>298</a>
<a id='n299' href='#n299'>299</a>
<a id='n300' href='#n300'>300</a>
<a id='n301' href='#n301'>301</a>
<a id='n302' href='#n302'>302</a>
<a id='n303' href='#n303'>303</a>
<a id='n304' href='#n304'>304</a>
<a id='n305' href='#n305'>305</a>
<a id='n306' href='#n306'>306</a>
<a id='n307' href='#n307'>307</a>
<a id='n308' href='#n308'>308</a>
<a id='n309' href='#n309'>309</a>
<a id='n310' href='#n310'>310</a>
<a id='n311' href='#n311'>311</a>
<a id='n312' href='#n312'>312</a>
<a id='n313' href='#n313'>313</a>
<a id='n314' href='#n314'>314</a>
<a id='n315' href='#n315'>315</a>
<a id='n316' href='#n316'>316</a>
<a id='n317' href='#n317'>317</a>
<a id='n318' href='#n318'>318</a>
<a id='n319' href='#n319'>319</a>
<a id='n320' href='#n320'>320</a>
<a id='n321' href='#n321'>321</a>
<a id='n322' href='#n322'>322</a>
<a id='n323' href='#n323'>323</a>
<a id='n324' href='#n324'>324</a>
<a id='n325' href='#n325'>325</a>
<a id='n326' href='#n326'>326</a>
<a id='n327' href='#n327'>327</a>
<a id='n328' href='#n328'>328</a>
<a id='n329' href='#n329'>329</a>
<a id='n330' href='#n330'>330</a>
<a id='n331' href='#n331'>331</a>
<a id='n332' href='#n332'>332</a>
<a id='n333' href='#n333'>333</a>
<a id='n334' href='#n334'>334</a>
<a id='n335' href='#n335'>335</a>
<a id='n336' href='#n336'>336</a>
<a id='n337' href='#n337'>337</a>
<a id='n338' href='#n338'>338</a>
<a id='n339' href='#n339'>339</a>
<a id='n340' href='#n340'>340</a>
<a id='n341' href='#n341'>341</a>
<a id='n342' href='#n342'>342</a>
<a id='n343' href='#n343'>343</a>
<a id='n344' href='#n344'>344</a>
<a id='n345' href='#n345'>345</a>
<a id='n346' href='#n346'>346</a>
<a id='n347' href='#n347'>347</a>
<a id='n348' href='#n348'>348</a>
<a id='n349' href='#n349'>349</a>
<a id='n350' href='#n350'>350</a>
<a id='n351' href='#n351'>351</a>
<a id='n352' href='#n352'>352</a>
<a id='n353' href='#n353'>353</a>
<a id='n354' href='#n354'>354</a>
<a id='n355' href='#n355'>355</a>
<a id='n356' href='#n356'>356</a>
<a id='n357' href='#n357'>357</a>
<a id='n358' href='#n358'>358</a>
<a id='n359' href='#n359'>359</a>
<a id='n360' href='#n360'>360</a>
<a id='n361' href='#n361'>361</a>
<a id='n362' href='#n362'>362</a>
<a id='n363' href='#n363'>363</a>
<a id='n364' href='#n364'>364</a>
<a id='n365' href='#n365'>365</a>
<a id='n366' href='#n366'>366</a>
<a id='n367' href='#n367'>367</a>
<a id='n368' href='#n368'>368</a>
<a id='n369' href='#n369'>369</a>
<a id='n370' href='#n370'>370</a>
<a id='n371' href='#n371'>371</a>
<a id='n372' href='#n372'>372</a>
<a id='n373' href='#n373'>373</a>
<a id='n374' href='#n374'>374</a>
<a id='n375' href='#n375'>375</a>
<a id='n376' href='#n376'>376</a>
<a id='n377' href='#n377'>377</a>
<a id='n378' href='#n378'>378</a>
<a id='n379' href='#n379'>379</a>
<a id='n380' href='#n380'>380</a>
<a id='n381' href='#n381'>381</a>
<a id='n382' href='#n382'>382</a>
<a id='n383' href='#n383'>383</a>
<a id='n384' href='#n384'>384</a>
<a id='n385' href='#n385'>385</a>
<a id='n386' href='#n386'>386</a>
<a id='n387' href='#n387'>387</a>
<a id='n388' href='#n388'>388</a>
<a id='n389' href='#n389'>389</a>
<a id='n390' href='#n390'>390</a>
<a id='n391' href='#n391'>391</a>
<a id='n392' href='#n392'>392</a>
<a id='n393' href='#n393'>393</a>
<a id='n394' href='#n394'>394</a>
<a id='n395' href='#n395'>395</a>
<a id='n396' href='#n396'>396</a>
<a id='n397' href='#n397'>397</a>
<a id='n398' href='#n398'>398</a>
<a id='n399' href='#n399'>399</a>
<a id='n400' href='#n400'>400</a>
<a id='n401' href='#n401'>401</a>
<a id='n402' href='#n402'>402</a>
<a id='n403' href='#n403'>403</a>
<a id='n404' href='#n404'>404</a>
<a id='n405' href='#n405'>405</a>
<a id='n406' href='#n406'>406</a>
<a id='n407' href='#n407'>407</a>
<a id='n408' href='#n408'>408</a>
<a id='n409' href='#n409'>409</a>
<a id='n410' href='#n410'>410</a>
<a id='n411' href='#n411'>411</a>
<a id='n412' href='#n412'>412</a>
<a id='n413' href='#n413'>413</a>
<a id='n414' href='#n414'>414</a>
<a id='n415' href='#n415'>415</a>
<a id='n416' href='#n416'>416</a>
<a id='n417' href='#n417'>417</a>
<a id='n418' href='#n418'>418</a>
<a id='n419' href='#n419'>419</a>
<a id='n420' href='#n420'>420</a>
<a id='n421' href='#n421'>421</a>
<a id='n422' href='#n422'>422</a>
<a id='n423' href='#n423'>423</a>
<a id='n424' href='#n424'>424</a>
<a id='n425' href='#n425'>425</a>
<a id='n426' href='#n426'>426</a>
<a id='n427' href='#n427'>427</a>
<a id='n428' href='#n428'>428</a>
<a id='n429' href='#n429'>429</a>
<a id='n430' href='#n430'>430</a>
<a id='n431' href='#n431'>431</a>
<a id='n432' href='#n432'>432</a>
<a id='n433' href='#n433'>433</a>
<a id='n434' href='#n434'>434</a>
<a id='n435' href='#n435'>435</a>
<a id='n436' href='#n436'>436</a>
<a id='n437' href='#n437'>437</a>
<a id='n438' href='#n438'>438</a>
<a id='n439' href='#n439'>439</a>
<a id='n440' href='#n440'>440</a>
<a id='n441' href='#n441'>441</a>
<a id='n442' href='#n442'>442</a>
<a id='n443' href='#n443'>443</a>
<a id='n444' href='#n444'>444</a>
<a id='n445' href='#n445'>445</a>
<a id='n446' href='#n446'>446</a>
<a id='n447' href='#n447'>447</a>
<a id='n448' href='#n448'>448</a>
<a id='n449' href='#n449'>449</a>
<a id='n450' href='#n450'>450</a>
<a id='n451' href='#n451'>451</a>
<a id='n452' href='#n452'>452</a>
<a id='n453' href='#n453'>453</a>
<a id='n454' href='#n454'>454</a>
<a id='n455' href='#n455'>455</a>
<a id='n456' href='#n456'>456</a>
<a id='n457' href='#n457'>457</a>
<a id='n458' href='#n458'>458</a>
<a id='n459' href='#n459'>459</a>
<a id='n460' href='#n460'>460</a>
<a id='n461' href='#n461'>461</a>
<a id='n462' href='#n462'>462</a>
<a id='n463' href='#n463'>463</a>
<a id='n464' href='#n464'>464</a>
<a id='n465' href='#n465'>465</a>
<a id='n466' href='#n466'>466</a>
<a id='n467' href='#n467'>467</a>
<a id='n468' href='#n468'>468</a>
<a id='n469' href='#n469'>469</a>
<a id='n470' href='#n470'>470</a>
<a id='n471' href='#n471'>471</a>
<a id='n472' href='#n472'>472</a>
<a id='n473' href='#n473'>473</a>
<a id='n474' href='#n474'>474</a>
<a id='n475' href='#n475'>475</a>
<a id='n476' href='#n476'>476</a>
<a id='n477' href='#n477'>477</a>
<a id='n478' href='#n478'>478</a>
<a id='n479' href='#n479'>479</a>
<a id='n480' href='#n480'>480</a>
<a id='n481' href='#n481'>481</a>
<a id='n482' href='#n482'>482</a>
<a id='n483' href='#n483'>483</a>
<a id='n484' href='#n484'>484</a>
<a id='n485' href='#n485'>485</a>
<a id='n486' href='#n486'>486</a>
<a id='n487' href='#n487'>487</a>
<a id='n488' href='#n488'>488</a>
<a id='n489' href='#n489'>489</a>
<a id='n490' href='#n490'>490</a>
<a id='n491' href='#n491'>491</a>
<a id='n492' href='#n492'>492</a>
<a id='n493' href='#n493'>493</a>
<a id='n494' href='#n494'>494</a>
<a id='n495' href='#n495'>495</a>
<a id='n496' href='#n496'>496</a>
<a id='n497' href='#n497'>497</a>
<a id='n498' href='#n498'>498</a>
<a id='n499' href='#n499'>499</a>
<a id='n500' href='#n500'>500</a>
<a id='n501' href='#n501'>501</a>
<a id='n502' href='#n502'>502</a>
<a id='n503' href='#n503'>503</a>
<a id='n504' href='#n504'>504</a>
<a id='n505' href='#n505'>505</a>
<a id='n506' href='#n506'>506</a>
<a id='n507' href='#n507'>507</a>
<a id='n508' href='#n508'>508</a>
</pre></td>
<td class='lines'><pre><code><style>pre { line-height: 125%; }
td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span></span><span class="c1"># SOME DESCRIPTIVE TITLE.</span>
<span class="c1"># Copyright (C) YEAR THE PACKAGE&#39;S COPYRIGHT HOLDER</span>
<span class="c1"># This file is distributed under the same license as the PACKAGE package.</span>
<span class="c1"># </span>
<span class="c1"># Translators:</span>
<span class="c1"># Aranel Surion &lt;aranel@aranelsurion.org&gt;, 2011-2013.</span>
<span class="c1"># Caner Başaran &lt;basaran.caner@gmail.com&gt;, 2013.</span>
<span class="c1"># Emre  &lt;emresaracoglu@live.com&gt;, 2012.</span>
<span class="c1"># H.Oktay Tefenli &lt;otefenli@gmail.com&gt;, 2013.</span>
<span class="c1">#   &lt;info@beyboo.de&gt;, 2012.</span>
<span class="c1"># ismail yenigul &lt;ismail.yenigul@surgate.com&gt;, 2013.</span>
<span class="c1"># Necdet Yücel &lt;necdetyucel@gmail.com&gt;, 2012.</span>
<span class="c1"># Tolga Gezginiş &lt;tgezginis@gmail.com&gt;, 2013.</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;</span><span class="py">Project-Id-Version:</span><span class="s"> ownCloud\n&quot;</span>
<span class="s">&quot;</span><span class="py">Report-Msgid-Bugs-To:</span><span class="s"> http://bugs.owncloud.org/\n&quot;</span>
<span class="s">&quot;</span><span class="py">POT-Creation-Date:</span><span class="s"> 2013-03-31 00:01+0100\n&quot;</span>
<span class="s">&quot;</span><span class="py">PO-Revision-Date:</span><span class="s"> 2013-03-29 23:20+0000\n&quot;</span>
<span class="s">&quot;</span><span class="py">Last-Translator:</span><span class="s"> I Robot &lt;owncloud-bot@tmit.eu&gt;\n&quot;</span>
<span class="s">&quot;</span><span class="py">Language-Team:</span><span class="s"> Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n&quot;</span>
<span class="s">&quot;</span><span class="py">MIME-Version:</span><span class="s"> 1.0\n&quot;</span>
<span class="s">&quot;</span><span class="py">Content-Type:</span><span class="s"> text/plain; charset=UTF-8\n&quot;</span>
<span class="s">&quot;</span><span class="py">Content-Transfer-Encoding:</span><span class="s"> 8bit\n&quot;</span>
<span class="s">&quot;</span><span class="py">Language:</span><span class="s"> tr\n&quot;</span>
<span class="s">&quot;</span><span class="py">Plural-Forms:</span><span class="s"> nplurals=2; plural=(n &gt; 1);\n&quot;</span>

<span class="kd">#: ajax/apps/ocs.php:20</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to load list from App Store&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;App Store&#39;dan liste yüklenemiyor&quot;</span>

<span class="kd">#: ajax/changedisplayname.php:23 ajax/removeuser.php:15 ajax/setquota.php:17</span>
<span class="kd">#: ajax/togglegroups.php:20</span>
<span class="nv">msgid</span> <span class="s">&quot;Authentication error&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Eşleşme hata&quot;</span>

<span class="kd">#: ajax/changedisplayname.php:32</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to change display name&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Ekran adı değiştirilemiyor&quot;</span>

<span class="kd">#: ajax/creategroup.php:10</span>
<span class="nv">msgid</span> <span class="s">&quot;Group already exists&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Grup zaten mevcut&quot;</span>

<span class="kd">#: ajax/creategroup.php:19</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to add group&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Gruba eklenemiyor&quot;</span>

<span class="kd">#: ajax/enableapp.php:11</span>
<span class="nv">msgid</span> <span class="s">&quot;Could not enable app. &quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Uygulama devreye alınamadı&quot;</span>

<span class="kd">#: ajax/lostpassword.php:12</span>
<span class="nv">msgid</span> <span class="s">&quot;Email saved&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Eposta kaydedildi&quot;</span>

<span class="kd">#: ajax/lostpassword.php:14</span>
<span class="nv">msgid</span> <span class="s">&quot;Invalid email&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Geçersiz eposta&quot;</span>

<span class="kd">#: ajax/removegroup.php:13</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to delete group&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Grup silinemiyor&quot;</span>

<span class="kd">#: ajax/removeuser.php:24</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to delete user&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kullanıcı silinemiyor&quot;</span>

<span class="kd">#: ajax/setlanguage.php:15</span>
<span class="nv">msgid</span> <span class="s">&quot;Language changed&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Dil değiştirildi&quot;</span>

<span class="kd">#: ajax/setlanguage.php:17 ajax/setlanguage.php:20</span>
<span class="nv">msgid</span> <span class="s">&quot;Invalid request&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Geçersiz istek&quot;</span>

<span class="kd">#: ajax/togglegroups.php:12</span>
<span class="nv">msgid</span> <span class="s">&quot;Admins can&#39;t remove themself from the admin group&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Yöneticiler kendilerini yönetici grubundan kaldıramaz&quot;</span>

<span class="kd">#: ajax/togglegroups.php:30</span>
<span class="kt">#, php-format</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to add user to group %s&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kullanıcı %s grubuna eklenemiyor&quot;</span>

<span class="kd">#: ajax/togglegroups.php:36</span>
<span class="kt">#, php-format</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to remove user from group %s&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;%s grubundan kullanıcı kaldırılamıyor&quot;</span>

<span class="kd">#: ajax/updateapp.php:14</span>
<span class="nv">msgid</span> <span class="s">&quot;Couldn&#39;t update app.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Uygulama güncellenemedi.&quot;</span>

<span class="kd">#: js/apps.js:30</span>
<span class="nv">msgid</span> <span class="s">&quot;Update to {appversion}&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;{appversion} Güncelle&quot;</span>

<span class="kd">#: js/apps.js:36 js/apps.js:76</span>
<span class="nv">msgid</span> <span class="s">&quot;Disable&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Etkin değil&quot;</span>

<span class="kd">#: js/apps.js:36 js/apps.js:64 js/apps.js:83</span>
<span class="nv">msgid</span> <span class="s">&quot;Enable&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Etkin&quot;</span>

<span class="kd">#: js/apps.js:55</span>
<span class="nv">msgid</span> <span class="s">&quot;Please wait....&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Lütfen bekleyin....&quot;</span>

<span class="kd">#: js/apps.js:90</span>
<span class="nv">msgid</span> <span class="s">&quot;Updating....&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Güncelleniyor....&quot;</span>

<span class="kd">#: js/apps.js:93</span>
<span class="nv">msgid</span> <span class="s">&quot;Error while updating app&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Uygulama güncellenirken hata&quot;</span>

<span class="kd">#: js/apps.js:93</span>
<span class="nv">msgid</span> <span class="s">&quot;Error&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Hata&quot;</span>

<span class="kd">#: js/apps.js:96</span>
<span class="nv">msgid</span> <span class="s">&quot;Updated&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Güncellendi&quot;</span>

<span class="kd">#: js/personal.js:99</span>
<span class="nv">msgid</span> <span class="s">&quot;Saving...&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kaydediliyor...&quot;</span>

<span class="kd">#: js/users.js:31</span>
<span class="nv">msgid</span> <span class="s">&quot;deleted&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;silindi&quot;</span>

<span class="kd">#: js/users.js:31</span>
<span class="nv">msgid</span> <span class="s">&quot;undo&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;geri al&quot;</span>

<span class="kd">#: js/users.js:63</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to remove user&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kullanıcı kaldırılamıyor&quot;</span>

<span class="kd">#: js/users.js:76 templates/users.php:26 templates/users.php:80</span>
<span class="kd">#: templates/users.php:105</span>
<span class="nv">msgid</span> <span class="s">&quot;Groups&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Gruplar&quot;</span>

<span class="kd">#: js/users.js:79 templates/users.php:82 templates/users.php:119</span>
<span class="nv">msgid</span> <span class="s">&quot;Group Admin&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Yönetici Grubu &quot;</span>

<span class="kd">#: js/users.js:99 templates/users.php:161</span>
<span class="nv">msgid</span> <span class="s">&quot;Delete&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Sil&quot;</span>

<span class="kd">#: js/users.js:243</span>
<span class="nv">msgid</span> <span class="s">&quot;add group&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;grup ekle&quot;</span>

<span class="kd">#: js/users.js:407</span>
<span class="nv">msgid</span> <span class="s">&quot;A valid username must be provided&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Geçerli bir kullanıcı adı mutlaka sağlanmalı&quot;</span>

<span class="kd">#: js/users.js:408 js/users.js:414 js/users.js:429</span>
<span class="nv">msgid</span> <span class="s">&quot;Error creating user&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kullanıcı oluşturulurken hata&quot;</span>

<span class="kd">#: js/users.js:413</span>
<span class="nv">msgid</span> <span class="s">&quot;A valid password must be provided&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Geçerli bir parola mutlaka sağlanmalı&quot;</span>

<span class="kd">#: personal.php:29 personal.php:30</span>
<span class="nv">msgid</span> <span class="s">&quot;__language_name__&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;__dil_adı__&quot;</span>

<span class="kd">#: templates/admin.php:15</span>
<span class="nv">msgid</span> <span class="s">&quot;Security Warning&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Güvenlik Uyarisi&quot;</span>

<span class="kd">#: templates/admin.php:18</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;Your data directory and your files are probably accessible from the &quot;</span>
<span class="s">&quot;internet. The .htaccess file that ownCloud provides is not working. We &quot;</span>
<span class="s">&quot;strongly suggest that you configure your webserver in a way that the data &quot;</span>
<span class="s">&quot;directory is no longer accessible or you move the data directory outside the&quot;</span>
<span class="s">&quot; webserver document root.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. Owncloud tarafından sağlanan .htaccess  dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.&quot;</span>

<span class="kd">#: templates/admin.php:29</span>
<span class="nv">msgid</span> <span class="s">&quot;Setup Warning&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kurulum Uyarısı&quot;</span>

<span class="kd">#: templates/admin.php:32</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;Your web server is not yet properly setup to allow files synchronization &quot;</span>
<span class="s">&quot;because the WebDAV interface seems to be broken.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.&quot;</span>

<span class="kd">#: templates/admin.php:33</span>
<span class="kt">#, php-format</span>
<span class="nv">msgid</span> <span class="s">&quot;Please double check the &lt;a href=&#39;%s&#39;&gt;installation guides&lt;/a&gt;.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Lütfen &lt;a href=&#39;%s&#39;&gt;kurulum kılavuzlarını&lt;/a&gt; iki kez kontrol edin.&quot;</span>

<span class="kd">#: templates/admin.php:44</span>
<span class="nv">msgid</span> <span class="s">&quot;Module &#39;fileinfo&#39; missing&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Modül &#39;fileinfo&#39; kayıp&quot;</span>

<span class="kd">#: templates/admin.php:47</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;The PHP module &#39;fileinfo&#39; is missing. We strongly recommend to enable this &quot;</span>
<span class="s">&quot;module to get best results with mime-type detection.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;PHP modülü &#39;fileinfo&#39; kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.&quot;</span>

<span class="kd">#: templates/admin.php:58</span>
<span class="nv">msgid</span> <span class="s">&quot;Locale not working&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Locale çalışmıyor.&quot;</span>

<span class="kd">#: templates/admin.php:63</span>
<span class="kt">#, php-format</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;This ownCloud server can&#39;t set system locale to %s. This means that there &quot;</span>
<span class="s">&quot;might be problems with certain characters in file names. We strongly suggest&quot;</span>
<span class="s">&quot; to install the required packages on your system to support %s.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>

<span class="kd">#: templates/admin.php:75</span>
<span class="nv">msgid</span> <span class="s">&quot;Internet connection not working&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;İnternet bağlantısı çalışmıyor&quot;</span>

<span class="kd">#: templates/admin.php:78</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;This ownCloud server has no working internet connection. This means that &quot;</span>
<span class="s">&quot;some of the features like mounting of external storage, notifications about &quot;</span>
<span class="s">&quot;updates or installation of 3rd party apps don´t work. Accessing files from &quot;</span>
<span class="s">&quot;remote and sending of notification emails might also not work. We suggest to&quot;</span>
<span class="s">&quot; enable internet connection for this server if you want to have all features&quot;</span>
<span class="s">&quot; of ownCloud.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;ownCloud sunucusunun internet bağlantısı yok. Bu nedenle harici depolama bağlantısı, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacaktır. Uzak dosyalara erişim ve e-posta ile bildirim gönderme çalışmayacak. Eğer ownCloud tüm özelliklerini kullanmak istiyorsanız, internet bağlantısı gerekmektedir.&quot;</span>

<span class="kd">#: templates/admin.php:92</span>
<span class="nv">msgid</span> <span class="s">&quot;Cron&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Cron&quot;</span>

<span class="kd">#: templates/admin.php:101</span>
<span class="nv">msgid</span> <span class="s">&quot;Execute one task with each page loaded&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>

<span class="kd">#: templates/admin.php:111</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;cron.php is registered at a webcron service. Call the cron.php page in the &quot;</span>
<span class="s">&quot;owncloud root once a minute over http.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>

<span class="kd">#: templates/admin.php:121</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;Use systems cron service. Call the cron.php file in the owncloud folder via &quot;</span>
<span class="s">&quot;a system cronjob once a minute.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>

<span class="kd">#: templates/admin.php:128</span>
<span class="nv">msgid</span> <span class="s">&quot;Sharing&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Paylaşım&quot;</span>

<span class="kd">#: templates/admin.php:134</span>
<span class="nv">msgid</span> <span class="s">&quot;Enable Share API&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Paylaşım API&#39;sini etkinleştir.&quot;</span>

<span class="kd">#: templates/admin.php:135</span>
<span class="nv">msgid</span> <span class="s">&quot;Allow apps to use the Share API&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Uygulamaların paylaşım API&#39;sini kullanmasına izin ver&quot;</span>

<span class="kd">#: templates/admin.php:142</span>
<span class="nv">msgid</span> <span class="s">&quot;Allow links&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Bağlantıları izin ver.&quot;</span>

<span class="kd">#: templates/admin.php:143</span>
<span class="nv">msgid</span> <span class="s">&quot;Allow users to share items to the public with links&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kullanıcıların nesneleri paylaşımı için herkese açık bağlantılara izin ver&quot;</span>

<span class="kd">#: templates/admin.php:150</span>
<span class="nv">msgid</span> <span class="s">&quot;Allow resharing&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Paylaşıma izin ver&quot;</span>

<span class="kd">#: templates/admin.php:151</span>
<span class="nv">msgid</span> <span class="s">&quot;Allow users to share items shared with them again&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>

<span class="kd">#: templates/admin.php:158</span>
<span class="nv">msgid</span> <span class="s">&quot;Allow users to share with anyone&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kullanıcıların herşeyi paylaşmalarına izin ver&quot;</span>

<span class="kd">#: templates/admin.php:161</span>
<span class="nv">msgid</span> <span class="s">&quot;Allow users to only share with users in their groups&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>

<span class="kd">#: templates/admin.php:168</span>
<span class="nv">msgid</span> <span class="s">&quot;Security&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Güvenlik&quot;</span>

<span class="kd">#: templates/admin.php:181</span>
<span class="nv">msgid</span> <span class="s">&quot;Enforce HTTPS&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;HTTPS bağlantısına zorla&quot;</span>

<span class="kd">#: templates/admin.php:182</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;Enforces the clients to connect to ownCloud via an encrypted connection.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>

<span class="kd">#: templates/admin.php:185</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;Please connect to this ownCloud instance via HTTPS to enable or disable the &quot;</span>
<span class="s">&quot;SSL enforcement.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>

<span class="kd">#: templates/admin.php:195</span>
<span class="nv">msgid</span> <span class="s">&quot;Log&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kayıtlar&quot;</span>

<span class="kd">#: templates/admin.php:196</span>
<span class="nv">msgid</span> <span class="s">&quot;Log level&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Günlük seviyesi&quot;</span>

<span class="kd">#: templates/admin.php:223</span>
<span class="nv">msgid</span> <span class="s">&quot;More&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Daha fazla&quot;</span>

<span class="kd">#: templates/admin.php:224</span>
<span class="nv">msgid</span> <span class="s">&quot;Less&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Az&quot;</span>

<span class="kd">#: templates/admin.php:231 templates/personal.php:102</span>
<span class="nv">msgid</span> <span class="s">&quot;Version&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Sürüm&quot;</span>

<span class="kd">#: templates/admin.php:234 templates/personal.php:105</span>
<span class="nv">msgid</span> <span class="s">&quot;&quot;</span>
<span class="s">&quot;Developed by the &lt;a href=\&quot;http://ownCloud.org/contact\&quot; &quot;</span>
<span class="s">&quot;target=\&quot;_blank\&quot;&gt;ownCloud community&lt;/a&gt;, the &lt;a &quot;</span>
<span class="s">&quot;href=\&quot;https://github.com/owncloud\&quot; target=\&quot;_blank\&quot;&gt;source code&lt;/a&gt; is &quot;</span>
<span class="s">&quot;licensed under the &lt;a href=\&quot;http://www.gnu.org/licenses/agpl-3.0.html\&quot; &quot;</span>
<span class="s">&quot;target=\&quot;_blank\&quot;&gt;&lt;abbr title=\&quot;Affero General Public &quot;</span>
<span class="s">&quot;License\&quot;&gt;AGPL&lt;/abbr&gt;&lt;/a&gt;.&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Geliştirilen Taraf&lt;a href=\&quot;http://ownCloud.org/contact\&quot; target=\&quot;_blank\&quot;&gt;ownCloud community&lt;/a&gt;, the &lt;a href=\&quot;https://github.com/owncloud\&quot; target=\&quot;_blank\&quot;&gt;source code&lt;/a&gt; is altında lisanslanmıştır &lt;a href=\&quot;http://www.gnu.org/licenses/agpl-3.0.html\&quot; target=\&quot;_blank\&quot;&gt;&lt;abbr title=\&quot;Affero General Public License\&quot;&gt;AGPL&lt;/abbr&gt;&lt;/a&gt;.&quot;</span>

<span class="kd">#: templates/apps.php:11</span>
<span class="nv">msgid</span> <span class="s">&quot;Add your App&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Uygulamanı Ekle&quot;</span>

<span class="kd">#: templates/apps.php:12</span>
<span class="nv">msgid</span> <span class="s">&quot;More Apps&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Daha fazla uygulama&quot;</span>

<span class="kd">#: templates/apps.php:28</span>
<span class="nv">msgid</span> <span class="s">&quot;Select an App&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Bir uygulama seçin&quot;</span>

<span class="kd">#: templates/apps.php:34</span>
<span class="nv">msgid</span> <span class="s">&quot;See application page at apps.owncloud.com&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Uygulamanın sayfasına apps.owncloud.com adresinden bakın &quot;</span>

<span class="kd">#: templates/apps.php:36</span>
<span class="nv">msgid</span> <span class="s">&quot;&lt;span class=\&quot;licence\&quot;&gt;&lt;/span&gt;-licensed by &lt;span class=\&quot;author\&quot;&gt;&lt;/span&gt;&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;&lt;span class=\&quot;licence\&quot;&gt;&lt;/span&gt;-lisanslayan &lt;span class=\&quot;author\&quot;&gt;&lt;/span&gt;&quot;</span>

<span class="kd">#: templates/apps.php:38</span>
<span class="nv">msgid</span> <span class="s">&quot;Update&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Güncelleme&quot;</span>

<span class="kd">#: templates/help.php:4</span>
<span class="nv">msgid</span> <span class="s">&quot;User Documentation&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kullanıcı Belgelendirmesi&quot;</span>

<span class="kd">#: templates/help.php:6</span>
<span class="nv">msgid</span> <span class="s">&quot;Administrator Documentation&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Yönetici Belgelendirmesi&quot;</span>

<span class="kd">#: templates/help.php:9</span>
<span class="nv">msgid</span> <span class="s">&quot;Online Documentation&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Çevrimiçi Belgelendirme&quot;</span>

<span class="kd">#: templates/help.php:11</span>
<span class="nv">msgid</span> <span class="s">&quot;Forum&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Forum&quot;</span>

<span class="kd">#: templates/help.php:14</span>
<span class="nv">msgid</span> <span class="s">&quot;Bugtracker&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Hata Takip Sistemi&quot;</span>

<span class="kd">#: templates/help.php:17</span>
<span class="nv">msgid</span> <span class="s">&quot;Commercial Support&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Ticari Destek&quot;</span>

<span class="kd">#: templates/personal.php:8</span>
<span class="kt">#, php-format</span>
<span class="nv">msgid</span> <span class="s">&quot;You have used &lt;strong&gt;%s&lt;/strong&gt; of the available &lt;strong&gt;%s&lt;/strong&gt;&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Kullandığınız:&lt;strong&gt;%s&lt;/strong&gt; seçilebilecekler: &lt;strong&gt;%s&lt;/strong&gt;&quot;</span>

<span class="kd">#: templates/personal.php:15</span>
<span class="nv">msgid</span> <span class="s">&quot;Get the apps to sync your files&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Dosyalarınızı senkronize etmek için uygulamayı indirin&quot;</span>

<span class="kd">#: templates/personal.php:26</span>
<span class="nv">msgid</span> <span class="s">&quot;Show First Run Wizard again&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;İlk Çalıştırma Sihirbazını yeniden göster&quot;</span>

<span class="kd">#: templates/personal.php:37 templates/users.php:23 templates/users.php:79</span>
<span class="nv">msgid</span> <span class="s">&quot;Password&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Parola&quot;</span>

<span class="kd">#: templates/personal.php:38</span>
<span class="nv">msgid</span> <span class="s">&quot;Your password was changed&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Şifreniz değiştirildi&quot;</span>

<span class="kd">#: templates/personal.php:39</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to change your password&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Parolanız değiştirilemiyor&quot;</span>

<span class="kd">#: templates/personal.php:40</span>
<span class="nv">msgid</span> <span class="s">&quot;Current password&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Mevcut parola&quot;</span>

<span class="kd">#: templates/personal.php:42</span>
<span class="nv">msgid</span> <span class="s">&quot;New password&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Yeni parola&quot;</span>

<span class="kd">#: templates/personal.php:44</span>
<span class="nv">msgid</span> <span class="s">&quot;Change password&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Parola değiştir&quot;</span>

<span class="kd">#: templates/personal.php:56 templates/users.php:78</span>
<span class="nv">msgid</span> <span class="s">&quot;Display Name&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Ekran Adı&quot;</span>

<span class="kd">#: templates/personal.php:57</span>
<span class="nv">msgid</span> <span class="s">&quot;Your display name was changed&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Ekran adınız değiştirildi&quot;</span>

<span class="kd">#: templates/personal.php:58</span>
<span class="nv">msgid</span> <span class="s">&quot;Unable to change your display name&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Ekran adınız değiştirilemiyor&quot;</span>

<span class="kd">#: templates/personal.php:61</span>
<span class="nv">msgid</span> <span class="s">&quot;Change display name&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Ekran adını değiştir&quot;</span>

<span class="kd">#: templates/personal.php:70</span>
<span class="nv">msgid</span> <span class="s">&quot;Email&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Eposta&quot;</span>

<span class="kd">#: templates/personal.php:72</span>
<span class="nv">msgid</span> <span class="s">&quot;Your email address&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Eposta adresiniz&quot;</span>

<span class="kd">#: templates/personal.php:73</span>
<span class="nv">msgid</span> <span class="s">&quot;Fill in an email address to enable password recovery&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Parola sıfırlamayı aktifleştirmek için eposta adresi girin&quot;</span>

<span class="kd">#: templates/personal.php:79 templates/personal.php:80</span>
<span class="nv">msgid</span> <span class="s">&quot;Language&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Dil&quot;</span>

<span class="kd">#: templates/personal.php:86</span>
<span class="nv">msgid</span> <span class="s">&quot;Help translate&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Çevirilere yardım edin&quot;</span>

<span class="kd">#: templates/personal.php:91</span>
<span class="nv">msgid</span> <span class="s">&quot;WebDAV&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;WebDAV&quot;</span>

<span class="kd">#: templates/personal.php:93</span>
<span class="nv">msgid</span> <span class="s">&quot;Use this address to connect to your ownCloud in your file manager&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Bu adresi kullanarak ownCloud &#39;unuza dosya yöneticinizde bağlanın&quot;</span>

<span class="kd">#: templates/users.php:21 templates/users.php:77</span>
<span class="nv">msgid</span> <span class="s">&quot;Login Name&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Giriş Adı&quot;</span>

<span class="kd">#: templates/users.php:32</span>
<span class="nv">msgid</span> <span class="s">&quot;Create&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Oluştur&quot;</span>

<span class="kd">#: templates/users.php:35</span>
<span class="nv">msgid</span> <span class="s">&quot;Default Storage&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Varsayılan Depolama&quot;</span>

<span class="kd">#: templates/users.php:41 templates/users.php:139</span>
<span class="nv">msgid</span> <span class="s">&quot;Unlimited&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Limitsiz&quot;</span>

<span class="kd">#: templates/users.php:59 templates/users.php:154</span>
<span class="nv">msgid</span> <span class="s">&quot;Other&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Diğer&quot;</span>

<span class="kd">#: templates/users.php:84</span>
<span class="nv">msgid</span> <span class="s">&quot;Storage&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Depolama&quot;</span>

<span class="kd">#: templates/users.php:95</span>
<span class="nv">msgid</span> <span class="s">&quot;change display name&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;ekran adını değiştir&quot;</span>

<span class="kd">#: templates/users.php:99</span>
<span class="nv">msgid</span> <span class="s">&quot;set new password&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;yeni parola belirle&quot;</span>

<span class="kd">#: templates/users.php:134</span>
<span class="nv">msgid</span> <span class="s">&quot;Default&quot;</span>
<span class="nv">msgstr</span> <span class="s">&quot;Varsayılan&quot;</span>
</pre></div>
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.3</a> (<a href='https://git-scm.com/'>git 2.39.1</a>) at 2025-03-05 03:24:28 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>