Merge branch 'master' into implement_712

4 files changed, 17 insertions, 16 deletions

diff --git a/apps/updatenotification/tests/Controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php
index cf99679e680..336edffc957 100644
--- a/apps/updatenotification/tests/Controller/AdminControllerTest.php
+++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php
@@ -65,7 +65,8 @@ class AdminControllerTest extends TestCase {
 		$this->config = $this->getMockBuilder('\\OCP\\IConfig')->getMock();
 		$this->timeFactory = $this->getMockBuilder('\\OCP\\AppFramework\\Utility\\ITimeFactory')->getMock();
 		$this->l10n = $this->getMockBuilder('\\OCP\\IL10N')->getMock();
-		$this->updateChecker = $this->getMockBuilder('\\OCA\\UpdateNotification\\UpdateChecker')->disableOriginalConstructor()->getMock();
+		$this->updateChecker = $this->getMockBuilder('\\OCA\\UpdateNotification\\UpdateChecker')
+			->disableOriginalConstructor()->getMock();
 		$this->dateTimeFormatter = $this->getMockBuilder('\\OCP\\IDateTimeFormatter')->getMock();
 
 		$this->adminController = new AdminController(
diff --git a/apps/updatenotification/tests/Notification/BackgroundJobTest.php b/apps/updatenotification/tests/Notification/BackgroundJobTest.php
index c60a1429576..c3a4c28830d 100644
--- a/apps/updatenotification/tests/Notification/BackgroundJobTest.php
+++ b/apps/updatenotification/tests/Notification/BackgroundJobTest.php
@@ -51,12 +51,12 @@ class BackgroundJobTest extends TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->config = $this->getMock('OCP\IConfig');
-		$this->notificationManager = $this->getMock('OCP\Notification\IManager');
-		$this->groupManager = $this->getMock('OCP\IGroupManager');
-		$this->appManager = $this->getMock('OCP\App\IAppManager');
-		$this->client = $this->getMock('OCP\Http\Client\IClientService');
-		$this->urlGenerator = $this->getMock('OCP\IURLGenerator');
+		$this->config = $this->getMockBuilder('OCP\IConfig')->getMock();
+		$this->notificationManager = $this->getMockBuilder('OCP\Notification\IManager')->getMock();
+		$this->groupManager = $this->getMockBuilder('OCP\IGroupManager')->getMock();
+		$this->appManager = $this->getMockBuilder('OCP\App\IAppManager')->getMock();
+		$this->client = $this->getMockBuilder('OCP\Http\Client\IClientService')->getMock();
+		$this->urlGenerator = $this->getMockBuilder('OCP\IURLGenerator')->getMock();
 	}
 
 	/**
@@ -279,7 +279,7 @@ class BackgroundJobTest extends TestCase {
 		}
 
 		if ($createNotification) {
-			$notification = $this->getMock('OCP\Notification\INotification');
+			$notification = $this->getMockBuilder('OCP\Notification\INotification')->getMock();
 			$notification->expects($this->once())
 				->method('setApp')
 				->with('updatenotification')
@@ -380,7 +380,7 @@ class BackgroundJobTest extends TestCase {
 	 * @param string $version
 	 */
 	public function testDeleteOutdatedNotifications($app, $version) {
-		$notification = $this->getMock('OCP\Notification\INotification');
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')->getMock();
 		$notification->expects($this->once())
 			->method('setApp')
 			->with('updatenotification')
@@ -408,7 +408,7 @@ class BackgroundJobTest extends TestCase {
 	protected function getUsers(array $userIds) {
 		$users = [];
 		foreach ($userIds as $uid) {
-			$user = $this->getMock('OCP\IUser');
+			$user = $this->getMockBuilder('OCP\IUser')->getMock();
 			$user->expects($this->any())
 				->method('getUID')
 				->willReturn($uid);
@@ -422,7 +422,7 @@ class BackgroundJobTest extends TestCase {
 	 * @return \OCP\IGroup|\PHPUnit_Framework_MockObject_MockObject
 	 */
 	protected function getGroup($gid) {
-		$group = $this->getMock('OCP\IGroup');
+		$group = $this->getMockBuilder('OCP\IGroup')->getMock();
 		$group->expects($this->any())
 			->method('getGID')
 			->willReturn($gid);
diff --git a/apps/updatenotification/tests/Notification/NotifierTest.php b/apps/updatenotification/tests/Notification/NotifierTest.php
index 8848a3124fb..e5ccb291b5c 100644
--- a/apps/updatenotification/tests/Notification/NotifierTest.php
+++ b/apps/updatenotification/tests/Notification/NotifierTest.php
@@ -38,8 +38,8 @@ class NotifierTest extends TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->notificationManager = $this->getMock('OCP\Notification\IManager');
-		$this->l10nFactory = $this->getMock('OCP\L10n\IFactory');
+		$this->notificationManager = $this->getMockBuilder('OCP\Notification\IManager')->getMock();
+		$this->l10nFactory = $this->getMockBuilder('OCP\L10n\IFactory')->getMock();
 	}
 
 	/**
@@ -81,7 +81,7 @@ class NotifierTest extends TestCase {
 	public function testUpdateAlreadyInstalledCheck($versionNotification, $versionInstalled, $exception) {
 		$notifier = $this->getNotifier();
 
-		$notification = $this->getMock('OCP\Notification\INotification');
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')->getMock();
 		$notification->expects($this->once())
 			->method('getObjectId')
 			->willReturn($versionNotification);
diff --git a/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
index 71b72a40021..a52d46040cd 100644
--- a/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
+++ b/apps/updatenotification/tests/ResetTokenBackgroundJobTest.php
@@ -37,8 +37,8 @@ class ResetTokenBackgroundJobTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->config = $this->getMock('\\OCP\\IConfig');
-		$this->timeFactory = $this->getMock('\\OCP\\AppFramework\\Utility\\ITimeFactory');
+		$this->config = $this->getMockBuilder('\\OCP\\IConfig')->getMock();
+		$this->timeFactory = $this->getMockBuilder('\\OCP\\AppFramework\\Utility\\ITimeFactory')->getMock();
 		$this->resetTokenBackgroundJob = new ResetTokenBackgroundJob($this->config, $this->timeFactory);
 	}