Fix more tests

apps/dav/tests/unit/AppInfo/ApplicationTest.php

@@ -51,15 +51,15 @@ class ApplicationTest extends TestCase {
 	public function testContactsManagerSetup() {
 		$app = new Application();
 		$c = $app->getContainer();
-		$c->registerService('CardDavBackend', function($c) {
-			$service = $this->getMockBuilder('OCA\DAV\CardDAV\CardDavBackend')->disableOriginalConstructor()->getMock();
+		$c->registerService(CardDavBackend::class, function() {
+			$service = $this->createMock(CardDavBackend::class);
 			$service->method('getAddressBooksForUser')->willReturn([]);
 			return $service;
 		});
 
 		// assert setupContactsProvider() is proper
-		/** @var IManager | \PHPUnit_Framework_MockObject_MockObject $cm */
-		$cm = $this->getMockBuilder('OCP\Contacts\IManager')->disableOriginalConstructor()->getMock();
+		/** @var IManager|\PHPUnit_Framework_MockObject_MockObject $cm */
+		$cm = $this->createMock(IManager::class);
 		$app->setupContactsProvider($cm, 'xxx');
 		$this->assertTrue(true);
 	}