tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Fix various PHP 8 deprecations

Browse source
This commit is contained in:
Hypolite Petovan 2022-11-19 19:10:02 -05:00
parent a147038c2e
commit 6f93ee7e49
10 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Content/Nav.php
View file

@ -244,12 +244,8 @@ class Nav
} }
$gdirpath = 'directory'; $gdirpath = 'directory';
if (DI::config()->get('system', 'singleuser') && DI::config()->get('system', 'directory')) {
if (strlen(DI::config()->get('system', 'singleuser'))) { $gdirpath = Profile::zrl(DI::config()->get('system', 'directory'), true);
$gdir = DI::config()->get('system', 'directory');
if (strlen($gdir)) {
$gdirpath = Profile::zrl($gdir, true);
}
} }
if ((DI::userSession()->getLocalUserId() || DI::config()->get('system', 'community_page_style') != Community::DISABLED_VISITOR) && if ((DI::userSession()->getLocalUserId() || DI::config()->get('system', 'community_page_style') != Community::DISABLED_VISITOR) &&

2
src/Model/APContact.php
View file

@ -383,7 +383,7 @@ class APContact
// kroeg:blocks, updated // kroeg:blocks, updated
// When the photo is too large, try to shorten it by removing parts // 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']); $parts = parse_url($apcontact['photo']);
unset($parts['fragment']); unset($parts['fragment']);
$apcontact['photo'] = (string)Uri::fromParts($parts); $apcontact['photo'] = (string)Uri::fromParts($parts);

2
src/Model/Item.php
View file

@ -337,7 +337,7 @@ class Item
* generate a resource-id and therefore aren't intimately linked to the item. * generate a resource-id and therefore aren't intimately linked to the item.
*/ */
/// @TODO: this should first check if photo is used elsewhere /// @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']]); Photo::delete(['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
} }

2
src/Model/Post/Media.php
View file

@ -687,7 +687,7 @@ class Media
$previews[] = $medium['preview']; $previews[] = $medium['preview'];
} }
$type = explode('/', current(explode(';', $medium['mimetype']))); $type = explode('/', explode(';', $medium['mimetype'])[0]);
if (count($type) < 2) { if (count($type) < 2) {
Logger::info('Unknown MimeType', ['type' => $type, 'media' => $medium]); Logger::info('Unknown MimeType', ['type' => $type, 'media' => $medium]);
$filetype = 'unkn'; $filetype = 'unkn';

2
src/Module/Home.php
View file

@ -46,7 +46,7 @@ class Home extends BaseModule
DI::baseUrl()->redirect('network'); DI::baseUrl()->redirect('network');
} }
if (strlen($config->get('system', 'singleuser'))) { if ($config->get('system', 'singleuser')) {
DI::baseUrl()->redirect('/profile/' . $config->get('system', 'singleuser')); DI::baseUrl()->redirect('/profile/' . $config->get('system', 'singleuser'));
} }

2
src/Network/HTTPClient/Client/HttpClient.php
View file

@ -254,7 +254,7 @@ class HttpClient implements ICanSendHttpRequests
$urlResult = $this->resolver->resolveURL($url); $urlResult = $this->resolver->resolveURL($url);
if ($urlResult->didErrorOccur()) { if ($urlResult->didErrorOccur()) {
throw new TransferException($urlResult->getErrorMessageString(), $urlResult->getHTTPStatusCode()); throw new TransferException($urlResult->getErrorMessageString(), $urlResult->getHTTPStatusCode() ?? 0);
} }
return $urlResult->getURL(); return $urlResult->getURL();

2
src/Protocol/Diaspora.php
View file

@ -3638,7 +3638,7 @@ class Diaspora
Logger::info('Got relayable data ' . $type . ' for item ' . $item['guid'] . ' (' . $item['id'] . ')'); 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 = []; $message = [];
if (is_array($msg)) { if (is_array($msg)) {

2
src/Render/FriendicaSmartyEngine.php
View file

@ -81,7 +81,7 @@ final class FriendicaSmartyEngine extends TemplateEngine
// "middleware": inject variables into templates // "middleware": inject variables into templates
$arr = [ $arr = [
'template' => basename($this->smarty->filename), 'template' => basename($this->smarty->filename ?? ''),
'vars' => $vars 'vars' => $vars
]; ];
Hook::callAll('template_vars', $arr); Hook::callAll('template_vars', $arr);

2
src/Worker/Notifier.php
View file

@ -336,7 +336,7 @@ class Notifier
foreach ($items as $item) { foreach ($items as $item) {
$recipients[] = $item['contact-id']; $recipients[] = $item['contact-id'];
// pull out additional tagged people to notify (if public message) // 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']); $people = explode(',',$item['inform']);
foreach ($people as $person) { foreach ($people as $person) {
if (substr($person,0,4) === 'cid:') { if (substr($person,0,4) === 'cid:') {

12
view/theme/frio/php/PHPColors/Color.php
View file

@ -132,16 +132,16 @@ class Color {
$var_1 = 2 * $L - $var_2; $var_1 = 2 * $L - $var_2;
$r = round(255 * self::_huetorgb( $var_1, $var_2, $H + (1/3) )); $r = 255 * self::_huetorgb( $var_1, $var_2, $H + (1/3) );
$g = round(255 * self::_huetorgb( $var_1, $var_2, $H )); $g = 255 * self::_huetorgb( $var_1, $var_2, $H );
$b = round(255 * self::_huetorgb( $var_1, $var_2, $H - (1/3) )); $b = 255 * self::_huetorgb( $var_1, $var_2, $H - (1/3) );
} }
// Convert to hex // Convert to hex
$r = dechex($r); $r = dechex(round($r));
$g = dechex($g); $g = dechex(round($g));
$b = dechex($b); $b = dechex(round($b));
// Make sure we get 2 digits for decimals // Make sure we get 2 digits for decimals
$r = (strlen("".$r)===1) ? "0".$r:$r; $r = (strlen("".$r)===1) ? "0".$r:$r;