diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-07-15 09:52:46 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-07-15 09:52:46 +0200 |
| commit | 2fcb24166f8ac77a49947f14bbeaf0f1bec5dfa4 (patch) | |
| tree | b43ce551bf0a4ea1bd78de7084d3814f35beb12f /apps/dav/tests/unit/CardDAV | |
| parent | 813b58ab947222f983fe25d56781f1f43c840538 (diff) | |
| download | nextcloud-server-2fcb24166f8ac77a49947f14bbeaf0f1bec5dfa4.tar.gz nextcloud-server-2fcb24166f8ac77a49947f14bbeaf0f1bec5dfa4.zip | |
Fix PHPUnit 5.4 warnings in DAV app
* getMock is deprecated
Diffstat (limited to 'apps/dav/tests/unit/CardDAV')
4 files changed, 18 insertions, 6 deletions
diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php index 4ccc841157f..749a98e307e 100644 --- a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php +++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php @@ -63,8 +63,12 @@ class AddressBookImplTest extends TestCase { ->disableOriginalConstructor()->getMock(); $this->backend = $this->getMockBuilder('\OCA\DAV\CardDAV\CardDavBackend') ->disableOriginalConstructor()->getMock(); - $this->vCard = $this->getMock('Sabre\VObject\Component\VCard'); - $this->urlGenerator = $this->getMock('OCP\IURLGenerator'); + $this->vCard = $this->getMockBuilder('Sabre\VObject\Component\VCard') + ->disableOriginalConstructor() + ->getMock(); + $this->urlGenerator = $this->getMockBuilder('OCP\IURLGenerator') + ->disableOriginalConstructor() + ->getMock(); $this->addressBookImpl = new AddressBookImpl( $this->addressBook, diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php index be680b219d8..9b11c3b82a0 100644 --- a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php +++ b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php @@ -105,8 +105,10 @@ class BirthdayServiceTest extends TestCase { $this->cardDav->expects($this->once())->method('getShares')->willReturn([]); /** @var BirthdayService | \PHPUnit_Framework_MockObject_MockObject $service */ - $service = $this->getMock('\OCA\DAV\CalDAV\BirthdayService', - ['buildBirthdayFromContact', 'birthdayEvenChanged'], [$this->calDav, $this->cardDav, $this->groupPrincialBackend]); + $service = $this->getMockBuilder('\OCA\DAV\CalDAV\BirthdayService') + ->setMethods(['buildBirthdayFromContact', 'birthdayEvenChanged']) + ->setConstructorArgs([$this->calDav, $this->cardDav, $this->groupPrincialBackend]) + ->getMock(); if ($expectedOp === 'delete') { $this->calDav->expects($this->once())->method('getCalendarObject')->willReturn(''); diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php index 3a9dc144584..0679df4e2f7 100644 --- a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php +++ b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php @@ -57,7 +57,10 @@ class ImageExportPluginTest extends TestCase { $this->server->tree = $this->tree; $this->logger = $this->getMockBuilder('\OCP\ILogger')->getMock(); - $this->plugin = $this->getMock('OCA\DAV\CardDAV\ImageExportPlugin', ['getPhoto'], [$this->logger]); + $this->plugin = $this->getMockBuilder('OCA\DAV\CardDAV\ImageExportPlugin') + ->setMethods(['getPhoto']) + ->setConstructorArgs([$this->logger]) + ->getMock(); $this->plugin->initialize($this->server); } diff --git a/apps/dav/tests/unit/CardDAV/SyncServiceTest.php b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php index f63b9acf13a..c9fde55c527 100644 --- a/apps/dav/tests/unit/CardDAV/SyncServiceTest.php +++ b/apps/dav/tests/unit/CardDAV/SyncServiceTest.php @@ -132,7 +132,10 @@ class SyncServiceTest extends TestCase { $userManager = $this->getMockBuilder('OCP\IUserManager')->disableOriginalConstructor()->getMock(); $logger = $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(); /** @var SyncService | \PHPUnit_Framework_MockObject_MockObject $ss */ - $ss = $this->getMock('OCA\DAV\CardDAV\SyncService', ['ensureSystemAddressBookExists', 'requestSyncReport', 'download'], [$backend, $userManager, $logger]); + $ss = $this->getMockBuilder('OCA\DAV\CardDAV\SyncService') + ->setMethods(['ensureSystemAddressBookExists', 'requestSyncReport', 'download']) + ->setConstructorArgs([$backend, $userManager, $logger]) + ->getMock(); $ss->method('requestSyncReport')->withAnyParameters()->willReturn(['response' => $response, 'token' => 'sync-token-1']); $ss->method('ensureSystemAddressBookExists')->willReturn(['id' => 1]); $ss->method('download')->willReturn([ |