fix type issues with mappers

5 files changed, 16 insertions, 20 deletions

diff --git a/db/feedmapper.php b/db/feedmapper.php
index 9753ed718..b913288a6 100644
--- a/db/feedmapper.php
+++ b/db/feedmapper.php
@@ -14,11 +14,10 @@
 namespace OCA\News\Db;
 
 use \OCP\IDb;
-use \OCP\AppFramework\Db\Mapper;
 use \OCP\AppFramework\Db\Entity;
 
 
-class FeedMapper extends Mapper implements IMapper {
+class FeedMapper extends NewsMapper {
 
 
 	public function __construct(IDb $db) {
diff --git a/db/foldermapper.php b/db/foldermapper.php
index 62ca09747..2c4d2aca5 100644
--- a/db/foldermapper.php
+++ b/db/foldermapper.php
@@ -14,10 +14,9 @@
 namespace OCA\News\Db;
 
 use \OCP\IDb;
-use \OCP\AppFramework\Db\Mapper;
 use \OCP\AppFramework\Db\Entity;
 
-class FolderMapper extends Mapper implements IMapper {
+class FolderMapper extends NewsMapper {
 
 	public function __construct(IDb $db) {
 		parent::__construct($db, 'news_folders', '\OCA\News\Db\Folder');
@@ -63,7 +62,7 @@ class FolderMapper extends Mapper implements IMapper {
 
 		$sql = 'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` NOT IN '.
 			'(SELECT `feeds`.`id` FROM `*PREFIX*news_feeds` `feeds`)';
-		
+
 		$this->execute($sql);
 	}
 
@@ -90,7 +89,7 @@ class FolderMapper extends Mapper implements IMapper {
 			$sql .= 'AND `user_id` = ?';
 			$params[] = $userId;
 		}
-		
+
 		return $this->findEntities($sql, $params);
 	}
 
diff --git a/db/itemmapper.php b/db/itemmapper.php
index ff8643236..d0ea4bea3 100644
--- a/db/itemmapper.php
+++ b/db/itemmapper.php
@@ -14,10 +14,9 @@
 namespace OCA\News\Db;
 
 use \OCP\IDb;
-use \OCP\AppFramework\Db\Mapper;
 
 
-class ItemMapper extends Mapper implements IMapper {
+class ItemMapper extends NewsMapper {
 
 	public function __construct(IDb $db){
 		parent::__construct($db, 'news_items', '\OCA\News\Db\Item');
diff --git a/db/imapper.php b/db/newsmapper.php
index 18a924e24..955e3ba00 100644
--- a/db/imapper.php
+++ b/db/newsmapper.php
@@ -13,23 +13,22 @@
 
 namespace OCA\News\Db;
 
+use \OCP\IDb;
 use \OCP\AppFramework\Db\Entity;
+use \OCP\AppFramework\Db\Mapper;
 
-interface IMapper {
+abstract class NewsMapper extends Mapper {
+
+    public function __construct(IDb $db, $table, $entity) {
+        parent::__construct($db, $table, $entity);
+    }
 
     /**
      * @param int $id the id of the feed
      * @param string $userId the id of the user
      * @return \OCP\AppFramework\Db\Entity
      */
-	public function find($id, $userId);
+	public abstract function find($id, $userId);
+
 
-	/**
-	 * Delete an entity
-	 * @param Entity $entity the entity that should be deleted
-	 * @throws \OCP\AppFramework\Db\DoesNotExistException if the entity does
-     * not exist, or there
-	 * are more than one of it
-	 */
-	public function delete(Entity $entity);
 }
\ No newline at end of file
diff --git a/service/service.php b/service/service.php
index c4edbb9bc..f3700de98 100644
--- a/service/service.php
+++ b/service/service.php
@@ -16,14 +16,14 @@ namespace OCA\News\Service;
 use \OCP\AppFramework\Db\DoesNotExistException;
 use \OCP\AppFramework\Db\MultipleObjectsReturnedException;
 
-use \OCA\News\Db\IMapper;
+use \OCA\News\Db\NewsMapper;
 
 
 abstract class Service {
 
 	protected $mapper;
 
-	public function __construct(IMapper $mapper){
+	public function __construct(NewsMapper $mapper){
 		$this->mapper = $mapper;
 	}