cleaning/merging to master

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

2 files changed, 3 insertions, 19 deletions

diff --git a/lib/Model/ActivityPub/Item.php b/lib/Model/ActivityPub/Item.php
index e1c2d4f5..8184ce1c 100644
--- a/lib/Model/ActivityPub/Item.php
+++ b/lib/Model/ActivityPub/Item.php
@@ -178,25 +178,6 @@ class Item {
 
 
 	/**
-	 * @return string
-	 */
-	public function getAttributedTo(): string {
-		return $this->attributedTo;
-	}
-
-	/**
-	 * @param string $attributedTo
-	 *
-	 * @return Item
-	 */
-	public function setAttributedTo(string $attributedTo): Item {
-		$this->attributedTo = $attributedTo;
-
-		return $this;
-	}
-
-
-	/**
 	 * @param InstancePath $instancePath
 	 *
 	 * @return Item
diff --git a/lib/Model/ActivityPub/Object/Document.php b/lib/Model/ActivityPub/Object/Document.php
index 932392c7..35883e06 100644
--- a/lib/Model/ActivityPub/Object/Document.php
+++ b/lib/Model/ActivityPub/Object/Document.php
@@ -32,6 +32,7 @@ namespace OCA\Social\Model\ActivityPub\Object;
 
 
 use DateTime;
+use Exception;
 use JsonSerializable;
 use OCA\Social\Exceptions\InvalidOriginException;
 use OCA\Social\Exceptions\UrlCloudException;
@@ -236,6 +237,8 @@ class Document extends ACore implements JsonSerializable {
 
 	/**
 	 * @param array $data
+	 *
+	 * @throws Exception
 	 */
 	public function importFromDatabase(array $data) {
 		parent::importFromDatabase($data);