bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Fix overly strict return value for terminateFriendship methods

Browse source
This commit is contained in:
Hypolite Petovan 2021-10-06 20:18:44 -04:00
parent ba511c3b52
commit 456ae169ab
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Core/Protocol.php
View file

@ -213,11 +213,11 @@ class Protocol
*
* @param array $user User unfriending
* @param array $contact Contact unfriended
* @return bool|null true if successful, false if not, null if no action was performed
* @return bool|null true if successful, false if not, null if no remote action was performed
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function terminateFriendship(array $user, array $contact): bool
public static function terminateFriendship(array $user, array $contact): ?bool
{
if (empty($contact['network'])) {
throw new \InvalidArgumentException('Missing network key in contact array');

4
src/Model/Contact.php
View file

@ -832,11 +832,11 @@ class Contact
* @param array $user User unfriending
* @param array $contact Contact (uid != 0) unfriended
* @param boolean $two_way Revoke eventual inbound follow as well
* @return bool|null true if successful, false if not, null if no action was performed
* @return bool|null true if successful, false if not, null if no remote action was performed
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function terminateFriendship(array $user, array $contact): bool
public static function terminateFriendship(array $user, array $contact): ?bool
{
$result = Protocol::terminateFriendship($user, $contact);