Move Import consumers to Core

app/config/services.yml

@@ -34,7 +34,7 @@ services:
 
     Wallabag\CoreBundle\:
         resource: '../../src/Wallabag/CoreBundle/*'
-        exclude: ['../../src/Wallabag/CoreBundle/{Controller,Entity,DataFixtures}', '../../src/Wallabag/CoreBundle/Event/*Event.php']
+        exclude: ['../../src/Wallabag/CoreBundle/{Consumer,Controller,Entity,DataFixtures}', '../../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

app/config/services_rabbit.yml

@@ -5,7 +5,7 @@ services:
         autoconfigure: true
         public: true
 
-    Wallabag\ImportBundle\Consumer\RabbitMQConsumerTotalProxy:
+    Wallabag\CoreBundle\Consumer\RabbitMQConsumerTotalProxy:
         arguments:
             $pocketConsumer: '@old_sound_rabbit_mq.import_pocket_consumer'
             $readabilityConsumer: '@old_sound_rabbit_mq.import_readability_consumer'
@@ -21,61 +21,61 @@ services:
             $pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer'
 
     wallabag_import.consumer.amqp.pocket:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\PocketImport'
 
     wallabag_import.consumer.amqp.readability:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\ReadabilityImport'
 
     wallabag_import.consumer.amqp.instapaper:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\InstapaperImport'
 
     wallabag_import.consumer.amqp.pinboard:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\PinboardImport'
 
     wallabag_import.consumer.amqp.delicious:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\DeliciousImport'
 
     wallabag_import.consumer.amqp.wallabag_v1:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\WallabagV1Import'
 
     wallabag_import.consumer.amqp.wallabag_v2:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\WallabagV2Import'
 
     wallabag_import.consumer.amqp.elcurator:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\ElcuratorImport'
 
     wallabag_import.consumer.amqp.firefox:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\FirefoxImport'
 
     wallabag_import.consumer.amqp.chrome:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\ChromeImport'
 
     wallabag_import.consumer.amqp.shaarli:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\ShaarliImport'
 
     wallabag_import.consumer.amqp.pocket_html:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\PocketHtmlImport'

app/config/services_redis.yml

@@ -17,7 +17,7 @@ services:
             - "@wallabag_import.queue.redis.readability"
 
     wallabag_import.consumer.redis.readability:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\ReadabilityImport'
 
@@ -33,7 +33,7 @@ services:
             - "@wallabag_import.queue.redis.instapaper"
 
     wallabag_import.consumer.redis.instapaper:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\InstapaperImport'
 
@@ -49,7 +49,7 @@ services:
             - "@wallabag_import.queue.redis.pinboard"
 
     wallabag_import.consumer.redis.pinboard:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\PinboardImport'
 
@@ -65,7 +65,7 @@ services:
             - "@wallabag_import.queue.redis.delicious"
 
     wallabag_import.consumer.redis.delicious:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\DeliciousImport'
 
@@ -81,7 +81,7 @@ services:
             - "@wallabag_import.queue.redis.pocket"
 
     wallabag_import.consumer.redis.pocket:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\PocketImport'
 
@@ -97,7 +97,7 @@ services:
             - "@wallabag_import.queue.redis.wallabag_v1"
 
     wallabag_import.consumer.redis.wallabag_v1:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\WallabagV1Import'
 
@@ -113,7 +113,7 @@ services:
             - "@wallabag_import.queue.redis.wallabag_v2"
 
     wallabag_import.consumer.redis.wallabag_v2:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\WallabagV2Import'
 
@@ -129,7 +129,7 @@ services:
             - "@wallabag_import.queue.redis.elcurator"
 
     wallabag_import.consumer.redis.elcurator:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\ElcuratorImport'
 
@@ -145,7 +145,7 @@ services:
             - "@wallabag_import.queue.redis.firefox"
 
     wallabag_import.consumer.redis.firefox:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\FirefoxImport'
 
@@ -161,7 +161,7 @@ services:
             - "@wallabag_import.queue.redis.chrome"
 
     wallabag_import.consumer.redis.chrome:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\ChromeImport'
 
@@ -177,7 +177,7 @@ services:
             - "@wallabag_import.queue.redis.shaarli"
 
     wallabag_import.consumer.redis.shaarli:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\ShaarliImport'
 
@@ -193,6 +193,6 @@ services:
             - "@wallabag_import.queue.redis.pocket_html"
 
     wallabag_import.consumer.redis.pocket_html:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        class: Wallabag\CoreBundle\Consumer\RedisEntryConsumer
         arguments:
             $import: '@Wallabag\ImportBundle\Import\PocketHtmlImport'

src/Wallabag/CoreBundle/Consumer/AMQPEntryConsumer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Consumer;
+namespace Wallabag\CoreBundle\Consumer;
 
 use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
 use PhpAmqpLib\Message\AMQPMessage;

src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Consumer;
+namespace Wallabag\CoreBundle\Consumer;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;

src/Wallabag/CoreBundle/Consumer/RabbitMQConsumerTotalProxy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Consumer;
+namespace Wallabag\CoreBundle\Consumer;
 
 use OldSound\RabbitMqBundle\RabbitMq\Consumer;
 

src/Wallabag/CoreBundle/Consumer/RedisEntryConsumer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Consumer;
+namespace Wallabag\CoreBundle\Consumer;
 
 use Simpleue\Job\Job;
 

src/Wallabag/ImportBundle/Controller/ImportController.php

@@ -6,8 +6,8 @@ use Craue\ConfigBundle\Util\Config;
 use Predis\Client;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Wallabag\CoreBundle\Consumer\RabbitMQConsumerTotalProxy;
 use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\ImportBundle\Consumer\RabbitMQConsumerTotalProxy;
 use Wallabag\ImportBundle\Import\ImportChain;
 
 class ImportController extends AbstractController

tests/Wallabag/CoreBundle/Consumer/AMQPEntryConsumerTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Tests\Wallabag\ImportBundle\Consumer;
+namespace Tests\Wallabag\CoreBundle\Consumer;
 
 use Doctrine\ORM\EntityManager;
 use PhpAmqpLib\Message\AMQPMessage;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Wallabag\CoreBundle\Consumer\AMQPEntryConsumer;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Repository\UserRepository;
-use Wallabag\ImportBundle\Consumer\AMQPEntryConsumer;
 use Wallabag\ImportBundle\Import\AbstractImport;
 
 class AMQPEntryConsumerTest extends TestCase

tests/Wallabag/CoreBundle/Consumer/RedisEntryConsumerTest.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Tests\Wallabag\ImportBundle\Consumer;
+namespace Tests\Wallabag\CoreBundle\Consumer;
 
 use Doctrine\ORM\EntityManager;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Wallabag\CoreBundle\Consumer\RedisEntryConsumer;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\User;
 use Wallabag\CoreBundle\Repository\UserRepository;
-use Wallabag\ImportBundle\Consumer\RedisEntryConsumer;
 use Wallabag\ImportBundle\Import\AbstractImport;
 
 class RedisEntryConsumerTest extends TestCase