Merge pull request #12578 from MrPetovan/bug/warnings

[friendica.git] / src / Core / Search.php

diff --git a/src/Core/Search.php b/src/Core/Search.php
index edaf03e2d266a7ff1d6527af9cd2194086105580..c41df70d9bf5f2db39cf2712a2cdf75fab3bc121 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -25,7 +25,6 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Object\Search\ContactResult;
 use Friendica\Object\Search\ResultList;
 use Friendica\Util\Network;
@@ -55,23 +54,23 @@ class Search
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function getContactsFromProbe($user)
+       public static function getContactsFromProbe(string $user): ResultList
        {
                $emptyResultList = new ResultList(1, 0, 1);
 
                if ((filter_var($user, FILTER_VALIDATE_EMAIL) && Network::isEmailDomainValid($user)) ||
-                   (substr(Strings::normaliseLink($user), 0, 7) == "http://")) {
+                   (substr(Strings::normaliseLink($user), 0, 7) == 'http://')) {
 
                        $user_data = Contact::getByURL($user);
                        if (empty($user_data)) {
                                return $emptyResultList;
                        }
 
-                       if (!in_array($user_data["network"], Protocol::FEDERATED)) {
+                       if (!in_array($user_data['network'], Protocol::FEDERATED)) {
                                return $emptyResultList;
                        }
 
-                       $contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', local_user());
+                       $contactDetails = Contact::getByURLForUser($user_data['url'] ?? '', DI::userSession()->getLocalUserId());
 
                        $result = new ContactResult(
                                $user_data['name'] ?? '',
@@ -103,9 +102,9 @@ class Search
         * @return ResultList
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function getContactsFromGlobalDirectory($search, $type = self::TYPE_ALL, $page = 1)
+       public static function getContactsFromGlobalDirectory(string $search, int $type = self::TYPE_ALL, int $page = 1): ResultList
        {
-               $server = DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY);
+               $server = self::getGlobalDirectory();
 
                $searchUrl = $server . '/search';
 
@@ -123,7 +122,7 @@ class Search
                        $searchUrl .= '&page=' . $page;
                }
 
-               $resultJson = DI::httpClient()->fetch($searchUrl, 0, HttpClientAccept::JSON);
+               $resultJson = DI::httpClient()->fetch($searchUrl, HttpClientAccept::JSON);
 
                $results = json_decode($resultJson, true);
 
@@ -137,7 +136,7 @@ class Search
 
                foreach ($profiles as $profile) {
                        $profile_url = $profile['profile_url'] ?? '';
-                       $contactDetails = Contact::getByURLForUser($profile_url, local_user());
+                       $contactDetails = Contact::getByURLForUser($profile_url, DI::userSession()->getLocalUserId());
 
                        $result = new ContactResult(
                                $profile['name'] ?? '',
@@ -168,7 +167,7 @@ class Search
         * @return ResultList
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function getContactsFromLocalDirectory($search, $type = self::TYPE_ALL, $start = 0, $itemPage = 80)
+       public static function getContactsFromLocalDirectory(string $search, int $type = self::TYPE_ALL, int $start = 0, int $itemPage = 80): ResultList
        {
                Logger::info('Searching', ['search' => $search, 'type' => $type, 'start' => $start, 'itempage' => $itemPage]);
 
@@ -178,22 +177,22 @@ class Search
 
                foreach ($contacts as $contact) {
                        $result = new ContactResult(
-                               $contact["name"],
-                               $contact["addr"],
-                               $contact["addr"],
-                               $contact["url"],
-                               $contact["photo"],
-                               $contact["network"],
-                               $contact["cid"] ?? 0,
-                               $contact["zid"] ?? 0,
-                               $contact["keywords"]
+                               $contact['name'],
+                               $contact['addr'],
+                               $contact['addr'],
+                               $contact['url'],
+                               $contact['photo'],
+                               $contact['network'],
+                               $contact['cid'] ?? 0,
+                               $contact['zid'] ?? 0,
+                               $contact['keywords']
                        );
 
                        $resultList->addResult($result);
                }
 
                // Add found profiles from the global directory to the local directory
-               Worker::add(PRIORITY_LOW, 'SearchDirectory', $search);
+               Worker::add(Worker::PRIORITY_LOW, 'SearchDirectory', $search);
 
                return $resultList;
        }
@@ -204,14 +203,15 @@ class Search
         * @param string $search Name or part of a name or nick
         * @param string $mode   Search mode (e.g. "community")
         * @param int    $page   Page number (starts at 1)
-        * @return array with the search results
+        *
+        * @return array with the search results or empty if error or nothing found
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function searchContact($search, $mode, int $page = 1)
+       public static function searchContact(string $search, string $mode, int $page = 1): array
        {
                Logger::info('Searching', ['search' => $search, 'mode' => $mode, 'page' => $page]);
 
-               if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+               if (DI::config()->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) {
                        return [];
                }
 
@@ -229,7 +229,7 @@ class Search
                        $return = Contact::searchByName($search, $mode);
                } else {
                        $p = $page > 1 ? 'p=' . $page : '';
-                       $curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::JSON]);
+                       $curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), HttpClientAccept::JSON);
                        if ($curlResult->isSuccess()) {
                                $searchResult = json_decode($curlResult->getBody(), true);
                                if (!empty($searchResult['profiles'])) {
@@ -246,7 +246,7 @@ class Search
         *
         * @return string
         */
-       public static function getGlobalDirectory()
+       public static function getGlobalDirectory(): string
        {
                return DI::config()->get('system', 'directory', self::DEFAULT_DIRECTORY);
        }
@@ -255,9 +255,10 @@ class Search
         * Return the search path (either fulltext search or tag search)
         *
         * @param string $search
+        *
         * @return string search path
         */
-       public static function getSearchPath(string $search)
+       public static function getSearchPath(string $search): string
        {
                if (substr($search, 0, 1) == '#') {
                        return 'search?tag=' . urlencode(substr($search, 1));