aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Activity
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/Activity')
-rw-r--r--lib/private/Activity/Event.php19
-rw-r--r--lib/private/Activity/EventMerger.php1
-rw-r--r--lib/private/Activity/Manager.php1
3 files changed, 9 insertions, 12 deletions
diff --git a/lib/private/Activity/Event.php b/lib/private/Activity/Event.php
index 810af5c0612..39cdc12b3fb 100644
--- a/lib/private/Activity/Event.php
+++ b/lib/private/Activity/Event.php
@@ -34,7 +34,7 @@ class Event implements IEvent {
protected $subjectParsed = '';
/** @var string */
protected $subjectRich = '';
- /** @var array */
+ /** @var array<string, array<string, string>> */
protected $subjectRichParameters = [];
/** @var string */
protected $message = '';
@@ -44,7 +44,7 @@ class Event implements IEvent {
protected $messageParsed = '';
/** @var string */
protected $messageRich = '';
- /** @var array */
+ /** @var array<string, array<string, string>> */
protected $messageRichParameters = [];
/** @var string */
protected $objectType = '';
@@ -415,8 +415,7 @@ class Event implements IEvent {
public function isValid(): bool {
return
$this->isValidCommon()
- &&
- $this->getSubject() !== ''
+ && $this->getSubject() !== ''
;
}
@@ -443,20 +442,16 @@ class Event implements IEvent {
return
$this->isValidCommon()
- &&
- $this->getParsedSubject() !== ''
+ && $this->getParsedSubject() !== ''
;
}
protected function isValidCommon(): bool {
return
$this->getApp() !== ''
- &&
- $this->getType() !== ''
- &&
- $this->getAffectedUser() !== ''
- &&
- $this->getTimestamp() !== 0
+ && $this->getType() !== ''
+ && $this->getAffectedUser() !== ''
+ && $this->getTimestamp() !== 0
/**
* Disabled for BC with old activities
* &&
diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php
index 504f9088f24..0e7d318103a 100644
--- a/lib/private/Activity/EventMerger.php
+++ b/lib/private/Activity/EventMerger.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/lib/private/Activity/Manager.php b/lib/private/Activity/Manager.php
index 5c306fe6399..4e10f8a0c1a 100644
--- a/lib/private/Activity/Manager.php
+++ b/lib/private/Activity/Manager.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.