Move Import importers to Core

app/config/services.yml

@@ -329,53 +329,53 @@ services:
     wallabag_import.pocket.client:
         alias: 'httplug.client.wallabag_import.pocket.client'
 
-    Wallabag\ImportBundle\Import\PocketImport:
+    Wallabag\CoreBundle\Import\PocketImport:
         calls:
             - [ setClient, [ "@wallabag_import.pocket.client" ] ]
         tags:
             -  { name: wallabag_import.import, alias: pocket }
 
-    Wallabag\ImportBundle\Import\WallabagV1Import:
+    Wallabag\CoreBundle\Import\WallabagV1Import:
         tags:
             -  { name: wallabag_import.import, alias: wallabag_v1 }
 
-    Wallabag\ImportBundle\Import\WallabagV2Import:
+    Wallabag\CoreBundle\Import\WallabagV2Import:
         tags:
             -  { name: wallabag_import.import, alias: wallabag_v2 }
 
-    Wallabag\ImportBundle\Import\ElcuratorImport:
+    Wallabag\CoreBundle\Import\ElcuratorImport:
         tags:
             -  { name: wallabag_import.import, alias: elcurator }
 
-    Wallabag\ImportBundle\Import\ReadabilityImport:
+    Wallabag\CoreBundle\Import\ReadabilityImport:
         tags:
             -  { name: wallabag_import.import, alias: readability }
 
-    Wallabag\ImportBundle\Import\InstapaperImport:
+    Wallabag\CoreBundle\Import\InstapaperImport:
         tags:
             -  { name: wallabag_import.import, alias: instapaper }
 
-    Wallabag\ImportBundle\Import\PinboardImport:
+    Wallabag\CoreBundle\Import\PinboardImport:
         tags:
             -  { name: wallabag_import.import, alias: pinboard }
 
-    Wallabag\ImportBundle\Import\DeliciousImport:
+    Wallabag\CoreBundle\Import\DeliciousImport:
         tags:
             -  { name: wallabag_import.import, alias: delicious }
 
-    Wallabag\ImportBundle\Import\FirefoxImport:
+    Wallabag\CoreBundle\Import\FirefoxImport:
         tags:
             -  { name: wallabag_import.import, alias: firefox }
 
-    Wallabag\ImportBundle\Import\ChromeImport:
+    Wallabag\CoreBundle\Import\ChromeImport:
         tags:
             -  { name: wallabag_import.import, alias: chrome }
 
-    Wallabag\ImportBundle\Import\ShaarliImport:
+    Wallabag\CoreBundle\Import\ShaarliImport:
         tags:
             -  { name: wallabag_import.import, alias: shaarli }
 
-    Wallabag\ImportBundle\Import\PocketHtmlImport:
+    Wallabag\CoreBundle\Import\PocketHtmlImport:
         tags:
             -  { name: wallabag_import.import, alias: pocket_html }
 

app/config/services_rabbit.yml

@@ -23,59 +23,59 @@ services:
     wallabag_import.consumer.amqp.pocket:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketImport'
+            $import: '@Wallabag\CoreBundle\Import\PocketImport'
 
     wallabag_import.consumer.amqp.readability:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ReadabilityImport'
+            $import: '@Wallabag\CoreBundle\Import\ReadabilityImport'
 
     wallabag_import.consumer.amqp.instapaper:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\InstapaperImport'
+            $import: '@Wallabag\CoreBundle\Import\InstapaperImport'
 
     wallabag_import.consumer.amqp.pinboard:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PinboardImport'
+            $import: '@Wallabag\CoreBundle\Import\PinboardImport'
 
     wallabag_import.consumer.amqp.delicious:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\DeliciousImport'
+            $import: '@Wallabag\CoreBundle\Import\DeliciousImport'
 
     wallabag_import.consumer.amqp.wallabag_v1:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\WallabagV1Import'
+            $import: '@Wallabag\CoreBundle\Import\WallabagV1Import'
 
     wallabag_import.consumer.amqp.wallabag_v2:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\WallabagV2Import'
+            $import: '@Wallabag\CoreBundle\Import\WallabagV2Import'
 
     wallabag_import.consumer.amqp.elcurator:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ElcuratorImport'
+            $import: '@Wallabag\CoreBundle\Import\ElcuratorImport'
 
     wallabag_import.consumer.amqp.firefox:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\FirefoxImport'
+            $import: '@Wallabag\CoreBundle\Import\FirefoxImport'
 
     wallabag_import.consumer.amqp.chrome:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ChromeImport'
+            $import: '@Wallabag\CoreBundle\Import\ChromeImport'
 
     wallabag_import.consumer.amqp.shaarli:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ShaarliImport'
+            $import: '@Wallabag\CoreBundle\Import\ShaarliImport'
 
     wallabag_import.consumer.amqp.pocket_html:
         class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketHtmlImport'
+            $import: '@Wallabag\CoreBundle\Import\PocketHtmlImport'

app/config/services_redis.yml

@@ -19,7 +19,7 @@ services:
     wallabag_import.consumer.redis.readability:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ReadabilityImport'
+            $import: '@Wallabag\CoreBundle\Import\ReadabilityImport'
 
     # instapaper
     wallabag_import.queue.redis.instapaper:
@@ -35,7 +35,7 @@ services:
     wallabag_import.consumer.redis.instapaper:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\InstapaperImport'
+            $import: '@Wallabag\CoreBundle\Import\InstapaperImport'
 
     # pinboard
     wallabag_import.queue.redis.pinboard:
@@ -51,7 +51,7 @@ services:
     wallabag_import.consumer.redis.pinboard:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PinboardImport'
+            $import: '@Wallabag\CoreBundle\Import\PinboardImport'
 
     # delicious
     wallabag_import.queue.redis.delicious:
@@ -67,7 +67,7 @@ services:
     wallabag_import.consumer.redis.delicious:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\DeliciousImport'
+            $import: '@Wallabag\CoreBundle\Import\DeliciousImport'
 
     # pocket
     wallabag_import.queue.redis.pocket:
@@ -83,7 +83,7 @@ services:
     wallabag_import.consumer.redis.pocket:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketImport'
+            $import: '@Wallabag\CoreBundle\Import\PocketImport'
 
     # wallabag v1
     wallabag_import.queue.redis.wallabag_v1:
@@ -99,7 +99,7 @@ services:
     wallabag_import.consumer.redis.wallabag_v1:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\WallabagV1Import'
+            $import: '@Wallabag\CoreBundle\Import\WallabagV1Import'
 
     # wallabag v2
     wallabag_import.queue.redis.wallabag_v2:
@@ -115,7 +115,7 @@ services:
     wallabag_import.consumer.redis.wallabag_v2:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\WallabagV2Import'
+            $import: '@Wallabag\CoreBundle\Import\WallabagV2Import'
 
     # elcurator
     wallabag_import.queue.redis.elcurator:
@@ -131,7 +131,7 @@ services:
     wallabag_import.consumer.redis.elcurator:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ElcuratorImport'
+            $import: '@Wallabag\CoreBundle\Import\ElcuratorImport'
 
     # firefox
     wallabag_import.queue.redis.firefox:
@@ -147,7 +147,7 @@ services:
     wallabag_import.consumer.redis.firefox:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\FirefoxImport'
+            $import: '@Wallabag\CoreBundle\Import\FirefoxImport'
 
     # chrome
     wallabag_import.queue.redis.chrome:
@@ -163,7 +163,7 @@ services:
     wallabag_import.consumer.redis.chrome:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ChromeImport'
+            $import: '@Wallabag\CoreBundle\Import\ChromeImport'
 
     # shaarli
     wallabag_import.queue.redis.shaarli:
@@ -179,7 +179,7 @@ services:
     wallabag_import.consumer.redis.shaarli:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ShaarliImport'
+            $import: '@Wallabag\CoreBundle\Import\ShaarliImport'
 
     # pocket html
     wallabag_import.queue.redis.pocket_html:
@@ -195,4 +195,4 @@ services:
     wallabag_import.consumer.redis.pocket_html:
         class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketHtmlImport'
+            $import: '@Wallabag\CoreBundle\Import\PocketHtmlImport'