Merge pull request #9 from nupplaphil/dependabot/composer/guzzlehttp/guzzle-6.5.8

[friendica.git] / src / Model / FContact.php

diff --git a/src/Model/FContact.php b/src/Model/FContact.php
index 09ee3fb3d5dbb1d824e3a9376d8f206c46feb91f..97b1e98efb81a8b91e54365dca67dbd1d7b99514 100644 (file)
--- a/src/Model/FContact.php
+++ b/src/Model/FContact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -40,7 +40,7 @@ class FContact
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function getByURL($handle, $update = null)
+       public static function getByURL(string $handle, $update = null): array
        {
                $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
                if (!DBA::isResult($person)) {
@@ -75,7 +75,7 @@ class FContact
                        // Note that Friendica contacts will return a "Diaspora person"
                        // if Diaspora connectivity is enabled on their server
                        if ($data['network'] ?? '' === Protocol::DIASPORA) {
-                               self::updateFContact($data);
+                               self::updateFromProbeArray($data);
 
                                $person = self::getByURL($handle, false);
                        }
@@ -90,7 +90,7 @@ class FContact
         * @param array $arr The fcontact data
         * @throws \Exception
         */
-       private static function updateFContact($arr)
+       public static function updateFromProbeArray(array $arr)
        {
                $uriid = ItemURI::insert(['uri' => $arr['url'], 'guid' => $arr['guid']]);
 
@@ -122,12 +122,12 @@ class FContact
         * get a url (scheme://domain.tld/u/user) from a given Diaspora*
         * fcontact guid
         *
-        * @param mixed $fcontact_guid Hexadecimal string guid
+        * @param string $fcontact_guid Hexadecimal string guid
         *
-        * @return string the contact url or null
+        * @return string|null the contact url or null
         * @throws \Exception
         */
-       public static function getUrlByGuid($fcontact_guid)
+       public static function getUrlByGuid(string $fcontact_guid)
        {
                Logger::info('fcontact', ['guid' => $fcontact_guid]);