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

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

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 9c972efaf2143b557c3809bccb92482816f9b4bb..9269ee7903875f386e07a26645aebfe14441cf72 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -48,7 +48,7 @@ class APContact
         * @param string $addr Address
         * @return array webfinger data
         */
-       private static function fetchWebfingerData(string $addr)
+       private static function fetchWebfingerData(string $addr): array
        {
                $addr_parts = explode('@', $addr);
                if (count($addr_parts) != 2) {
@@ -116,15 +116,16 @@ class APContact
         * @return array profile array
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
+        * @todo Rewrite parameter $update to avoid true|false|null (boolean is binary, null adds a third case)
         */
-       public static function getByURL($url, $update = null)
+       public static function getByURL(string $url, $update = null): array
        {
                if (empty($url) || Network::isUrlBlocked($url)) {
                        Logger::info('Domain is blocked', ['url' => $url]);
                        return [];
                }
 
-               $fetched_contact = false;
+               $fetched_contact = [];
 
                if (empty($update)) {
                        if (is_null($update)) {
@@ -220,14 +221,14 @@ class APContact
                $apcontact['type'] = str_replace('as:', '', JsonLD::fetchElement($compacted, '@type'));
                $apcontact['following'] = JsonLD::fetchElement($compacted, 'as:following', '@id');
                $apcontact['followers'] = JsonLD::fetchElement($compacted, 'as:followers', '@id');
-               $apcontact['inbox'] = JsonLD::fetchElement($compacted, 'ldp:inbox', '@id');
+               $apcontact['inbox'] = (JsonLD::fetchElement($compacted, 'ldp:inbox', '@id') ?? '');
                self::unarchiveInbox($apcontact['inbox'], false);
 
                $apcontact['outbox'] = JsonLD::fetchElement($compacted, 'as:outbox', '@id');
 
                $apcontact['sharedinbox'] = '';
                if (!empty($compacted['as:endpoints'])) {
-                       $apcontact['sharedinbox'] = JsonLD::fetchElement($compacted['as:endpoints'], 'as:sharedInbox', '@id');
+                       $apcontact['sharedinbox'] = (JsonLD::fetchElement($compacted['as:endpoints'], 'as:sharedInbox', '@id') ?? '');
                        self::unarchiveInbox($apcontact['sharedinbox'], true);
                }
 
@@ -526,8 +527,9 @@ class APContact
         *
         * @param string  $url    inbox url
         * @param boolean $shared Shared Inbox
+        * @return void
         */
-       private static function unarchiveInbox($url, $shared)
+       private static function unarchiveInbox(string $url, bool $shared)
        {
                if (empty($url)) {
                        return;