Move Import redis to Core

app/config/services.yml

@@ -34,7 +34,7 @@ services:
 
     Wallabag\CoreBundle\:
         resource: '../../src/Wallabag/CoreBundle/*'
-        exclude: ['../../src/Wallabag/CoreBundle/{Consumer,Controller,Entity,DataFixtures}', '../../src/Wallabag/CoreBundle/Event/*Event.php']
+        exclude: ['../../src/Wallabag/CoreBundle/{Consumer,Controller,Entity,DataFixtures,Redis}', '../../src/Wallabag/CoreBundle/Event/*Event.php']
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
@@ -103,10 +103,6 @@ services:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer'
             $redisProducer: '@wallabag_import.producer.redis.pocket_html'
 
-    Wallabag\ImportBundle\:
-        resource: '../../src/Wallabag/ImportBundle/*'
-        exclude: '../../src/Wallabag/ImportBundle/{Consumer,Controller,Redis}'
-
     Doctrine\DBAL\Connection:
         alias: doctrine.dbal.default_connection
 

app/config/services_redis.yml

@@ -12,7 +12,7 @@ services:
             $queueName: "wallabag.import.readability"
 
     wallabag_import.producer.redis.readability:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.readability"
 
@@ -28,7 +28,7 @@ services:
             $queueName: "wallabag.import.instapaper"
 
     wallabag_import.producer.redis.instapaper:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.instapaper"
 
@@ -44,7 +44,7 @@ services:
             $queueName: "wallabag.import.pinboard"
 
     wallabag_import.producer.redis.pinboard:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.pinboard"
 
@@ -60,7 +60,7 @@ services:
             $queueName: "wallabag.import.delicious"
 
     wallabag_import.producer.redis.delicious:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.delicious"
 
@@ -76,7 +76,7 @@ services:
             $queueName: "wallabag.import.pocket"
 
     wallabag_import.producer.redis.pocket:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.pocket"
 
@@ -92,7 +92,7 @@ services:
             $queueName: "wallabag.import.wallabag_v1"
 
     wallabag_import.producer.redis.wallabag_v1:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.wallabag_v1"
 
@@ -108,7 +108,7 @@ services:
             $queueName: "wallabag.import.wallabag_v2"
 
     wallabag_import.producer.redis.wallabag_v2:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.wallabag_v2"
 
@@ -124,7 +124,7 @@ services:
             $queueName: "wallabag.import.elcurator"
 
     wallabag_import.producer.redis.elcurator:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.elcurator"
 
@@ -140,7 +140,7 @@ services:
             $queueName: "wallabag.import.firefox"
 
     wallabag_import.producer.redis.firefox:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.firefox"
 
@@ -156,7 +156,7 @@ services:
             $queueName: "wallabag.import.chrome"
 
     wallabag_import.producer.redis.chrome:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.chrome"
 
@@ -172,7 +172,7 @@ services:
             $queueName: "wallabag.import.shaarli"
 
     wallabag_import.producer.redis.shaarli:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.shaarli"
 
@@ -188,7 +188,7 @@ services:
             $queueName: "wallabag.import.pocket_html"
 
     wallabag_import.producer.redis.pocket_html:
-        class: Wallabag\ImportBundle\Redis\Producer
+        class: Wallabag\CoreBundle\Redis\Producer
         arguments:
             - "@wallabag_import.queue.redis.pocket_html"
 

src/Wallabag/CoreBundle/Controller/Import/ChromeController.php

@@ -8,7 +8,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Import\ChromeImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class ChromeController extends BrowserController
 {

src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php

@@ -10,7 +10,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
 use Wallabag\CoreBundle\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\DeliciousImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class DeliciousController extends AbstractController
 {

src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php

@@ -8,7 +8,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Import\ElcuratorImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class ElcuratorController extends WallabagController
 {

src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php

@@ -8,7 +8,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Import\FirefoxImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class FirefoxController extends BrowserController
 {

src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php

@@ -10,7 +10,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
 use Wallabag\CoreBundle\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\InstapaperImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class InstapaperController extends AbstractController
 {

src/Wallabag/CoreBundle/Controller/Import/PinboardController.php

@@ -10,7 +10,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
 use Wallabag\CoreBundle\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\PinboardImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class PinboardController extends AbstractController
 {

src/Wallabag/CoreBundle/Controller/Import/PocketController.php

@@ -12,7 +12,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
 use Wallabag\CoreBundle\Import\PocketImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class PocketController extends AbstractController
 {

src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php

@@ -8,7 +8,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Import\PocketHtmlImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class PocketHtmlController extends HtmlController
 {

src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php

@@ -10,7 +10,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
 use Wallabag\CoreBundle\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\ReadabilityImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class ReadabilityController extends AbstractController
 {

src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php

@@ -8,7 +8,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Import\ShaarliImport;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class ShaarliController extends HtmlController
 {

src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php

@@ -8,7 +8,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Import\WallabagV1Import;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class WallabagV1Controller extends WallabagController
 {

src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php

@@ -8,7 +8,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Import\WallabagV2Import;
-use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
+use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
 
 class WallabagV2Controller extends WallabagController
 {

src/Wallabag/CoreBundle/Redis/Producer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Redis;
+namespace Wallabag\CoreBundle\Redis;
 
 use OldSound\RabbitMqBundle\RabbitMq\ProducerInterface;
 use Simpleue\Queue\RedisQueue;

tests/Wallabag/CoreBundle/Import/ChromeImportTest.php

@@ -15,8 +15,8 @@ use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 use Wallabag\CoreBundle\Helper\TagsAssigner;
 use Wallabag\CoreBundle\Import\ChromeImport;
+use Wallabag\CoreBundle\Redis\Producer;
 use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\ImportBundle\Redis\Producer;
 
 class ChromeImportTest extends TestCase
 {

tests/Wallabag/CoreBundle/Import/FirefoxImportTest.php

@@ -15,8 +15,8 @@ use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 use Wallabag\CoreBundle\Helper\TagsAssigner;
 use Wallabag\CoreBundle\Import\FirefoxImport;
+use Wallabag\CoreBundle\Redis\Producer;
 use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\ImportBundle\Redis\Producer;
 
 class FirefoxImportTest extends TestCase
 {

tests/Wallabag/CoreBundle/Import/InstapaperImportTest.php

@@ -16,8 +16,8 @@ use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 use Wallabag\CoreBundle\Helper\TagsAssigner;
 use Wallabag\CoreBundle\Import\InstapaperImport;
+use Wallabag\CoreBundle\Redis\Producer;
 use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\ImportBundle\Redis\Producer;
 
 class InstapaperImportTest extends TestCase
 {

tests/Wallabag/CoreBundle/Import/PocketHtmlImportTest.php

@@ -15,8 +15,8 @@ use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 use Wallabag\CoreBundle\Helper\TagsAssigner;
 use Wallabag\CoreBundle\Import\PocketHtmlImport;
+use Wallabag\CoreBundle\Redis\Producer;
 use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\ImportBundle\Redis\Producer;
 
 class PocketHtmlImportTest extends TestCase
 {

tests/Wallabag/CoreBundle/Import/PocketImportTest.php

@@ -19,8 +19,8 @@ use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 use Wallabag\CoreBundle\Helper\TagsAssigner;
 use Wallabag\CoreBundle\Import\PocketImport;
+use Wallabag\CoreBundle\Redis\Producer;
 use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\ImportBundle\Redis\Producer;
 
 class PocketImportTest extends TestCase
 {

tests/Wallabag/CoreBundle/Import/ReadabilityImportTest.php

@@ -15,8 +15,8 @@ use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 use Wallabag\CoreBundle\Helper\TagsAssigner;
 use Wallabag\CoreBundle\Import\ReadabilityImport;
+use Wallabag\CoreBundle\Redis\Producer;
 use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\ImportBundle\Redis\Producer;
 
 class ReadabilityImportTest extends TestCase
 {

tests/Wallabag/CoreBundle/Import/ShaarliImportTest.php

@@ -15,8 +15,8 @@ use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 use Wallabag\CoreBundle\Helper\TagsAssigner;
 use Wallabag\CoreBundle\Import\ShaarliImport;
+use Wallabag\CoreBundle\Redis\Producer;
 use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\ImportBundle\Redis\Producer;
 
 class ShaarliImportTest extends TestCase
 {

tests/Wallabag/CoreBundle/Import/WallabagV1ImportTest.php

@@ -16,8 +16,8 @@ use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 use Wallabag\CoreBundle\Helper\TagsAssigner;
 use Wallabag\CoreBundle\Import\WallabagV1Import;
+use Wallabag\CoreBundle\Redis\Producer;
 use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\ImportBundle\Redis\Producer;
 
 class WallabagV1ImportTest extends TestCase
 {

tests/Wallabag/CoreBundle/Import/WallabagV2ImportTest.php

@@ -16,8 +16,8 @@ use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Helper\ContentProxy;
 use Wallabag\CoreBundle\Helper\TagsAssigner;
 use Wallabag\CoreBundle\Import\WallabagV2Import;
+use Wallabag\CoreBundle\Redis\Producer;
 use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\ImportBundle\Redis\Producer;
 
 class WallabagV2ImportTest extends TestCase
 {