clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert ContactResult->url parameter to UriInterface

This commit is contained in:
Hypolite Petovan 2023-03-27 09:54:52 -04:00
parent f95c17b065
commit 261ba161a2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Core/Search.php
View File

@ -29,6 +29,7 @@ use Friendica\Object\Search\ContactResult;
use Friendica\Object\Search\ResultList; use Friendica\Object\Search\ResultList;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use GuzzleHttp\Psr7\Uri;
/** /**
* Specific class to perform searches for different systems. Currently: * Specific class to perform searches for different systems. Currently:
@ -76,7 +77,7 @@ class Search
$user_data['name'] ?? '', $user_data['name'] ?? '',
$user_data['addr'] ?? '', $user_data['addr'] ?? '',
($contactDetails['addr'] ?? '') ?: ($user_data['url'] ?? ''), ($contactDetails['addr'] ?? '') ?: ($user_data['url'] ?? ''),
$user_data['url'] ?? '', new Uri($user_data['url'] ?? ''),
$user_data['photo'] ?? '', $user_data['photo'] ?? '',
$user_data['network'] ?? '', $user_data['network'] ?? '',
$contactDetails['cid'] ?? 0, $contactDetails['cid'] ?? 0,
@ -142,7 +143,7 @@ class Search
$profile['name'] ?? '', $profile['name'] ?? '',
$profile['addr'] ?? '', $profile['addr'] ?? '',
($contactDetails['addr'] ?? '') ?: $profile_url, ($contactDetails['addr'] ?? '') ?: $profile_url,
$profile_url, new Uri($profile_url),
$profile['photo'] ?? '', $profile['photo'] ?? '',
Protocol::DFRN, Protocol::DFRN,
$contactDetails['cid'] ?? 0, $contactDetails['cid'] ?? 0,
@ -180,7 +181,7 @@ class Search
$contact['name'], $contact['name'],
$contact['addr'], $contact['addr'],
$contact['addr'] ?: $contact['url'], $contact['addr'] ?: $contact['url'],
$contact['url'], new Uri($contact['url']),
$contact['photo'], $contact['photo'],
$contact['network'], $contact['network'],
0, 0,

11
src/Object/Search/ContactResult.php
View File

@ -22,6 +22,7 @@
namespace Friendica\Object\Search; namespace Friendica\Object\Search;
use Friendica\Model\Search; use Friendica\Model\Search;
use Psr\Http\Message\UriInterface;
/** /**
* A search result for contact searching * A search result for contact searching
@ -51,7 +52,7 @@ class ContactResult implements IResult
*/ */
private $item; private $item;
/** /**
* @var string * @var UriInterface
*/ */
private $url; 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; return $this->url;
} }
@ -143,14 +144,14 @@ class ContactResult implements IResult
* @param string $name * @param string $name
* @param string $addr * @param string $addr
* @param string $item * @param string $item
* @param string $url * @param UriInterface $url
* @param string $photo * @param string $photo
* @param string $network * @param string $network
* @param int $cid * @param int $cid
* @param int $pCid * @param int $pCid
* @param string $tags * @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->name = $name;
$this->addr = $addr; $this->addr = $addr;