Refactors lib/private/Contacts.

Mainly using PHP8's constructor property promotion.

Signed-off-by: Faraz Samapoor <fsa@adlas.at>

3 files changed, 19 insertions, 56 deletions

diff --git a/lib/private/Contacts/ContactsMenu/Providers/EMailProvider.php b/lib/private/Contacts/ContactsMenu/Providers/EMailProvider.php
index b79052e1f5d..145c30a2ce7 100644
--- a/lib/private/Contacts/ContactsMenu/Providers/EMailProvider.php
+++ b/lib/private/Contacts/ContactsMenu/Providers/EMailProvider.php
@@ -28,18 +28,13 @@ use OCP\Contacts\ContactsMenu\IProvider;
 use OCP\IURLGenerator;
 
 class EMailProvider implements IProvider {
-	private IActionFactory $actionFactory;
-	private IURLGenerator $urlGenerator;
-
-	public function __construct(IActionFactory $actionFactory, IURLGenerator $urlGenerator) {
-		$this->actionFactory = $actionFactory;
-		$this->urlGenerator = $urlGenerator;
+	public function __construct(
+		private IActionFactory $actionFactory,
+		private IURLGenerator $urlGenerator,
+	) {
 	}
 
-	/**
-	 * @param IEntry $entry
-	 */
-	public function process(IEntry $entry) {
+	public function process(IEntry $entry): void {
 		$iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg'));
 		foreach ($entry->getEMailAddresses() as $address) {
 			if (empty($address)) {
diff --git a/lib/private/Contacts/ContactsMenu/Providers/LocalTimeProvider.php b/lib/private/Contacts/ContactsMenu/Providers/LocalTimeProvider.php
index 17e30e89c37..32e1280ff0f 100644
--- a/lib/private/Contacts/ContactsMenu/Providers/LocalTimeProvider.php
+++ b/lib/private/Contacts/ContactsMenu/Providers/LocalTimeProvider.php
@@ -37,36 +37,18 @@ use OCP\IUserManager;
 use OCP\L10N\IFactory as IL10NFactory;
 
 class LocalTimeProvider implements IProvider {
-	private IActionFactory $actionFactory;
-	private IL10NFactory $l10nFactory;
-	private IURLGenerator $urlGenerator;
-	private IUserManager $userManager;
-	private ITimeFactory $timeFactory;
-	private IDateTimeFormatter $dateTimeFormatter;
-	private IConfig $config;
-
 	public function __construct(
-		IActionFactory $actionFactory,
-		IL10NFactory $l10nFactory,
-		IURLGenerator $urlGenerator,
-		IUserManager $userManager,
-		ITimeFactory $timeFactory,
-		IDateTimeFormatter $dateTimeFormatter,
-		IConfig $config
+		private IActionFactory $actionFactory,
+		private IL10NFactory $l10nFactory,
+		private IURLGenerator $urlGenerator,
+		private IUserManager $userManager,
+		private ITimeFactory $timeFactory,
+		private IDateTimeFormatter $dateTimeFormatter,
+		private IConfig $config,
 	) {
-		$this->actionFactory = $actionFactory;
-		$this->l10nFactory = $l10nFactory;
-		$this->urlGenerator = $urlGenerator;
-		$this->userManager = $userManager;
-		$this->timeFactory = $timeFactory;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-		$this->config = $config;
 	}
 
-	/**
-	 * @param IEntry $entry
-	 */
-	public function process(IEntry $entry) {
+	public function process(IEntry $entry): void {
 		$targetUserId = $entry->getProperty('UID');
 		$targetUser = $this->userManager->get($targetUserId);
 		if (!empty($targetUser)) {
diff --git a/lib/private/Contacts/ContactsMenu/Providers/ProfileProvider.php b/lib/private/Contacts/ContactsMenu/Providers/ProfileProvider.php
index af941fd7fd1..6b36b9fff0e 100644
--- a/lib/private/Contacts/ContactsMenu/Providers/ProfileProvider.php
+++ b/lib/private/Contacts/ContactsMenu/Providers/ProfileProvider.php
@@ -33,30 +33,16 @@ use OCP\IUserManager;
 use OCP\L10N\IFactory as IL10NFactory;
 
 class ProfileProvider implements IProvider {
-	private IActionFactory $actionFactory;
-	private ProfileManager $profileManager;
-	private IL10NFactory $l10nFactory;
-	private IURLGenerator $urlGenerator;
-	private IUserManager $userManager;
-
 	public function __construct(
-		IActionFactory $actionFactory,
-		ProfileManager $profileManager,
-		IL10NFactory $l10nFactory,
-		IURLGenerator $urlGenerator,
-		IUserManager $userManager
+		private IActionFactory $actionFactory,
+		private ProfileManager $profileManager,
+		private IL10NFactory $l10nFactory,
+		private IURLGenerator $urlGenerator,
+		private IUserManager $userManager,
 	) {
-		$this->actionFactory = $actionFactory;
-		$this->profileManager = $profileManager;
-		$this->l10nFactory = $l10nFactory;
-		$this->urlGenerator = $urlGenerator;
-		$this->userManager = $userManager;
 	}
 
-	/**
-	 * @param IEntry $entry
-	 */
-	public function process(IEntry $entry) {
+	public function process(IEntry $entry): void {
 		$targetUserId = $entry->getProperty('UID');
 		$targetUser = $this->userManager->get($targetUserId);
 		if (!empty($targetUser)) {