friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-21 11:06:42 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Make the tests happy

Browse source
This commit is contained in:
Michael 2022-07-29 16:05:04 +00:00
parent 2c32429d8d
commit 0971bcf165
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/APContact.php
View file

@ -383,11 +383,11 @@ class APContact
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'] = Uri::fromParts($parts); $apcontact['photo'] = (string)Uri::fromParts($parts);
if (strlen($apcontact['photo']) > 255) { if (strlen($apcontact['photo']) > 255) {
unset($parts['query']); unset($parts['query']);
$apcontact['photo'] = Uri::fromParts($parts); $apcontact['photo'] = (string)Uri::fromParts($parts);
} }
if (strlen($apcontact['photo']) > 255) { if (strlen($apcontact['photo']) > 255) {

2
src/Model/Item.php
View file

@ -2948,7 +2948,7 @@ class Item
if (!empty($urlparts)) { if (!empty($urlparts)) {
unset($urlparts['query']); unset($urlparts['query']);
unset($urlparts['fragment']); unset($urlparts['fragment']);
$url = Uri::fromParts($urlparts); $url = (string)Uri::fromParts($urlparts);
} else { } else {
return false; return false;
} }

2
src/Protocol/DFRN.php
View file

@ -998,7 +998,7 @@ class DFRN
$path_parts = explode('/', $parts['path']); $path_parts = explode('/', $parts['path']);
array_pop($path_parts); array_pop($path_parts);
$parts['path'] = implode('/', $path_parts); $parts['path'] = implode('/', $path_parts);
$contact['batch'] = Uri::fromParts($parts); $contact['batch'] = (string)Uri::fromParts($parts);
} }
$dest_url = ($public_batch ? $contact['batch'] : $contact['notify']); $dest_url = ($public_batch ? $contact['batch'] : $contact['notify']);

2
src/Protocol/Diaspora.php
View file

@ -1419,7 +1419,7 @@ class Diaspora
$parts = parse_url($person['url']); $parts = parse_url($person['url']);
unset($parts['path']); unset($parts['path']);
$host_url = Uri::fromParts($parts); $host_url = (string)Uri::fromParts($parts);
return $host_url . '/objects/' . $guid; return $host_url . '/objects/' . $guid;
} }

2
src/Util/Network.php
View file

@ -497,7 +497,7 @@ class Network
$parts = parse_url($uri); $parts = parse_url($uri);
if (!empty($parts['scheme']) && !empty($parts['host'])) { if (!empty($parts['scheme']) && !empty($parts['host'])) {
$parts['host'] = idn_to_ascii($parts['host']); $parts['host'] = idn_to_ascii($parts['host']);
$uri = Uri::fromParts($parts); $uri = (string)Uri::fromParts($parts);
} else { } else {
$parts = explode('@', $uri); $parts = explode('@', $uri);
if (count($parts) == 2) { if (count($parts) == 2) {