diff options
Diffstat (limited to 'lib/private/Activity')
| -rw-r--r-- | lib/private/Activity/EventMerger.php | 2 | ||||
| -rw-r--r-- | lib/private/Activity/Manager.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php index 9332d8b111a..5775e23a503 100644 --- a/lib/private/Activity/EventMerger.php +++ b/lib/private/Activity/EventMerger.php @@ -67,7 +67,7 @@ class EventMerger implements IEventMerger { * @param IEvent|null $previousEvent * @return IEvent */ - public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null) { + public function mergeEvents($mergeParameter, IEvent $event, ?IEvent $previousEvent = null) { // No second event => can not combine if (!$previousEvent instanceof IEvent) { return $event; diff --git a/lib/private/Activity/Manager.php b/lib/private/Activity/Manager.php index 14069260c6c..b8568a18b81 100644 --- a/lib/private/Activity/Manager.php +++ b/lib/private/Activity/Manager.php @@ -348,7 +348,7 @@ class Manager implements IManager { * @param string|null $currentUserId * @throws \UnexpectedValueException If the user is invalid */ - public function setCurrentUserId(string $currentUserId = null): void { + public function setCurrentUserId(?string $currentUserId = null): void { if (!is_string($currentUserId) && $currentUserId !== null) { throw new \UnexpectedValueException('The given current user is invalid'); } |