4 files changed, 2 insertions, 5 deletions
diff --git a/lib/Db/FeedMapperV2.php b/lib/Db/FeedMapperV2.php
index 3f25b26aa..b3d8879f3 100644
--- a/lib/Db/FeedMapperV2.php
+++ b/lib/Db/FeedMapperV2.php
@@ -74,7 +74,7 @@ class FeedMapperV2 extends NewsMapperV2
      * @param string $userId The user identifier
      * @param int    $id     The feed identifier
      *
-     * @return Entity
+     * @return Feed
      *
      * @throws DoesNotExistException
      * @throws MultipleObjectsReturnedException
diff --git a/lib/Db/ItemMapper.php b/lib/Db/ItemMapper.php
index abd57b7c1..9b0c04d1d 100644
--- a/lib/Db/ItemMapper.php
+++ b/lib/Db/ItemMapper.php
@@ -13,7 +13,6 @@
 
 namespace OCA\News\Db;
 
-use Exception;
 use OCA\News\Utility\Time;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php
index a67275320..0c3191540 100644
--- a/lib/Db/ItemMapperV2.php
+++ b/lib/Db/ItemMapperV2.php
@@ -12,7 +12,6 @@
 
 namespace OCA\News\Db;
 
-use Doctrine\DBAL\FetchMode;
 use OCA\News\Utility\Time;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\Entity;
@@ -152,7 +151,7 @@ class ItemMapperV2 extends NewsMapperV2
                          ->groupBy('feed_id')
                          ->where('');
 
-        return $this->db->executeQuery($query)->fetch(FetchMode::ASSOCIATIVE);
+        return $this->db->executeQuery($query->getSQL());
     }
 
     /**
diff --git a/lib/Db/NewsMapperV2.php b/lib/Db/NewsMapperV2.php
index 4d0c6fc2e..f7179574c 100644
--- a/lib/Db/NewsMapperV2.php
+++ b/lib/Db/NewsMapperV2.php
@@ -18,7 +18,6 @@ use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
 use OCP\AppFramework\Db\QBMapper;
 use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
 use OCP\AppFramework\Db\Entity;
 
 /**