diff options
Diffstat (limited to 'lib/private/Activity/EventMerger.php')
| -rw-r--r-- | lib/private/Activity/EventMerger.php | 2 |
1 files changed, 1 insertions, 1 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; |