Fix because of some breaking changes of Graby 2.0

[github/wallabag/wallabag.git] / src / Wallabag / ImportBundle / Import / WallabagV2Import.php

diff --git a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
index faf4236fce3feee1a51bcc4b2ed65a39e51fb22b..2ba26003f784a5a2310a040cc5baf1dc0eecd1b9 100644 (file)
--- a/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV2Import.php
@@ -35,24 +35,21 @@ class WallabagV2Import extends WallabagImport
     {
         return [
             'html' => $entry['content'],
-            'content_type' => $entry['mimetype'],
-            'is_archived' => ($entry['is_archived'] || $this->markAsRead),
+            'headers' => [
+                'content-type' => $entry['mimetype'],
+            ],
+            'is_archived' => (bool) ($entry['is_archived'] || $this->markAsRead),
+            'is_starred' => (bool) $entry['is_starred'],
         ] + $entry;
     }
 
-    protected function parseEntriesForProducer($entries)
+    /**
+     * {@inheritdoc}
+     */
+    protected function setEntryAsRead(array $importedEntry)
     {
-        foreach ($entries as $importedEntry) {
-            // set userId for the producer (it won't know which user is connected)
-            $importedEntry['userId'] = $this->user->getId();
-
-            if ($this->markAsRead) {
-                $importedEntry['is_archived'] = 1;
-            }
-
-            ++$this->importedEntries;
+        $importedEntry['is_archived'] = 1;
 
-            $this->producer->publish(json_encode($importedEntry));
-        }
+        return $importedEntry;
     }
 }