From c96445eadb1dbf93b21c7894332c4b4b98cab7e5 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Wed, 8 Oct 2014 14:52:09 +0200
Subject: fix type issues with mappers

---
 db/feedmapper.php   |  3 +--
 db/foldermapper.php |  7 +++----
 db/imapper.php      | 35 -----------------------------------
 db/itemmapper.php   |  3 +--
 db/newsmapper.php   | 34 ++++++++++++++++++++++++++++++++++
 5 files changed, 39 insertions(+), 43 deletions(-)
 delete mode 100644 db/imapper.php
 create mode 100644 db/newsmapper.php

(limited to 'db')

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/imapper.php b/db/imapper.php
deleted file mode 100644
index 18a924e24..000000000
--- a/db/imapper.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * ownCloud - News
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Alessandro Cosentino <cosenal@gmail.com>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright Alessandro Cosentino 2012
- * @copyright Bernhard Posselt 2012, 2014
- */
-
-namespace OCA\News\Db;
-
-use \OCP\AppFramework\Db\Entity;
-
-interface IMapper {
-
-    /**
-     * @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);
-
-	/**
-	 * 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/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/newsmapper.php b/db/newsmapper.php
new file mode 100644
index 000000000..955e3ba00
--- /dev/null
+++ b/db/newsmapper.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * ownCloud - News
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Alessandro Cosentino <cosenal@gmail.com>
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @copyright Alessandro Cosentino 2012
+ * @copyright Bernhard Posselt 2012, 2014
+ */
+
+namespace OCA\News\Db;
+
+use \OCP\IDb;
+use \OCP\AppFramework\Db\Entity;
+use \OCP\AppFramework\Db\Mapper;
+
+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 abstract function find($id, $userId);
+
+
+}
\ No newline at end of file
-- 
cgit v1.2.3