Use the shorter phpunit syntax for mocked return values

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

3 files changed, 121 insertions, 121 deletions

diff --git a/tests/lib/Group/GroupTest.php b/tests/lib/Group/GroupTest.php
index 61e4b39c8f3..554432a2c86 100644
--- a/tests/lib/Group/GroupTest.php
+++ b/tests/lib/Group/GroupTest.php
@@ -56,11 +56,11 @@ class GroupTest extends \Test\TestCase {
 		$user3 = $this->newUser('user3', $backend);
 		$userManager->expects($this->any())
 			->method('get')
-			->will($this->returnValueMap(array(
+			->willReturnMap(array(
 				array('user1', $user1),
 				array('user2', $user2),
 				array('user3', $user3)
-			)));
+			));
 		return $userManager;
 	}
 
@@ -74,7 +74,7 @@ class GroupTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('usersInGroup')
 			->with('group1')
-			->will($this->returnValue(array('user1', 'user2')));
+			->willReturn(array('user1', 'user2'));
 
 		$users = $group->getUsers();
 
@@ -98,12 +98,12 @@ class GroupTest extends \Test\TestCase {
 		$backend1->expects($this->once())
 			->method('usersInGroup')
 			->with('group1')
-			->will($this->returnValue(array('user1', 'user2')));
+			->willReturn(array('user1', 'user2'));
 
 		$backend2->expects($this->once())
 			->method('usersInGroup')
 			->with('group1')
-			->will($this->returnValue(array('user2', 'user3')));
+			->willReturn(array('user2', 'user3'));
 
 		$users = $group->getUsers();
 
@@ -129,7 +129,7 @@ class GroupTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('inGroup')
 			->with('user1', 'group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->assertTrue($group->inGroup($this->newUser('user1', $userBackend)));
 	}
@@ -150,12 +150,12 @@ class GroupTest extends \Test\TestCase {
 		$backend1->expects($this->once())
 			->method('inGroup')
 			->with('user1', 'group1')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$backend2->expects($this->once())
 			->method('inGroup')
 			->with('user1', 'group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$this->assertTrue($group->inGroup($this->newUser('user1', $userBackend)));
 	}
@@ -173,10 +173,10 @@ class GroupTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('inGroup')
 			->with('user1', 'group1')
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$backend->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend->expects($this->once())
 			->method('addToGroup')
@@ -198,10 +198,10 @@ class GroupTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('inGroup')
 			->with('user1', 'group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$backend->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend->expects($this->never())
 			->method('addToGroup');
@@ -222,10 +222,10 @@ class GroupTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('inGroup')
 			->with('user1', 'group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$backend->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend->expects($this->once())
 			->method('removeFromGroup')
@@ -247,10 +247,10 @@ class GroupTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('inGroup')
 			->with('user1', 'group1')
-			->will($this->returnValue(false));
+			->willReturn(false);
 		$backend->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend->expects($this->never())
 			->method('removeFromGroup');
@@ -274,10 +274,10 @@ class GroupTest extends \Test\TestCase {
 		$backend1->expects($this->once())
 			->method('inGroup')
 			->with('user1', 'group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$backend1->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend1->expects($this->once())
 			->method('removeFromGroup')
@@ -286,10 +286,10 @@ class GroupTest extends \Test\TestCase {
 		$backend2->expects($this->once())
 			->method('inGroup')
 			->with('user1', 'group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$backend2->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend2->expects($this->once())
 			->method('removeFromGroup')
@@ -308,7 +308,7 @@ class GroupTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('usersInGroup')
 			->with('group1', '2')
-			->will($this->returnValue(array('user2')));
+			->willReturn(array('user2'));
 
 		$users = $group->searchUsers('2');
 
@@ -330,11 +330,11 @@ class GroupTest extends \Test\TestCase {
 		$backend1->expects($this->once())
 			->method('usersInGroup')
 			->with('group1', '2')
-			->will($this->returnValue(array('user2')));
+			->willReturn(array('user2'));
 		$backend2->expects($this->once())
 			->method('usersInGroup')
 			->with('group1', '2')
-			->will($this->returnValue(array('user2')));
+			->willReturn(array('user2'));
 
 		$users = $group->searchUsers('2');
 
@@ -353,7 +353,7 @@ class GroupTest extends \Test\TestCase {
 		$backend->expects($this->once())
 			->method('usersInGroup')
 			->with('group1', 'user', 1, 1)
-			->will($this->returnValue(array('user2')));
+			->willReturn(array('user2'));
 
 		$users = $group->searchUsers('user', 1, 1);
 
@@ -375,11 +375,11 @@ class GroupTest extends \Test\TestCase {
 		$backend1->expects($this->once())
 			->method('usersInGroup')
 			->with('group1', 'user', 2, 1)
-			->will($this->returnValue(array('user2')));
+			->willReturn(array('user2'));
 		$backend2->expects($this->once())
 			->method('usersInGroup')
 			->with('group1', 'user', 2, 1)
-			->will($this->returnValue(array('user1')));
+			->willReturn(array('user1'));
 
 		$users = $group->searchUsers('user', 2, 1);
 
@@ -400,11 +400,11 @@ class GroupTest extends \Test\TestCase {
 		$backend1->expects($this->once())
 			->method('countUsersInGroup')
 			->with('group1', '2')
-			->will($this->returnValue(3));
+			->willReturn(3);
 
 		$backend1->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$users = $group->count('2');
 
@@ -424,18 +424,18 @@ class GroupTest extends \Test\TestCase {
 		$backend1->expects($this->once())
 			->method('countUsersInGroup')
 			->with('group1', '2')
-			->will($this->returnValue(3));
+			->willReturn(3);
 		$backend1->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend2->expects($this->once())
 			->method('countUsersInGroup')
 			->with('group1', '2')
-			->will($this->returnValue(4));
+			->willReturn(4);
 		$backend2->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$users = $group->count('2');
 
@@ -453,7 +453,7 @@ class GroupTest extends \Test\TestCase {
 			->method('countUsersInGroup');
 		$backend1->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$users = $group->count('2');
 
@@ -472,7 +472,7 @@ class GroupTest extends \Test\TestCase {
 			->with('group1');
 		$backend->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$group->delete();
 	}
diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php
index d5f8baa3fa1..8385c924edf 100644
--- a/tests/lib/Group/ManagerTest.php
+++ b/tests/lib/Group/ManagerTest.php
@@ -52,10 +52,10 @@ class ManagerTest extends TestCase {
 		$mockUser = $this->createMock(IUser::class);
 		$mockUser->expects($this->any())
 			->method('getUID')
-			->will($this->returnValue($userId));
+			->willReturn($userId);
 		$mockUser->expects($this->any())
 			->method('getDisplayName')
-			->will($this->returnValue($userId));
+			->willReturn($userId);
 		return $mockUser;
 	}
 
@@ -91,9 +91,9 @@ class ManagerTest extends TestCase {
 			->getMock();
 		$backend->expects($this->any())
 			->method('implementsActions')
-			->will($this->returnCallback(function($actions) use ($implementedActions) {
+			->willReturnCallback(function($actions) use ($implementedActions) {
 				return (bool)($actions & $implementedActions);
-			}));
+			});
 		return $backend;
 	}
 
@@ -105,7 +105,7 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -129,7 +129,7 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->once())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -157,7 +157,7 @@ class ManagerTest extends TestCase {
 		$backend1->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2
@@ -166,7 +166,7 @@ class ManagerTest extends TestCase {
 		$backend2->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend1);
@@ -184,15 +184,15 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnCallback(function () use (&$backendGroupCreated) {
+			->willReturnCallback(function () use (&$backendGroupCreated) {
 				return $backendGroupCreated;
-			}));
+			});
 		$backend->expects($this->once())
 			->method('createGroup')
-			->will($this->returnCallback(function () use (&$backendGroupCreated) {
+			->willReturnCallback(function () use (&$backendGroupCreated) {
 				$backendGroupCreated = true;
 				return true;
-			}));
+			});
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -236,7 +236,7 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$backend->expects($this->never())
 			->method('createGroup');
 
@@ -255,11 +255,11 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->once())
 			->method('getGroups')
 			->with('1')
-			->will($this->returnValue(array('group1')));
+			->willReturn(array('group1'));
 		$backend->expects($this->once())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -278,10 +278,10 @@ class ManagerTest extends TestCase {
 		$backend1->expects($this->once())
 			->method('getGroups')
 			->with('1')
-			->will($this->returnValue(array('group1')));
+			->willReturn(array('group1'));
 		$backend1->expects($this->any())
 			->method('groupExists')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2
@@ -290,10 +290,10 @@ class ManagerTest extends TestCase {
 		$backend2->expects($this->once())
 			->method('getGroups')
 			->with('1')
-			->will($this->returnValue(array('group12', 'group1')));
+			->willReturn(array('group12', 'group1'));
 		$backend2->expects($this->any())
 			->method('groupExists')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend1);
@@ -315,10 +315,10 @@ class ManagerTest extends TestCase {
 		$backend1->expects($this->once())
 			->method('getGroups')
 			->with('1', 2, 1)
-			->will($this->returnValue(array('group1')));
+			->willReturn(array('group1'));
 		$backend1->expects($this->any())
 			->method('groupExists')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2
@@ -327,10 +327,10 @@ class ManagerTest extends TestCase {
 		$backend2->expects($this->once())
 			->method('getGroups')
 			->with('1', 2, 1)
-			->will($this->returnValue(array('group12')));
+			->willReturn(array('group12'));
 		$backend2->expects($this->any())
 			->method('groupExists')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend1);
@@ -350,11 +350,11 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->once())
 			->method('getGroups')
 			->with('1')
-			->will($this->returnValue(['group1']));
+			->willReturn(['group1']);
 		$backend->expects($this->once())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		/** @var \OC\User\Manager $userManager */
 		$userManager = $this->createMock(Manager::class);
@@ -374,11 +374,11 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->once())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnValue(array('group1')));
+			->willReturn(array('group1'));
 		$backend->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -421,11 +421,11 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->once())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnValue(array('group1')));
+			->willReturn(array('group1'));
 		$backend->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(false));
+			->willReturn(false);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -448,10 +448,10 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->once())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnValue(array('group1', 'admin', 'group2')));
+			->willReturn(array('group1', 'admin', 'group2'));
 		$backend->expects($this->any())
 			->method('groupExists')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -467,10 +467,10 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->once())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnValue(array('group1', 'admin', 'group2')));
+			->willReturn(array('group1', 'admin', 'group2'));
 		$backend->expects($this->any())
 			->method('groupExists')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -486,10 +486,10 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->once())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnValue(array('group1', 'group2')));
+			->willReturn(array('group1', 'group2'));
 		$backend->expects($this->any())
 			->method('groupExists')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -505,10 +505,10 @@ class ManagerTest extends TestCase {
 		$backend1->expects($this->once())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnValue(array('group1')));
+			->willReturn(array('group1'));
 		$backend1->expects($this->any())
 			->method('groupExists')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC\Group\Backend $backend2
@@ -517,10 +517,10 @@ class ManagerTest extends TestCase {
 		$backend2->expects($this->once())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnValue(array('group1', 'group2')));
+			->willReturn(array('group1', 'group2'));
 		$backend1->expects($this->any())
 			->method('groupExists')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend1);
@@ -542,11 +542,11 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->exactly(1))
 			->method('groupExists')
 			->with('testgroup')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend->expects($this->any())
 			->method('inGroup')
-			->will($this->returnCallback(function($uid, $gid) {
+			->willReturnCallback(function($uid, $gid) {
 				switch($uid) {
 					case 'user1' : return false;
 					case 'user2' : return true;
@@ -555,22 +555,22 @@ class ManagerTest extends TestCase {
 					default:
 						return null;
 					}
-			}));
+			});
 
 		$this->userManager->expects($this->any())
 			->method('searchDisplayName')
 			->with('user3')
-			->will($this->returnCallback(function($search, $limit, $offset) {
+			->willReturnCallback(function($search, $limit, $offset) {
 				switch($offset) {
 					case 0 : return ['user3' => $this->getTestUser('user3'),
 									'user33' => $this->getTestUser('user33')];
 					case 2 : return [];
 				}
 				return null;
-			}));
+			});
 		$this->userManager->expects($this->any())
 			->method('get')
-			->will($this->returnCallback(function($uid) {
+			->willReturnCallback(function($uid) {
 				switch($uid) {
 					case 'user1' : return $this->getTestUser('user1');
 					case 'user2' : return $this->getTestUser('user2');
@@ -579,7 +579,7 @@ class ManagerTest extends TestCase {
 					default:
 						return null;
 				}
-			}));
+			});
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -600,11 +600,11 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->exactly(1))
 			->method('groupExists')
 			->with('testgroup')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 				$backend->expects($this->any())
 			->method('inGroup')
-			->will($this->returnCallback(function($uid, $gid) {
+			->willReturnCallback(function($uid, $gid) {
 					switch($uid) {
 						case 'user1' : return false;
 						case 'user2' : return true;
@@ -614,22 +614,22 @@ class ManagerTest extends TestCase {
 						default:
 							return null;
 					}
-			}));
+			});
 
 		$this->userManager->expects($this->any())
 			->method('searchDisplayName')
 			->with('user3')
-			->will($this->returnCallback(function($search, $limit, $offset) {
+			->willReturnCallback(function($search, $limit, $offset) {
 				switch($offset) {
 					case 0 : return ['user3' => $this->getTestUser('user3'),
 									'user33' => $this->getTestUser('user33')];
 					case 2 : return ['user333' => $this->getTestUser('user333')];
 				}
 				return null;
-			}));
+			});
 		$this->userManager->expects($this->any())
 			->method('get')
-			->will($this->returnCallback(function($uid) {
+			->willReturnCallback(function($uid) {
 				switch($uid) {
 					case 'user1' : return $this->getTestUser('user1');
 					case 'user2' : return $this->getTestUser('user2');
@@ -639,7 +639,7 @@ class ManagerTest extends TestCase {
 					default:
 						return null;
 				}
-			}));
+			});
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -661,11 +661,11 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->exactly(1))
 			->method('groupExists')
 			->with('testgroup')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend->expects($this->any())
 			->method('inGroup')
-			->will($this->returnCallback(function($uid) {
+			->willReturnCallback(function($uid) {
 					switch($uid) {
 						case 'user1' : return false;
 						case 'user2' : return true;
@@ -675,12 +675,12 @@ class ManagerTest extends TestCase {
 						default:
 							return null;
 					}
-			}));
+			});
 
 		$this->userManager->expects($this->any())
 			->method('searchDisplayName')
 			->with('user3')
-			->will($this->returnCallback(function($search, $limit, $offset) {
+			->willReturnCallback(function($search, $limit, $offset) {
 				switch($offset) {
 					case 0 :
 						return [
@@ -690,10 +690,10 @@ class ManagerTest extends TestCase {
 						];
 				}
 				return null;
-			}));
+			});
 		$this->userManager->expects($this->any())
 			->method('get')
-			->will($this->returnCallback(function($uid) {
+			->willReturnCallback(function($uid) {
 				switch($uid) {
 					case 'user1' : return $this->getTestUser('user1');
 					case 'user2' : return $this->getTestUser('user2');
@@ -703,7 +703,7 @@ class ManagerTest extends TestCase {
 					default:
 						return null;
 				}
-			}));
+			});
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -725,16 +725,16 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->exactly(1))
 			->method('groupExists')
 			->with('testgroup')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 				$backend->expects($this->once())
 			->method('usersInGroup')
 			->with('testgroup', '', -1, 0)
-			->will($this->returnValue(array('user2', 'user33')));
+			->willReturn(array('user2', 'user33'));
 
 		$this->userManager->expects($this->any())
 			->method('get')
-			->will($this->returnCallback(function($uid) {
+			->willReturnCallback(function($uid) {
 				switch($uid) {
 					case 'user1' : return $this->getTestUser('user1');
 					case 'user2' : return $this->getTestUser('user2');
@@ -743,7 +743,7 @@ class ManagerTest extends TestCase {
 					default:
 						return null;
 				}
-			}));
+			});
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -764,16 +764,16 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->exactly(1))
 			->method('groupExists')
 			->with('testgroup')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend->expects($this->once())
 			->method('usersInGroup')
 			->with('testgroup', '', 1, 0)
-			->will($this->returnValue(array('user2')));
+			->willReturn(array('user2'));
 
 		$this->userManager->expects($this->any())
 			->method('get')
-			->will($this->returnCallback(function($uid) {
+			->willReturnCallback(function($uid) {
 				switch($uid) {
 					case 'user1' : return $this->getTestUser('user1');
 					case 'user2' : return $this->getTestUser('user2');
@@ -782,7 +782,7 @@ class ManagerTest extends TestCase {
 					default:
 						return null;
 				}
-			}));
+			});
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -803,16 +803,16 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->exactly(1))
 			->method('groupExists')
 			->with('testgroup')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$backend->expects($this->once())
 			->method('usersInGroup')
 			->with('testgroup', '', 1, 1)
-			->will($this->returnValue(array('user33')));
+			->willReturn(array('user33'));
 
 		$this->userManager->expects($this->any())
 			->method('get')
-			->will($this->returnCallback(function($uid) {
+			->willReturnCallback(function($uid) {
 				switch($uid) {
 					case 'user1' : return $this->getTestUser('user1');
 					case 'user2' : return $this->getTestUser('user2');
@@ -821,7 +821,7 @@ class ManagerTest extends TestCase {
 					default:
 						return null;
 				}
-			}));
+			});
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -843,13 +843,13 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->any())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnCallback(function () use (&$expectedGroups) {
+			->willReturnCallback(function () use (&$expectedGroups) {
 				return $expectedGroups;
-			}));
+			});
 		$backend->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -880,19 +880,19 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->any())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnCallback(function () use (&$expectedGroups) {
+			->willReturnCallback(function () use (&$expectedGroups) {
 				return $expectedGroups;
-			}));
+			});
 		$backend->expects($this->any())
 			->method('groupExists')
 			->with('group1')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$backend->expects($this->once())
 			->method('inGroup')
-			->will($this->returnValue(true));
+			->willReturn(true);
 		$backend->expects($this->once())
 			->method('removeFromGroup')
-			->will($this->returnValue(true));
+			->willReturn(true);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -922,7 +922,7 @@ class ManagerTest extends TestCase {
 		$backend->expects($this->any())
 			->method('getUserGroups')
 			->with('user1')
-			->will($this->returnValue(null));
+			->willReturn(null);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
@@ -945,10 +945,10 @@ class ManagerTest extends TestCase {
 		);
 		$backend->expects($this->any())
 			->method('getGroupDetails')
-			->will($this->returnValueMap([
+			->willReturnMap([
 				['group1', ['gid' => 'group1', 'displayName' => 'Group One']],
 				['group2', ['gid' => 'group2']],
-			]));
+			]);
 
 		$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger);
 		$manager->addBackend($backend);
diff --git a/tests/lib/Group/MetaDataTest.php b/tests/lib/Group/MetaDataTest.php
index 4332a6f036f..ebd9cd79f23 100644
--- a/tests/lib/Group/MetaDataTest.php
+++ b/tests/lib/Group/MetaDataTest.php
@@ -83,7 +83,7 @@ class MetaDataTest extends \Test\TestCase {
 		$this->groupManager->expects($this->once())
 			->method('search')
 			->with('')
-			->will($this->returnValue($groups));
+			->willReturn($groups);
 
 		list($adminGroups, $ordinaryGroups) = $this->groupMetadata->get();
 
@@ -103,7 +103,7 @@ class MetaDataTest extends \Test\TestCase {
 		$this->groupManager->expects($this->once())
 			->method('search')
 			->with('')
-			->will($this->returnValue($groups));
+			->willReturn($groups);
 
 		list($adminGroups, $ordinaryGroups) = $this->groupMetadata->get();
 
@@ -121,7 +121,7 @@ class MetaDataTest extends \Test\TestCase {
 		$this->groupManager->expects($this->once())
 			->method('search')
 			->with('')
-			->will($this->returnValue($groups));
+			->willReturn($groups);
 
 		//two calls, if caching fails call counts for group and groupmanager
 		//are exceeded
@@ -137,7 +137,7 @@ class MetaDataTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('search')
 			->with('Foo')
-			->will($this->returnValue(['DummyValue']));
+			->willReturn(['DummyValue']);
 
 		$expected = ['DummyValue'];
 		$this->assertSame($expected, $this->invokePrivate($this->groupMetadata, 'getGroups', ['Foo']));