From 66d4f1d40bac32fdece001cd734c9ace6cced182 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 13 Jun 2019 19:07:39 -0400 Subject: [PATCH] Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion --- src/Protocol/ActivityPub/Receiver.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index 97bd7dc7e7..735e412fde 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -736,11 +736,11 @@ class Receiver * @param boolean $trust_source Do we trust the provided object? * @param integer $uid User ID for the signature that we use to fetch data * - * @return array with trusted and valid object data + * @return array|false with trusted and valid object data * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - private static function fetchObject($object_id, $object = [], $trust_source = false, $uid = 0) + private static function fetchObject(string $object_id, array $object = [], bool $trust_source = false, int $uid = 0) { // By fetching the type we check if the object is complete. $type = JsonLD::fetchElement($object, '@type'); @@ -786,6 +786,7 @@ class Receiver } Logger::log('Unhandled object type: ' . $type, Logger::DEBUG); + return false; } /**