Finish renaming Object\Item to Object\Post

diff --git a/include/conversation.php b/include/conversation.php
index 2543a5170e80ac6d1b198a2f0f31333396d0b7d2..e4e633f5a3df5b115b0de03b0ad29074cb34a29b 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -8,9 +8,9 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
-use Friendica\Object\Conversation;
-use Friendica\Object\Item;
+use Friendica\Model\Contact;
+use Friendica\Object\Thread;
+use Friendica\Object\Post;
 
 require_once "include/bbcode.php";
 require_once "include/acl_selectors.php";
@@ -880,8 +880,8 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                                $item['pagedrop'] = $page_dropping;
 
                                if ($item['id'] == $item['parent']) {
-                                       $item_object = new Item($item);
-                                       $conv->addThread($item_object);
+                                       $item_object = new Post($item);
+                                       $conv->addParent($item_object);
                                }
                        }
 

diff --git a/src/Object/Conversation.php b/src/Object/Conversation.php
index 3721086f9698226434ac94de314b3b734f0e96f8..f09964ff2c23df8ece0b1248a5bba1c2d5b5023e 100644 (file)
--- a/src/Object/Conversation.php
+++ b/src/Object/Conversation.php
@@ -5,7 +5,7 @@
 namespace Friendica\Object;
 
 use Friendica\BaseObject;
-use Friendica\Object\Item;
+use Friendica\Object\Post;
 
 require_once 'boot.php';
 require_once 'include/text.php';
@@ -120,7 +120,7 @@ class Conversation extends BaseObject
         * @return mixed The inserted item on success
         *               false on failure
         */
-       public function addThread($item)
+       public function addParent(Post $item)
        {
                $item_id = $item->getId();
 

diff --git a/src/Object/Item.php b/src/Object/Item.php
index 1533908aeb375b6ae8e90a9dfa679fb1c67edb0f..4bb918d0eeb21e91b15b070d47ce29a1cc4637b1 100644 (file)
--- a/src/Object/Item.php
+++ b/src/Object/Item.php
@@ -46,7 +46,7 @@ class Item extends BaseObject
         *
         * @param array $data data array
         */
-       public function __construct($data)
+       public function __construct(array $data)
        {
                $a = self::getApp();