Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / ActivitySpam / ActivitySpamPlugin.php

diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php
index 9d61b2ddddba392d34a59203dbe0fccbc14f512b..ca31c7ac8e7ea596a7d39fd6c1c3f5db39b704f8 100644 (file)
--- a/plugins/ActivitySpam/ActivitySpamPlugin.php
+++ b/plugins/ActivitySpam/ActivitySpamPlugin.php
@@ -100,7 +100,7 @@ class ActivitySpamPlugin extends Plugin
      * @return boolean hook value; true means continue processing, false means stop.
      */
 
-    function onEndNoticeSave($notice)
+    function onEndNoticeSave(Notice $notice)
     {
         try {
 
@@ -118,7 +118,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onNoticeDeleteRelated($notice) {
+    function onNoticeDeleteRelated(Notice $notice) {
         $score = Spam_score::getKV('notice_id', $notice->id);
         if (!empty($score)) {
             $score->delete();
@@ -126,7 +126,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onUserRightsCheck($profile, $right, &$result) {
+    function onUserRightsCheck(Profile $profile, $right, &$result) {
         switch ($right) {
         case self::REVIEWSPAM:
         case self::TRAINSPAM:
@@ -144,6 +144,9 @@ class ActivitySpamPlugin extends Plugin
 
     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)) {
@@ -191,7 +194,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onEndShowStyles($action)
+    function onEndShowStyles(Action $action)
     {
         $action->element('style', null,
                          '.form-train-spam input.submit { background: url('.$this->path('icons/bullet_black.png').') no-repeat 0px 0px } ' . "\n" .
@@ -199,7 +202,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onEndPublicGroupNav($nav)
+    function onEndPublicGroupNav(Menu $nav)
     {
         $user = common_current_user();
 
@@ -226,7 +229,7 @@ class ActivitySpamPlugin extends Plugin
         return true;
     }
 
-    function onEndNoticeInScope($notice, $profile, &$bResult)
+    function onEndNoticeInScope(Notice $notice, Profile $profile, &$bResult)
     {
         if ($this->hideSpam) {
             if ($bResult) {