Merge pull request #35426 from nextcloud/cleanup/contactintegration

Cleanup contactsinteraction

apps/contactsinteraction/lib/AddressBook.php

@@ -40,18 +40,13 @@ use Sabre\DAVACL\ACLTrait;
 use Sabre\DAVACL\IACL;
 
 class AddressBook extends ExternalAddressBook implements IACL {
-	public const URI = 'recent';
-
 	use ACLTrait;
 
-	/** @var RecentContactMapper */
-	private $mapper;
+	public const URI = 'recent';
 
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var string */
-	private $principalUri;
+	private RecentContactMapper $mapper;
+	private IL10N $l10n;
+	private string $principalUri;
 
 	public function __construct(RecentContactMapper $mapper,
 								IL10N $l10n,
@@ -81,7 +76,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
 	 * @inheritDoc
 	 * @throws NotFound
 	 */
-	public function getChild($name) {
+	public function getChild($name): Card {
 		try {
 			return new Card(
 				$this->mapper->find(
@@ -115,7 +110,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
 	/**
 	 * @inheritDoc
 	 */
-	public function childExists($name) {
+	public function childExists($name): bool {
 		try {
 			$this->mapper->find(
 				$this->getUid(),
@@ -160,7 +155,7 @@ class AddressBook extends ExternalAddressBook implements IACL {
 	/**
 	 * @inheritDoc
 	 */
-	public function getACL() {
+	public function getACL(): array {
 		return [
 			[
 				'privilege' => '{DAV:}read',

apps/contactsinteraction/lib/BackgroundJob/CleanupJob.php

@@ -31,9 +31,7 @@ use OCP\BackgroundJob\IJob;
 use OCP\BackgroundJob\TimedJob;
 
 class CleanupJob extends TimedJob {
-
-	/** @var RecentContactMapper */
-	private $mapper;
+	private RecentContactMapper $mapper;
 
 	public function __construct(ITimeFactory $time,
 								RecentContactMapper $mapper) {

apps/contactsinteraction/lib/Card.php

@@ -36,14 +36,9 @@ use Sabre\DAVACL\IACL;
 class Card implements ICard, IACL {
 	use ACLTrait;
 
-	/** @var RecentContact */
-	private $contact;
-
-	/** @var string */
-	private $principal;
-
-	/** @var array */
-	private $acls;
+	private RecentContact $contact;
+	private string $principal;
+	private array $acls;
 
 	public function __construct(RecentContact $contact, string $principal, array $acls) {
 		$this->contact = $contact;

apps/contactsinteraction/lib/Db/CardSearchDao.php

@@ -32,9 +32,7 @@ use function is_resource;
 use function stream_get_contents;
 
 class CardSearchDao {
-
-	/** @var IDBConnection */
-	private $db;
+	private IDBConnection $db;
 
 	public function __construct(IDBConnection $db) {
 		$this->db = $db;

apps/contactsinteraction/lib/Db/RecentContact.php

@@ -42,24 +42,12 @@ use OCP\AppFramework\Db\Entity;
  * @method int getLastContact()
  */
 class RecentContact extends Entity {
-
-	/** @var string */
-	protected $actorUid;
-
-	/** @var string|null */
-	protected $uid;
-
-	/** @var string|null */
-	protected $email;
-
-	/** @var string|null */
-	protected $federatedCloudId;
-
-	/** @var string */
-	protected $card;
-
-	/** @var int */
-	protected $lastContact;
+	protected string $actorUid = '';
+	protected ?string $uid = null;
+	protected ?string $email = null;
+	protected ?string $federatedCloudId = null;
+	protected string $card = '';
+	protected int $lastContact = -1;
 
 	public function __construct() {
 		$this->addType('actorUid', 'string');

apps/contactsinteraction/lib/Db/RecentContactMapper.php

@@ -56,10 +56,6 @@ class RecentContactMapper extends QBMapper {
 	}
 
 	/**
-	 * @param string $uid
-	 * @param int $id
-	 *
-	 * @return RecentContact
 	 * @throws DoesNotExistException
 	 */
 	public function find(string $uid, int $id): RecentContact {
@@ -75,11 +71,6 @@ class RecentContactMapper extends QBMapper {
 	}
 
 	/**
-	 * @param IUser $user
-	 * @param string|null $uid
-	 * @param string|null $email
-	 * @param string|null $cloudId
-	 *
 	 * @return RecentContact[]
 	 */
 	public function findMatch(IUser $user,
@@ -108,11 +99,7 @@ class RecentContactMapper extends QBMapper {
 		return $this->findEntities($select);
 	}
 
-	/**
-	 * @param string $uid
-	 * @return int|null
-	 */
-	public function findLastUpdatedForUserId(string $uid):?int {
+	public function findLastUpdatedForUserId(string $uid): ?int {
 		$qb = $this->db->getQueryBuilder();
 
 		$select = $qb
@@ -122,7 +109,7 @@ class RecentContactMapper extends QBMapper {
 			->orderBy('last_contact', 'DESC')
 			->setMaxResults(1);
 
-		$cursor = $select->execute();
+		$cursor = $select->executeQuery();
 		$row = $cursor->fetch();
 
 		if ($row === false) {
@@ -139,6 +126,6 @@ class RecentContactMapper extends QBMapper {
 			->delete($this->getTableName())
 			->where($qb->expr()->lt('last_contact', $qb->createNamedParameter($olderThan)));
 
-		$delete->execute();
+		$delete->executeStatement();
 	}
 }

apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php

@@ -41,24 +41,12 @@ use Sabre\VObject\UUIDUtil;
 use Throwable;
 
 class ContactInteractionListener implements IEventListener {
-
-	/** @var RecentContactMapper */
-	private $mapper;
-
-	/** @var CardSearchDao */
-	private $cardSearchDao;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var LoggerInterface */
-	private $logger;
+	private RecentContactMapper $mapper;
+	private CardSearchDao $cardSearchDao;
+	private IUserManager $userManager;
+	private ITimeFactory $timeFactory;
+	private IL10N $l10n;
+	private LoggerInterface $logger;
 
 	public function __construct(RecentContactMapper $mapper,
 								CardSearchDao $cardSearchDao,

apps/dav/lib/CardDAV/Integration/ExternalAddressBook.php

@@ -50,16 +50,9 @@ abstract class ExternalAddressBook implements IAddressBook, DAV\IProperties {
 	 */
 	private const DELIMITER = '--';
 
-	/** @var string */
-	private $appId;
+	private string $appId;
+	private string $uri;
 
-	/** @var string */
-	private $uri;
-
-	/**
-	 * @param string $appId
-	 * @param string $uri
-	 */
 	public function __construct(string $appId, string $uri) {
 		$this->appId = $appId;
 		$this->uri = $uri;