From c2a5c1f2c6a254143eced58733ace517aa35ddae Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 7 Nov 2016 17:39:23 +0100 Subject: [PATCH] Allow combining events Signed-off-by: Joas Schilling --- lib/private/Activity/Event.php | 18 ++++++++++++++++++ lib/public/Activity/IEvent.php | 12 ++++++++++++ 2 files changed, 30 insertions(+) diff --git a/lib/private/Activity/Event.php b/lib/private/Activity/Event.php index 73bde7f19b2..c53335a316f 100644 --- a/lib/private/Activity/Event.php +++ b/lib/private/Activity/Event.php @@ -70,6 +70,8 @@ class Event implements IEvent { /** @var string */ protected $icon = ''; + /** @var IEvent */ + protected $child = null; /** @var IValidator */ protected $richValidator; @@ -469,6 +471,22 @@ class Event implements IEvent { return $this->icon; } + /** + * @param IEvent $child + * @since 9.2.0 + */ + public function setChildEvent(IEvent $child) { + $this->child = $child; + } + + /** + * @return IEvent|null + * @since 9.2.0 + */ + public function getChildEvent() { + return $this->child; + } + /** * @return bool * @since 8.2.0 diff --git a/lib/public/Activity/IEvent.php b/lib/public/Activity/IEvent.php index 6d587c381c2..c4becf54a7e 100644 --- a/lib/public/Activity/IEvent.php +++ b/lib/public/Activity/IEvent.php @@ -292,6 +292,18 @@ interface IEvent { */ public function getIcon(); + /** + * @param IEvent $child + * @since 9.2.0 + */ + public function setChildEvent(IEvent $child); + + /** + * @return IEvent|null + * @since 9.2.0 + */ + public function getChildEvent(); + /** * @return bool * @since 9.2.0 -- 2.39.5