From 6f93ee7e49fc555e10a008e04567cd72105533dc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 19 Nov 2022 19:10:02 -0500 Subject: [PATCH] Fix various PHP 8 deprecations --- src/Content/Nav.php | 8 ++------ src/Model/APContact.php | 4 ++-- src/Model/Item.php | 4 ++-- src/Model/Post/Media.php | 4 ++-- src/Module/Home.php | 2 +- src/Network/HTTPClient/Client/HttpClient.php | 2 +- src/Protocol/Diaspora.php | 2 +- src/Render/FriendicaSmartyEngine.php | 2 +- src/Worker/Notifier.php | 2 +- view/theme/frio/php/PHPColors/Color.php | 12 ++++++------ 10 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/Content/Nav.php b/src/Content/Nav.php index 0000b3d296..cb2edb4eb6 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -244,12 +244,8 @@ class Nav } $gdirpath = 'directory'; - - if (strlen(DI::config()->get('system', 'singleuser'))) { - $gdir = DI::config()->get('system', 'directory'); - if (strlen($gdir)) { - $gdirpath = Profile::zrl($gdir, true); - } + if (DI::config()->get('system', 'singleuser') && DI::config()->get('system', 'directory')) { + $gdirpath = Profile::zrl(DI::config()->get('system', 'directory'), true); } if ((DI::userSession()->getLocalUserId() || DI::config()->get('system', 'community_page_style') != Community::DISABLED_VISITOR) && diff --git a/src/Model/APContact.php b/src/Model/APContact.php index 742efcf190..3b568f39f1 100644 --- a/src/Model/APContact.php +++ b/src/Model/APContact.php @@ -383,7 +383,7 @@ class APContact // kroeg:blocks, updated // When the photo is too large, try to shorten it by removing parts - if (strlen($apcontact['photo']) > 255) { + if (strlen($apcontact['photo'] ?? '') > 255) { $parts = parse_url($apcontact['photo']); unset($parts['fragment']); $apcontact['photo'] = (string)Uri::fromParts($parts); @@ -574,7 +574,7 @@ class APContact * * @param array $apcontact * - * @return bool + * @return bool */ public static function isRelay(array $apcontact): bool { diff --git a/src/Model/Item.php b/src/Model/Item.php index 900bf3a2c4..7c8804a290 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -210,7 +210,7 @@ class Item $fields['raw-body'] = BBCode::removeSharedData($fields['raw-body']); } } - + Post\Media::insertFromAttachmentData($item['uri-id'], $fields['body']); $content_fields = ['raw-body' => trim($fields['raw-body'] ?? $fields['body'])]; @@ -337,7 +337,7 @@ class Item * generate a resource-id and therefore aren't intimately linked to the item. */ /// @TODO: this should first check if photo is used elsewhere - if (strlen($item['resource-id'])) { + if ($item['resource-id']) { Photo::delete(['resource-id' => $item['resource-id'], 'uid' => $item['uid']]); } diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index 6cee11e6c8..04c0db0f80 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -279,7 +279,7 @@ class Media if (!empty($contact['gsid'])) { $gserver = DBA::selectFirst('gserver', ['url', 'site_name'], ['id' => $contact['gsid']]); } - + $media['type'] = self::ACTIVITY; $media['media-uri-id'] = $item['uri-id']; $media['height'] = null; @@ -687,7 +687,7 @@ class Media $previews[] = $medium['preview']; } - $type = explode('/', current(explode(';', $medium['mimetype']))); + $type = explode('/', explode(';', $medium['mimetype'])[0]); if (count($type) < 2) { Logger::info('Unknown MimeType', ['type' => $type, 'media' => $medium]); $filetype = 'unkn'; diff --git a/src/Module/Home.php b/src/Module/Home.php index ca4c4b8959..06bfa5eba5 100644 --- a/src/Module/Home.php +++ b/src/Module/Home.php @@ -46,7 +46,7 @@ class Home extends BaseModule DI::baseUrl()->redirect('network'); } - if (strlen($config->get('system', 'singleuser'))) { + if ($config->get('system', 'singleuser')) { DI::baseUrl()->redirect('/profile/' . $config->get('system', 'singleuser')); } diff --git a/src/Network/HTTPClient/Client/HttpClient.php b/src/Network/HTTPClient/Client/HttpClient.php index cfc8fbfab1..32a1a22fc2 100644 --- a/src/Network/HTTPClient/Client/HttpClient.php +++ b/src/Network/HTTPClient/Client/HttpClient.php @@ -254,7 +254,7 @@ class HttpClient implements ICanSendHttpRequests $urlResult = $this->resolver->resolveURL($url); if ($urlResult->didErrorOccur()) { - throw new TransferException($urlResult->getErrorMessageString(), $urlResult->getHTTPStatusCode()); + throw new TransferException($urlResult->getErrorMessageString(), $urlResult->getHTTPStatusCode() ?? 0); } return $urlResult->getURL(); diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 8a5969dde1..09f4380b0b 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -3638,7 +3638,7 @@ class Diaspora Logger::info('Got relayable data ' . $type . ' for item ' . $item['guid'] . ' (' . $item['id'] . ')'); - $msg = json_decode($item['signed_text'], true); + $msg = json_decode($item['signed_text'] ?? '', true); $message = []; if (is_array($msg)) { diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php index 5ea01166fd..201d99f822 100644 --- a/src/Render/FriendicaSmartyEngine.php +++ b/src/Render/FriendicaSmartyEngine.php @@ -81,7 +81,7 @@ final class FriendicaSmartyEngine extends TemplateEngine // "middleware": inject variables into templates $arr = [ - 'template' => basename($this->smarty->filename), + 'template' => basename($this->smarty->filename ?? ''), 'vars' => $vars ]; Hook::callAll('template_vars', $arr); diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 10fe6e3abc..db593b6a47 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -336,7 +336,7 @@ class Notifier foreach ($items as $item) { $recipients[] = $item['contact-id']; // pull out additional tagged people to notify (if public message) - if ($public_message && strlen($item['inform'])) { + if ($public_message && $item['inform']) { $people = explode(',',$item['inform']); foreach ($people as $person) { if (substr($person,0,4) === 'cid:') { diff --git a/view/theme/frio/php/PHPColors/Color.php b/view/theme/frio/php/PHPColors/Color.php index e4de79c40a..30de579966 100644 --- a/view/theme/frio/php/PHPColors/Color.php +++ b/view/theme/frio/php/PHPColors/Color.php @@ -132,16 +132,16 @@ class Color { $var_1 = 2 * $L - $var_2; - $r = round(255 * self::_huetorgb( $var_1, $var_2, $H + (1/3) )); - $g = round(255 * self::_huetorgb( $var_1, $var_2, $H )); - $b = round(255 * self::_huetorgb( $var_1, $var_2, $H - (1/3) )); + $r = 255 * self::_huetorgb( $var_1, $var_2, $H + (1/3) ); + $g = 255 * self::_huetorgb( $var_1, $var_2, $H ); + $b = 255 * self::_huetorgb( $var_1, $var_2, $H - (1/3) ); } // Convert to hex - $r = dechex($r); - $g = dechex($g); - $b = dechex($b); + $r = dechex(round($r)); + $g = dechex(round($g)); + $b = dechex(round($b)); // Make sure we get 2 digits for decimals $r = (strlen("".$r)===1) ? "0".$r:$r;