From 6c8bcb38f1124d0be7cee770ab67730d90dbd783 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 28 Sep 2016 15:32:03 +0200 Subject: [PATCH] Rename deleteAllSharesForUser() to deleteAllSharesByUser() Signed-off-by: Thomas Citharel --- apps/dav/lib/CalDAV/CalDavBackend.php | 2 +- apps/dav/lib/HookManager.php | 2 +- apps/dav/tests/unit/DAV/HookManagerTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 535bf3956e..d9537368eb 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -555,7 +555,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription * @param string $principaluri * @return void */ - function deleteAllSharesForUser($principaluri) { + function deleteAllSharesByUser($principaluri) { $this->sharingBackend->deleteAllSharesByUser($principaluri); } diff --git a/apps/dav/lib/HookManager.php b/apps/dav/lib/HookManager.php index e54a39acf2..364db19d76 100644 --- a/apps/dav/lib/HookManager.php +++ b/apps/dav/lib/HookManager.php @@ -106,7 +106,7 @@ class HookManager { foreach ($this->calendarsToDelete as $calendar) { $this->calDav->deleteCalendar($calendar['id']); } - $this->calDav->deleteAllSharesForUser('principals/users/' . $uid); + $this->calDav->deleteAllSharesByUser('principals/users/' . $uid); foreach ($this->addressBooksToDelete as $addressBook) { $this->cardDav->deleteAddressBook($addressBook['id']); diff --git a/apps/dav/tests/unit/DAV/HookManagerTest.php b/apps/dav/tests/unit/DAV/HookManagerTest.php index e9351ebc84..5b7d4700a5 100644 --- a/apps/dav/tests/unit/DAV/HookManagerTest.php +++ b/apps/dav/tests/unit/DAV/HookManagerTest.php @@ -187,7 +187,7 @@ class HookManagerTest extends TestCase { ['id' => 'personal'] ]); $cal->expects($this->once())->method('deleteCalendar'); - $cal->expects($this->once())->method('deleteAllSharesForUser'); + $cal->expects($this->once())->method('deleteAllSharesByUser'); /** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $card */ $card = $this->getMockBuilder(CardDavBackend::class)