Fixing https://github.com/friendica/friendica/issues/6338#issuecomment-466749280

[friendica.git] / src / Protocol / OStatus.php

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index b1cc4f40203d22069cd7f35f37854b895568dcfa..38105e452a929dbdf589675964837c4b7e4c39cb 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -53,7 +53,7 @@ class OStatus
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact, $onlyfetch)
+       private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, $onlyfetch)
        {
                $author = [];
                $author["author-link"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
@@ -72,7 +72,7 @@ class OStatus
                }
                $author["author-id"] = Contact::getIdForURL($author["author-link"]);
 
-               $author["contact-id"] = $contact["id"];
+               $author['contact-id'] = defaults($contact, 'id', $author['author-id']);
 
                $contact = [];
 
@@ -322,7 +322,7 @@ class OStatus
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       private static function process($xml, array $importer, array &$contact, &$hub, $stored = false, $initialize = true)
+       private static function process($xml, array $importer, array &$contact = null, &$hub, $stored = false, $initialize = true)
        {
                if ($initialize) {
                        self::$itemlist = [];
@@ -1453,7 +1453,7 @@ class OStatus
         * @param array       $owner        Contact data of the poster
         * @param bool        $show_profile Whether to show profile
         *
-        * @return object author element
+        * @return \DOMElement author element
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
@@ -1573,7 +1573,7 @@ class OStatus
         * @param bool        $toplevel  optional default false
         * @param bool        $feed_mode Behave like a regular feed for users if true
         *
-        * @return object Entry element
+        * @return \DOMElement Entry element
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -1605,7 +1605,7 @@ class OStatus
         * @param DOMDocument $doc     XML document
         * @param array       $contact Array of the contact that is added
         *
-        * @return object Source element
+        * @return \DOMElement Source element
         * @throws \Exception
         */
        private static function sourceEntry(DOMDocument $doc, array $contact)
@@ -1748,7 +1748,7 @@ class OStatus
         * @param array       $owner    Contact data of the poster
         * @param bool        $toplevel Is it for en entry element (false) or a feed entry (true)?
         *
-        * @return object Entry element with "like"
+        * @return \DOMElement Entry element with "like"
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -1835,7 +1835,7 @@ class OStatus
         * @param array       $owner    Contact data of the poster
         * @param bool        $toplevel Is it for en entry element (false) or a feed entry (true)?
         *
-        * @return object Entry element
+        * @return \DOMElement Entry element
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -1900,7 +1900,7 @@ class OStatus
         * @param bool        $toplevel  Is it for en entry element (false) or a feed entry (true)?
         * @param bool        $feed_mode Behave like a regular feed for users if true
         *
-        * @return object Entry element
+        * @return \DOMElement Entry element
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -1976,7 +1976,7 @@ class OStatus
         * @brief Adds elements to the XML document
         *
         * @param DOMDocument $doc       XML document
-        * @param object      $entry     Entry element where the content is added
+        * @param \DOMElement $entry     Entry element where the content is added
         * @param array       $item      Data of the item that is to be posted
         * @param array       $owner     Contact data of the poster
         * @param string      $title     Title for the post
@@ -1986,7 +1986,7 @@ class OStatus
         * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private static function entryContent(DOMDocument $doc, $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false)
+       private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false)
        {
                if ($verb == "") {
                        $verb = self::constructVerb($item);