diff --git a/lib/Service/SocialApiService.php b/lib/Service/SocialApiService.php index 4c961831e..a4db7c593 100644 --- a/lib/Service/SocialApiService.php +++ b/lib/Service/SocialApiService.php @@ -14,7 +14,7 @@ use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\ContactsManager; - +use OCA\DAV\Db\PropertyMapper; use OCP\AppFramework\Http; use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Utility\ITimeFactory; @@ -38,6 +38,7 @@ public function __construct( private CardDavBackend $davBackend, private ITimeFactory $timeFactory, private ImageResizer $imageResizer, + private PropertyMapper $propertyMapper, ) { $this->appName = Application::APP_ID; } @@ -115,7 +116,7 @@ protected function getAddressBook(string $addressbookId, ?IManager $manager = nu * @param {IManager} the contact manager to load */ protected function registerAddressbooks($userId, IManager $manager) { - $coma = new ContactsManager($this->davBackend, $this->l10n); + $coma = new ContactsManager($this->davBackend, $this->l10n, $this->propertyMapper); $coma->setupContactsProvider($manager, $userId, $this->urlGen); $this->manager = $manager; } @@ -227,7 +228,7 @@ public function updateContact(string $addressbookId, string $contactId, ?string */ public function existsAddressBook(string $searchBookId, string $userId): bool { $manager = $this->manager; - $coma = new ContactsManager($this->davBackend, $this->l10n); + $coma = new ContactsManager($this->davBackend, $this->l10n, $this->propertyMapper); $coma->setupContactsProvider($manager, $userId, $this->urlGen); $addressBooks = $manager->getUserAddressBooks(); return $this->getAddressBook($searchBookId, $manager) !== null; @@ -245,7 +246,7 @@ public function existsAddressBook(string $searchBookId, string $userId): bool { public function existsContact(string $searchContactId, string $searchBookId, string $userId): bool { // load address books for the user $manager = $this->manager; - $coma = new ContactsManager($this->davBackend, $this->l10n); + $coma = new ContactsManager($this->davBackend, $this->l10n, $this->propertyMapper); $coma->setupContactsProvider($manager, $userId, $this->urlGen); $addressBook = $this->getAddressBook($searchBookId, $manager); if ($addressBook == null) { diff --git a/tests/unit/Service/SocialApiServiceTest.php b/tests/unit/Service/SocialApiServiceTest.php index 824fa4acf..7873ac0e6 100644 --- a/tests/unit/Service/SocialApiServiceTest.php +++ b/tests/unit/Service/SocialApiServiceTest.php @@ -12,6 +12,7 @@ use OCA\Contacts\Service\Social\ISocialProvider; use OCA\DAV\CardDAV\CardDavBackend; +use OCA\DAV\Db\PropertyMapper; use OCP\AppFramework\Http; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Contacts\IManager; @@ -29,24 +30,26 @@ class SocialApiServiceTest extends TestCase { private SocialApiService $service; - /** @var CompositeSocialProvider|MockObject */ + /** @var CompositeSocialProvider&MockObject */ private $socialProvider; - /** @var IManager|MockObject */ + /** @var IManager&MockObject */ private $manager; - /** @var IConfig|MockObject */ + /** @var IConfig&MockObject */ private $config; - /** @var IClientService|MockObject */ + /** @var IClientService&MockObject */ private $clientService; - /** @var IL10N|MockObject */ + /** @var IL10N&MockObject */ private $l10n; - /** @var IURLGenerator|MockObject */ + /** @var IURLGenerator&MockObject */ private $urlGen; - /** @var CardDavBackend|MockObject */ + /** @var CardDavBackend&MockObject */ private $davBackend; - /** @var ITimeFactory|MockObject */ + /** @var ITimeFactory&MockObject */ private $timeFactory; - /** @var ImageResizer|MockObject */ + /** @var ImageResizer&MockObject */ private $imageResizer; + /** @var PropertyMapper&MockObject */ + private $propertyMapper; public function allSocialProfileProviders(): array { $body = 'the body'; @@ -113,6 +116,7 @@ protected function setUp(): void { $this->davBackend = $this->createMock(CardDavBackend::class); $this->timeFactory = $this->createMock(ITimeFactory::class); $this->imageResizer = $this->createMock(ImageResizer::class); + $this->propertyMapper = $this->createMock(PropertyMapper::class); $this->service = new SocialApiService( $this->socialProvider, $this->manager, @@ -122,7 +126,8 @@ protected function setUp(): void { $this->urlGen, $this->davBackend, $this->timeFactory, - $this->imageResizer + $this->imageResizer, + $this->propertyMapper, ); }