Merge pull request #4481 from nextcloud/backport/4394/stable6.0

[stable6.0] fix: Instantiation of ContactsManager

Author: hamza221

lib/Service/SocialApiService.php

@@ -31,7 +31,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;
@@ -62,6 +62,8 @@ class SocialApiService {
 	private $timeFactory;
 	/** @var ImageResizer */
 	private $imageResizer;
+	/** @var PropertyMapper */
+	private $propertyMapper;
 
 	public function __construct(
 					CompositeSocialProvider $socialProvider,
@@ -72,7 +74,8 @@ public function __construct(
 					IURLGenerator $urlGen,
 					CardDavBackend $davBackend,
 					ITimeFactory $timeFactory,
-					ImageResizer $imageResizer) {
+					ImageResizer $imageResizer,
+					PropertyMapper $propertyMapper) {
 		$this->appName = Application::APP_ID;
 		$this->socialProvider = $socialProvider;
 		$this->manager = $manager;
@@ -83,6 +86,7 @@ public function __construct(
 		$this->davBackend = $davBackend;
 		$this->timeFactory = $timeFactory;
 		$this->imageResizer = $imageResizer;
+		$this->propertyMapper = $propertyMapper;
 	}
 
 
@@ -158,7 +162,7 @@ protected function getAddressBook(string $addressbookId, IManager $manager = nul
 	 * @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;
 	}
@@ -270,7 +274,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;
@@ -288,7 +292,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) {

tests/unit/Service/SocialApiServiceTest.php

@@ -42,28 +42,31 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use ChristophWurst\Nextcloud\Testing\TestCase;
+use OCA\DAV\Db\PropertyMapper;
 
 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";
@@ -130,6 +133,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,
@@ -139,7 +143,8 @@ protected function setUp(): void {
 			$this->urlGen,
 			$this->davBackend,
 			$this->timeFactory,
-			$this->imageResizer
+			$this->imageResizer,
+			$this->propertyMapper,
 		);
 	}