Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 17:04:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

"Network::unparseURL" is replaced with "Uri::fromParts"

Browse source
This commit is contained in:
Michael 2024-05-14 21:47:57 +00:00
parent a6f3c961dc
commit 1c66d49599
9 changed files with 17 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Content/BoundariesPager.php
View file

@ -23,8 +23,8 @@ namespace Friendica\Content;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Util\Network;
use Friendica\Util\Strings;
use GuzzleHttp\Psr7\Uri;
/**
* This pager should be used by lists using the min_id†/max_id† parameters
@ -67,7 +67,7 @@ class BoundariesPager extends Pager
$parsed['query'] = http_build_query($queryParameters);
$url = Network::unparseURL($parsed);
$url = (string)Uri::fromParts((array)$parsed);
$this->setQueryString($url);
}

4
src/Content/ContactSelector.php
View file

@ -25,8 +25,8 @@ use Friendica\Core\Hook;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Util\Network;
use Friendica\Util\Strings;
use GuzzleHttp\Psr7\Uri;
/**
* ContactSelector class
@ -102,7 +102,7 @@ class ContactSelector
// Create the server url out of the profile url
$parts = parse_url($profile);
unset($parts['path']);
$server_url = Strings::normaliseLink(Network::unparseURL($parts));
$server_url = Strings::normaliseLink((string)Uri::fromParts((array)$parts));
}
self::$server_url[$profile] = $server_url;

4
src/Content/Text/HTML.php
View file

@ -29,9 +29,9 @@ use Friendica\Core\Renderer;
use Friendica\Core\Search;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML;
use GuzzleHttp\Psr7\Uri;
use League\HTMLToMarkdown\HtmlConverter;
use Psr\Http\Message\UriInterface;
@ -407,7 +407,7 @@ class HTML
}
$parts = array_merge($base, parse_url($url));
$url2 = Network::unparseURL($parts);
$url2 = (string)Uri::fromParts((array)$parts);
return str_replace($url, $url2, $link);
}