diff --git a/src/Core/Search.php b/src/Core/Search.php index 7f05a3a947..45b64eb517 100644 --- a/src/Core/Search.php +++ b/src/Core/Search.php @@ -29,6 +29,7 @@ use Friendica\Object\Search\ContactResult; use Friendica\Object\Search\ResultList; use Friendica\Util\Network; use Friendica\Util\Strings; +use GuzzleHttp\Psr7\Uri; /** * Specific class to perform searches for different systems. Currently: @@ -76,7 +77,7 @@ class Search $user_data['name'] ?? '', $user_data['addr'] ?? '', ($contactDetails['addr'] ?? '') ?: ($user_data['url'] ?? ''), - $user_data['url'] ?? '', + new Uri($user_data['url'] ?? ''), $user_data['photo'] ?? '', $user_data['network'] ?? '', $contactDetails['cid'] ?? 0, @@ -142,7 +143,7 @@ class Search $profile['name'] ?? '', $profile['addr'] ?? '', ($contactDetails['addr'] ?? '') ?: $profile_url, - $profile_url, + new Uri($profile_url), $profile['photo'] ?? '', Protocol::DFRN, $contactDetails['cid'] ?? 0, @@ -180,7 +181,7 @@ class Search $contact['name'], $contact['addr'], $contact['addr'] ?: $contact['url'], - $contact['url'], + new Uri($contact['url']), $contact['photo'], $contact['network'], 0, diff --git a/src/Object/Search/ContactResult.php b/src/Object/Search/ContactResult.php index c2922ea0ed..c46b9b6e4c 100644 --- a/src/Object/Search/ContactResult.php +++ b/src/Object/Search/ContactResult.php @@ -22,6 +22,7 @@ namespace Friendica\Object\Search; use Friendica\Model\Search; +use Psr\Http\Message\UriInterface; /** * A search result for contact searching @@ -51,7 +52,7 @@ class ContactResult implements IResult */ private $item; /** - * @var string + * @var UriInterface */ private $url; /** @@ -108,9 +109,9 @@ class ContactResult implements IResult } /** - * @return string + * @return UriInterface */ - public function getUrl(): string + public function getUrl(): UriInterface { return $this->url; } @@ -143,14 +144,14 @@ class ContactResult implements IResult * @param string $name * @param string $addr * @param string $item - * @param string $url + * @param UriInterface $url * @param string $photo * @param string $network * @param int $cid * @param int $pCid * @param string $tags */ - public function __construct($name, $addr, $item, $url, $photo, $network, $cid = 0, $pCid = 0, $tags = '') + public function __construct($name, $addr, $item, UriInterface $url, $photo, $network, $cid = 0, $pCid = 0, $tags = '') { $this->name = $name; $this->addr = $addr;