diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 43289a710..04dcf9907 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -233,7 +233,7 @@ class Smilies
 			$smilies = $cleaned;
 		}
 
-		$text = preg_replace_callback('/<(3+)/', 'self::pregHeart', $text);
+		$text = preg_replace_callback('/<(3+)/', 'self::heartReplaceCallback', $text);
 		$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
 
 		$text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', 'self::decode', $text);
@@ -269,22 +269,20 @@ class Smilies
 	/**
 	 * expand <3333 to the correct number of hearts
 	 *
-	 * @param string $x string
+	 * @param array $matches
 	 * @return string HTML Output
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function pregHeart(string $x): string
+	private static function heartReplaceCallback(array $matches): string
 	{
-		if (strlen($x[1]) == 1) {
-			return $x[0];
+		if (strlen($matches[1]) == 1) {
+			return $matches[0];
 		}
 
 		$t = '';
-		for ($cnt = 0; $cnt < strlen($x[1]); $cnt ++) {
+		for ($cnt = 0; $cnt < strlen($matches[1]); $cnt ++) {
 			$t .= '❤';
 		}
 
-		$r =  str_replace($x[0], $t, $x[0]);
-		return $r;
+		return str_replace($matches[0], $t, $matches[0]);
 	}
 }
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index d7995a8d1..5b4f29028 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1190,10 +1190,10 @@ class Transmitter
 	 *
 	 * @param integer $item_id Item id
 	 * @param boolean $force Force new cache entry
-	 * @return array with the activity
+	 * @return array|false activity or false on failure
 	 * @throws \Exception
 	 */
-	public static function createCachedActivityFromItem(int $item_id, bool $force = false): array
+	public static function createCachedActivityFromItem(int $item_id, bool $force = false)
 	{
 		$cachekey = 'APDelivery:createActivity:' . $item_id;