Skip to content

Commit 48edc27

Browse files
chore: Improve possibly null getters
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
1 parent 8f0025c commit 48edc27

1 file changed

Lines changed: 15 additions & 12 deletions

File tree

apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,14 @@ public function handle(Event $event): void {
8686
}
8787

8888
$this->atomic(function () use ($event) {
89+
$uid = $event->getUid();
90+
$email = $event->getEmail();
91+
$federatedCloudId = $event->getFederatedCloudId();
8992
$existing = $this->mapper->findMatch(
9093
$event->getActor(),
91-
$event->getUid(),
92-
$event->getEmail(),
93-
$event->getFederatedCloudId()
94+
$uid,
95+
$email,
96+
$federatedCloudId
9497
);
9598
if (!empty($existing)) {
9699
$now = $this->timeFactory->getTime();
@@ -104,22 +107,22 @@ public function handle(Event $event): void {
104107

105108
$contact = new RecentContact();
106109
$contact->setActorUid($event->getActor()->getUID());
107-
if ($event->getUid() !== null) {
108-
$contact->setUid($event->getUid());
110+
if ($uid !== null) {
111+
$contact->setUid($uid);
109112
}
110-
if ($event->getEmail() !== null) {
111-
$contact->setEmail($event->getEmail());
113+
if ($email !== null) {
114+
$contact->setEmail($email);
112115
}
113-
if ($event->getFederatedCloudId() !== null) {
114-
$contact->setFederatedCloudId($event->getFederatedCloudId());
116+
if ($federatedCloudId !== null) {
117+
$contact->setFederatedCloudId($federatedCloudId);
115118
}
116119
$contact->setLastContact($this->timeFactory->getTime());
117120

118121
$copy = $this->cardSearchDao->findExisting(
119122
$event->getActor(),
120-
$event->getUid(),
121-
$event->getEmail(),
122-
$event->getFederatedCloudId()
123+
$uid,
124+
$email,
125+
$federatedCloudId
123126
);
124127
if ($copy !== null) {
125128
try {

0 commit comments

Comments
 (0)