Merge pull request #12057 from Quix0r/rewrites/type-hints

Added missing type-hints and formatted some arrays

src/Content/OEmbed.php

@@ -391,7 +391,7 @@ class OEmbed
 	 * @param string $title Optional title (default: what comes from OEmbed object)
 	 * @return string Formatted HTML
 	 */
-	public static function getHTML(string $url, string $title = '')
+	public static function getHTML(string $url, string $title = ''): string
 	{
 		$o = self::fetchURL($url, !self::isAllowedURL($url));
 

src/Content/Widget/CalendarExport.php

@@ -34,12 +34,14 @@ class CalendarExport
 {
 	/**
 	 * Get the events widget.
+	 *
 	 * @param int $uid
 	 *
 	 * @return string Formated HTML of the calendar widget.
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function getHTML(int $uid = 0) {
+	public static function getHTML(int $uid = 0): string
+	{
 		if (empty($uid)) {
 			return '';
 		}
@@ -49,11 +51,11 @@ class CalendarExport
 			return '';
 		}
 
-		$tpl = Renderer::getMarkupTemplate("widget/events.tpl");
+		$tpl = Renderer::getMarkupTemplate('widget/events.tpl');
 		$return = Renderer::replaceMacros($tpl, [
-			'$etitle'      => DI::l10n()->t("Export"),
+			'$etitle'      => DI::l10n()->t('Export'),
-			'$export_ical' => DI::l10n()->t("Export calendar as ical"),
+			'$export_ical' => DI::l10n()->t('Export calendar as ical'),
-			'$export_csv'  => DI::l10n()->t("Export calendar as csv"),
+			'$export_csv'  => DI::l10n()->t('Export calendar as csv'),
 			'$user'        => $user['nickname']
 		]);
 

src/Content/Widget/ContactBlock.php

@@ -42,9 +42,9 @@ class ContactBlock
 	 *
 	 * @template widget/contacts.tpl
 	 * @hook contact_block_end (contacts=>array, output=>string)
-	 * @return string
+	 * @return string Formatted HTML code or empty string
 	 */
-	public static function getHTML(array $profile, int $visitor_uid = null)
+	public static function getHTML(array $profile, int $visitor_uid = null): string
 	{
 		$o = '';
 
@@ -66,13 +66,13 @@ class ContactBlock
 		$contacts = [];
 
 		$total = DBA::count('contact', [
-			'uid' => $profile['uid'],
+			'uid'     => $profile['uid'],
-			'self' => false,
+			'self'    => false,
 			'blocked' => false,
 			'pending' => false,
-			'hidden' => false,
+			'hidden'  => false,
 			'archive' => false,
-			'failed' => false,
+			'failed'  => false,
 			'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::FEED],
 		]);
 
@@ -89,15 +89,17 @@ class ContactBlock
 			}
 
 			$personal_contacts = DBA::selectToArray('contact', ['uri-id'], [
-				'uid' => $profile['uid'],
+				'uid'     => $profile['uid'],
-				'self' => false,
+				'self'    => false,
 				'blocked' => false,
 				'pending' => false,
-				'hidden' => false,
+				'hidden'  => false,
 				'archive' => false,
-				'rel' => $rel,
+				'rel'     => $rel,
 				'network' => Protocol::FEDERATED,
-			], ['limit' => $shown]);
+			], [
+				'limit' => $shown,
+			]);
 
 			$contact_uriids = array_column($personal_contacts, 'uri-id');
 

src/Content/Widget/SavedSearches.php

@@ -34,7 +34,7 @@ class SavedSearches
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function getHTML($return_url, $search = '')
+	public static function getHTML(string $return_url, string $search = ''): string
 	{
 		$saved = [];
 		$saved_searches = DBA::select('search', ['id', 'term'], ['uid' => DI::userSession()->getLocalUserId()]);

src/Content/Widget/TagCloud.php

@@ -46,7 +46,7 @@ class TagCloud
 	 * @return string       HTML formatted output.
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function getHTML($uid, $count = 0, $owner_id = 0, $flags = '', $type = Tag::HASHTAG)
+	public static function getHTML(int $uid, int $count = 0, int $owner_id = 0, string $flags = '', int $type = Tag::HASHTAG): string
 	{
 		$o = '';
 		$r = self::tagadelic($uid, $count, $owner_id, $flags, $type);
@@ -56,17 +56,17 @@ class TagCloud
 
 			$tags = [];
 			foreach ($r as $rr) {
-				$tag['level'] = $rr[2];
+				$tags[] = [
-				$tag['url'] = $url . '?tag=' . urlencode($rr[0]);
+					'level' => $rr[2],
-				$tag['name'] = $rr[0];
+					'url'   => $url . '?tag=' . urlencode($rr[0]),
-
+					'name'  => $rr[0],
-				$tags[] = $tag;
+				];
 			}
 
 			$tpl = Renderer::getMarkupTemplate('widget/tagcloud.tpl');
 			$o = Renderer::replaceMacros($tpl, [
 				'$title' => DI::l10n()->t('Tags'),
-				'$tags' => $tags
+				'$tags'  => $tags
 			]);
 		}
 		return $o;

src/Content/Widget/TrendingTags.php

@@ -35,10 +35,11 @@ class TrendingTags
 	/**
 	 * @param string $content 'global' (all posts) or 'local' (this node's posts only)
 	 * @param int    $period  Period in hours to consider posts
-	 * @return string
+	 *
+	 * @return string Formatted HTML code
 	 * @throws \Exception
 	 */
-	public static function getHTML($content = 'global', int $period = 24)
+	public static function getHTML(string $content = 'global', int $period = 24): string
 	{
 		if ($content == 'local') {
 			$tags = Tag::getLocalTrendingHashtags($period, 20);
@@ -49,8 +50,8 @@ class TrendingTags
 		$tpl = Renderer::getMarkupTemplate('widget/trending_tags.tpl');
 		$o = Renderer::replaceMacros($tpl, [
 			'$title' => DI::l10n()->tt('Trending Tags (last %d hour)', 'Trending Tags (last %d hours)', $period),
-			'$more' => DI::l10n()->t('More Trending Tags'),
+			'$more'  => DI::l10n()->t('More Trending Tags'),
-			'$tags' => $tags,
+			'$tags'  => $tags,
 		]);
 
 		return $o;

src/Content/Widget/VCard.php

@@ -44,7 +44,7 @@ class VCard
 	 * @template widget/vcard.tpl
 	 * @return string
 	 */
-	public static function getHTML(array $contact)
+	public static function getHTML(array $contact): string
 	{
 		if (!isset($contact['network']) || !isset($contact['id'])) {
 			Logger::warning('Incomplete contact', ['contact' => $contact ?? [], 'callstack' => System::callstack(20)]);