From 5beea658a463609933ea11f6c0f0fd1773daddc6 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 25 Jan 2016 18:02:01 +0100 Subject: [PATCH] Cannot use NoticeListemItem as type-hint as NoticeListItemAdapter exists. Signed-off-by: Roland Haeder --- lib/noticelistitemadapter.php | 2 +- plugins/ActivitySpam/ActivitySpamPlugin.php | 5 ++++- plugins/Share/SharePlugin.php | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/noticelistitemadapter.php b/lib/noticelistitemadapter.php index a80b63088c..9c9442db90 100644 --- a/lib/noticelistitemadapter.php +++ b/lib/noticelistitemadapter.php @@ -53,7 +53,7 @@ class NoticeListItemAdapter * * @param NoticeListItem $nli item to wrap */ - function __construct($nli) + function __construct(NoticeListItem $nli) { $this->nli = $nli; } diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php index 4e18cc31aa..ca31c7ac8e 100644 --- a/plugins/ActivitySpam/ActivitySpamPlugin.php +++ b/plugins/ActivitySpam/ActivitySpamPlugin.php @@ -142,8 +142,11 @@ class ActivitySpamPlugin extends Plugin return false; } - function onEndShowNoticeOptionItems(NoticeListItem $nli) + function onEndShowNoticeOptionItems($nli) { + // FIXME: Cannot use type-hint NoticeListItem as NoticeListItemAdapter exists, too! + assert(is_object($nli)); + $profile = Profile::current(); if (!empty($profile) && $profile->hasRight(self::TRAINSPAM)) { diff --git a/plugins/Share/SharePlugin.php b/plugins/Share/SharePlugin.php index 4928980906..a1d5f03b2c 100644 --- a/plugins/Share/SharePlugin.php +++ b/plugins/Share/SharePlugin.php @@ -227,8 +227,11 @@ class SharePlugin extends ActivityVerbHandlerPlugin * * @return void */ - public function onEndShowNoticeOptionItems(NoticeListItem $nli) + public function onEndShowNoticeOptionItems($nli) { + // FIXME: Cannot use type-hint NoticeListItem as NoticeListItemAdapter exists, too! + assert(is_object($nli)); + // FIXME: Use bitmasks (but be aware that PUBLIC_SCOPE is 0!) // Also: AHHH, $scope and $scoped are scarily similar looking. $scope = $nli->notice->getScope(); -- 2.39.2