Merge branch 'master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --combined plugins/OStatus/OStatusPlugin.php
index 9d471076337e4801576cf59c90c583e5ed1fa7ae,66c8e47f8cb53ede29c88668c02f6c387158384e..7c0530eb6611c2ed13da417e0eb562c7f2482c0b
--- 1/plugins/OStatus/OStatusPlugin.php
--- 2/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@@ -306,7 -306,7 +306,7 @@@ class OStatusPlugin extends Plugi
       * @param array &$mention in/out param: set of found mentions
       * @return boolean hook return value
       */
 -    function onEndFindMentions(Profile $sender, $text, &$mentions)
 +    function onEndFindMentions($sender, $text, &$mentions)
      {
          $matches = array();
  
@@@ -1373,7 -1373,7 +1373,7 @@@
          return true;
      }
  
-     public function onProfileDeleteRelated($profile, &$related)
+     public function onProfileDeleteRelated(Profile $profile, array &$related)
      {
          // Ostatus_profile has a 'profile_id' property, which will be used to find the object
          $related[] = 'Ostatus_profile';

diff --combined plugins/UserFlag/UserFlagPlugin.php
index 696019337a04257461498a6bf6bee511c931c8a2,27ebefb05377612d783d8bb41d391dc4dbef0327..986dd901a0f0a86ef828d001f7b16553fd3edac1
--- 1/plugins/UserFlag/UserFlagPlugin.php
--- 2/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@@ -152,8 -152,6 +152,8 @@@ class UserFlagPlugin extends Plugi
       * @param boolean &$result out, result of the check
       *
       * @return boolean hook result
 +     * @TODO Other implementing classes expect Profile here!!!
 +     * @WARNING
       */
      function onUserRightsCheck($user, $right, &$result)
      {
@@@ -177,7 -175,7 +177,7 @@@
       *
       * @return boolean hook result
       */
-     function onEndBlockProfile($user, $profile)
+     function onEndBlockProfile(User $user, Profile $profile)
      {
          if ($this->flagOnBlock && !User_flag_profile::exists($profile->id,
                                                               $user->id)) {
@@@ -198,9 -196,9 +198,9 @@@
       *
       * @return boolean hook result
       */
-     function onProfileDeleteRelated($profile, &$related)
+     public function onProfileDeleteRelated(Profile $profile, array &$related)
      {
-         $related[] = 'user_flag_profile';
+         $related[] = 'User_flag_profile';
          return true;
      }