Fix various 15.0 bugs

Issue #821,#820,#819

Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>

1 files changed, 7 insertions, 5 deletions

diff --git a/lib/Service/FeedServiceV2.php b/lib/Service/FeedServiceV2.php
index 41fb41e89..2304c3286 100644
--- a/lib/Service/FeedServiceV2.php
+++ b/lib/Service/FeedServiceV2.php
@@ -250,7 +250,7 @@ class FeedServiceV2 extends Service
      *
      * @return Feed|Entity Database feed entity
      */
-    public function fetch(Feed $feed)
+    public function fetch(Feed $feed): Entity
     {
         if ($feed->getPreventUpdate() === true) {
             return $feed;
@@ -321,19 +321,21 @@ class FeedServiceV2 extends Service
         return $this->mapper->update($feed);
     }
 
-    public function delete(string $user, int $id)
+    public function delete(string $user, int $id): void
     {
         $feed = $this->mapper->findFromUser($user, $id);
         $this->mapper->delete($feed);
     }
 
-    public function purgeDeleted()
+    public function purgeDeleted(): void
     {
         $this->mapper->purgeDeleted();
     }
 
-    public function fetchAll()
+    public function fetchAll(): void
     {
-        return $this->mapper->findAll();
+        foreach ($this->findAll() as $feed) {
+            $this->fetch($feed);
+        }
     }
 }