From 1998b7811ba7fc03367eb335f8f0e6b2f9f17e0c Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin+github@philipp.info>
Date: Sat, 7 Mar 2020 13:39:09 +0100
Subject: [PATCH] Fix fatal execution path for found Network::get() parameter
 execption

---
 src/Model/Item.php                     | 8 ++++----
 src/Protocol/ActivityPub.php           | 2 +-
 src/Protocol/ActivityPub/Processor.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Model/Item.php b/src/Model/Item.php
index e31097f53c..46f2fb09a7 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3639,7 +3639,7 @@ class Item
 	 *
 	 * @return integer item id
 	 */
-	public static function fetchByLink($uri, $uid = 0)
+	public static function fetchByLink(string $uri, int $uid = 0)
 	{
 		$item_id = self::searchByLink($uri, $uid);
 		if (!empty($item_id)) {
@@ -3692,7 +3692,7 @@ class Item
 	 *
 	 * @return array item array with data from the original item
 	 */
-	public static function addShareDataFromOriginal($item)
+	public static function addShareDataFromOriginal(array $item)
 	{
 		$shared = self::getShareArray($item);
 		if (empty($shared)) {
@@ -3714,9 +3714,9 @@ class Item
 			}
 
 			// Otherwhise try to find (and possibly fetch) the item via the link. This should work for Diaspora and ActivityPub posts
-			$id = self::fetchByLink($shared['link'], $uid);
+			$id = self::fetchByLink($shared['link'] ?? '', $uid);
 			if (empty($id)) {
-				Logger::info('Original item not found', ['url' => $shared['link'], 'callstack' => System::callstack()]);
+				Logger::info('Original item not found', ['url' => $shared['link'] ?? '', 'callstack' => System::callstack()]);
 				return $item;
 			}
 
diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 6b29eabce5..3c4f4f2e67 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -87,7 +87,7 @@ class ActivityPub
 	 * @return array
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function fetchContent($url, $uid = 0)
+	public static function fetchContent(string $url, int $uid = 0)
 	{
 		if (!empty($uid)) {
 			return HTTPSignature::fetch($url, $uid);
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index e4cef17045..04d8a7467f 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -681,7 +681,7 @@ class Processor
 	 * @return string fetched message URL
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function fetchMissingActivity($url, $child = [])
+	public static function fetchMissingActivity(string $url, array $child = [])
 	{
 		if (!empty($child['receiver'])) {
 			$uid = ActivityPub\Receiver::getFirstUserFromReceivers($child['receiver']);