clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki 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
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 $user User unfriending
* @param array $contact Contact unfriended * @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 HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function terminateFriendship(array $user, array $contact): bool public static function terminateFriendship(array $user, array $contact): ?bool
{ {
if (empty($contact['network'])) { if (empty($contact['network'])) {
throw new \InvalidArgumentException('Missing network key in contact array'); 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 $user User unfriending
* @param array $contact Contact (uid != 0) unfriended * @param array $contact Contact (uid != 0) unfriended
* @param boolean $two_way Revoke eventual inbound follow as well * @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 HTTPException\InternalServerErrorException
* @throws \ImagickException * @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); $result = Protocol::terminateFriendship($user, $contact);