Refactor contactsinteraction app

Signed-off-by: Hamid Dehnavi <hamid.dev.pro@gmail.com>

diff --git a/apps/contactsinteraction/lib/AddressBook.php b/apps/contactsinteraction/lib/AddressBook.php
index 518e39942d9536f91a554f4b7360ea6bebd7972d..d830146cfc62aeb784e864a43ca9eb30ac9e1abc 100644 (file)
--- a/apps/contactsinteraction/lib/AddressBook.php
+++ b/apps/contactsinteraction/lib/AddressBook.php
@@ -44,22 +44,17 @@ class AddressBook extends ExternalAddressBook implements IACL {
 
        public const URI = 'recent';
 
-       private RecentContactMapper $mapper;
-       private IL10N $l10n;
-       private string $principalUri;
-
-       public function __construct(RecentContactMapper $mapper,
-                                                               IL10N $l10n,
-                                                               string $principalUri) {
+       public function __construct(
+               private RecentContactMapper $mapper,
+               private IL10N $l10n,
+               private string $principalUri,
+       ) {
                parent::__construct(Application::APP_ID, self::URI);
-
-               $this->mapper = $mapper;
-               $this->l10n = $l10n;
-               $this->principalUri = $principalUri;
        }
 
        /**
         * @inheritDoc
+        * @throws Exception
         */
        public function delete(): void {
                throw new Exception("This addressbook is immutable");
@@ -67,6 +62,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
 
        /**
         * @inheritDoc
+        * @throws Exception
         */
        public function createFile($name, $data = null) {
                throw new Exception("This addressbook is immutable");
@@ -131,6 +127,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
 
        /**
         * @inheritDoc
+        * @throws Exception
         */
        public function propPatch(PropPatch $propPatch) {
                throw new Exception("This addressbook is immutable");
@@ -139,7 +136,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
        /**
         * @inheritDoc
         */
-       public function getProperties($properties) {
+       public function getProperties($properties): array {
                return [
                        'principaluri' => $this->principalUri,
                        '{DAV:}displayname' => $this->l10n->t('Recently contacted'),

diff --git a/apps/contactsinteraction/lib/AddressBookProvider.php b/apps/contactsinteraction/lib/AddressBookProvider.php
index 74d472d421b1f3045e772ad5a2187ab9ca070f94..835d2d25652fd20103d30d7cfc6a82a13efebe9e 100644 (file)
--- a/apps/contactsinteraction/lib/AddressBookProvider.php
+++ b/apps/contactsinteraction/lib/AddressBookProvider.php
@@ -33,15 +33,10 @@ use OCP\IL10N;
 
 class AddressBookProvider implements IAddressBookProvider {
 
-       /** @var RecentContactMapper */
-       private $mapper;
-
-       /** @var IL10N */
-       private $l10n;
-
-       public function __construct(RecentContactMapper $mapper, IL10N $l10n) {
-               $this->mapper = $mapper;
-               $this->l10n = $l10n;
+       public function __construct(
+               private RecentContactMapper $mapper,
+               private IL10N $l10n,
+       ) {
        }
 
        /**

diff --git a/apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php b/apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php
index e728342e9b084f31028c15684dacd06c366759a0..f23eaa6e1d378eb7c07167179e129cf87cd77440 100644 (file)
--- a/apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php
+++ b/apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php
@@ -31,19 +31,19 @@ use OCP\BackgroundJob\IJob;
 use OCP\BackgroundJob\TimedJob;
 
 class CleanupJob extends TimedJob {
-       private RecentContactMapper $mapper;
 
-       public function __construct(ITimeFactory $time,
-                                                               RecentContactMapper $mapper) {
+       public function __construct(
+               ITimeFactory $time,
+               private RecentContactMapper $mapper,
+       ) {
                parent::__construct($time);
 
                $this->setInterval(24 * 60 * 60);
                $this->setTimeSensitivity(IJob::TIME_INSENSITIVE);
 
-               $this->mapper = $mapper;
        }
 
-       protected function run($argument) {
+       protected function run($argument): void {
                $time = $this->time->getDateTime();
                $time->modify('-7days');
                $this->mapper->cleanUp($time->getTimestamp());

diff --git a/apps/contactsinteraction/lib/Card.php b/apps/contactsinteraction/lib/Card.php
index aa73d0e2122b8c0b46866011425d6315df12e157..f39396a7326a1f663805985a9c951e77a75d150f 100644 (file)
--- a/apps/contactsinteraction/lib/Card.php
+++ b/apps/contactsinteraction/lib/Card.php
@@ -36,14 +36,11 @@ use Sabre\DAVACL\IACL;
 class Card implements ICard, IACL {
        use ACLTrait;
 
-       private RecentContact $contact;
-       private string $principal;
-       private array $acls;
-
-       public function __construct(RecentContact $contact, string $principal, array $acls) {
-               $this->contact = $contact;
-               $this->principal = $principal;
-               $this->acls = $acls;
+       public function __construct(
+               private RecentContact $contact,
+               private string $principal,
+               private array $acls,
+       ) {
        }
 
        /**
@@ -77,7 +74,7 @@ class Card implements ICard, IACL {
        /**
         * @inheritDoc
         */
-       public function get() {
+       public function get(): string {
                return $this->contact->getCard();
        }
 

diff --git a/apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php b/apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php
index 2064136c392cfdbd3de6a046f50c0291334760a1..000954a901659a6476f4b971c44c7655abcf7a20 100644 (file)
--- a/apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php
+++ b/apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php
@@ -46,28 +46,15 @@ class ContactInteractionListener implements IEventListener {
 
        use TTransactional;
 
-       private RecentContactMapper $mapper;
-       private CardSearchDao $cardSearchDao;
-       private IUserManager $userManager;
-       private IDBConnection $dbConnection;
-       private ITimeFactory $timeFactory;
-       private IL10N $l10n;
-       private LoggerInterface $logger;
-
-       public function __construct(RecentContactMapper $mapper,
-                                                               CardSearchDao $cardSearchDao,
-                                                               IUserManager $userManager,
-                                                               IDBConnection $connection,
-                                                               ITimeFactory $timeFactory,
-                                                               IL10N $l10nFactory,
-                                                               LoggerInterface $logger) {
-               $this->mapper = $mapper;
-               $this->cardSearchDao = $cardSearchDao;
-               $this->userManager = $userManager;
-               $this->dbConnection = $connection;
-               $this->timeFactory = $timeFactory;
-               $this->l10n = $l10nFactory;
-               $this->logger = $logger;
+       public function __construct(
+               private RecentContactMapper $mapper,
+               private CardSearchDao $cardSearchDao,
+               private IUserManager $userManager,
+               private IDBConnection $dbConnection,
+               private ITimeFactory $timeFactory,
+               private IL10N $l10n,
+               private LoggerInterface $logger,
+       ) {
        }
 
        public function handle(Event $event): void {