From e6feed65bf2ae97f41c335a33fbedd8a23e72ac1 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 2 Jul 2022 22:14:20 -0400 Subject: [PATCH 1/2] Rename Smilies::pregHeart to better match its purpose - Fix "Argument 1 passed to Friendica\Content\Smilies::pregHeart() must be of the type string, array given" error --- src/Content/Smilies.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 43289a710a..04dcf99070 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]); } } From 181c142bb484fc15e99b68871434c120d3ae3482 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 2 Jul 2022 22:16:46 -0400 Subject: [PATCH 2/2] Remove overly strict type-hint in ActivityPub\Transmission::createCachedActivityFromItem - Fix "Return value of Friendica\Protocol\ActivityPub\Transmitter::createCachedActivityFromItem() must be of the type array, bool returned" error --- src/Protocol/ActivityPub/Transmitter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index d7995a8d1a..5b4f29028d 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;