diff options
| -rw-r--r-- | lib/private/Contacts/ContactsMenu/ContactsStore.php | 6 | ||||
| -rw-r--r-- | tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php | 20 |
2 files changed, 23 insertions, 3 deletions
diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php index 6a319d7e145..32bcb58ccda 100644 --- a/lib/private/Contacts/ContactsMenu/ContactsStore.php +++ b/lib/private/Contacts/ContactsMenu/ContactsStore.php @@ -106,7 +106,9 @@ class ContactsStore { } } - return array_filter($entries, function(IEntry $entry) use ($self, $skipLocal, $ownGroupsOnly, $selfGroups) { + $selfUID = $self->getUID(); + + return array_filter($entries, function(IEntry $entry) use ($self, $skipLocal, $ownGroupsOnly, $selfGroups, $selfUID) { if ($skipLocal && $entry->getProperty('isLocalSystemBook') === true) { return false; @@ -120,7 +122,7 @@ class ContactsStore { } } - return $entry->getProperty('UID') !== $self->getUID(); + return $entry->getProperty('UID') !== $selfUID; }); diff --git a/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php b/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php index 08da360388f..520df2ccfae 100644 --- a/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php +++ b/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php @@ -26,7 +26,10 @@ namespace Tests\Contacts\ContactsMenu; use OC\Contacts\ContactsMenu\ContactsStore; use OCP\Contacts\IManager; +use OCP\IConfig; +use OCP\IGroupManager; use OCP\IUser; +use OCP\IUserManager; use PHPUnit_Framework_MockObject_MockObject; use Test\TestCase; @@ -38,12 +41,27 @@ class ContactsStoreTest extends TestCase { /** @var IManager|PHPUnit_Framework_MockObject_MockObject */ private $contactsManager; + /** @var IUserManager|PHPUnit_Framework_MockObject_MockObject */ + private $userManager; + + /** @var IGroupManager|PHPUnit_Framework_MockObject_MockObject */ + private $groupManager; + + /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */ + private $config; + protected function setUp() { parent::setUp(); $this->contactsManager = $this->createMock(IManager::class); - $this->contactsStore = new ContactsStore($this->contactsManager); + $this->userManager = $this->createMock(IUserManager::class); + + $this->groupManager = $this->createMock(IGroupManager::class); + + $this->config = $this->createMock(IConfig::class); + + $this->contactsStore = new ContactsStore($this->contactsManager, $this->config, $this->userManager, $this->groupManager); } public function testGetContactsWithoutFilter() { |