diff --git a/app/config/services.yml b/app/config/services.yml index 142931330..de4a5f696 100644 --- a/app/config/services.yml +++ b/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 diff --git a/app/config/services_redis.yml b/app/config/services_redis.yml index cee479999..11fc0dac3 100644 --- a/app/config/services_redis.yml +++ b/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" diff --git a/src/Wallabag/CoreBundle/Controller/Import/ChromeController.php b/src/Wallabag/CoreBundle/Controller/Import/ChromeController.php index 6f0ede269..c704c0356 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/ChromeController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php b/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php index 9b11d1fea..403fdbfed 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php b/src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php index 033805660..bce0a9bdf 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php b/src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php index 2d17d5f62..cb7f55b97 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php b/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php index 13ef18084..6bd416643 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php b/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php index 5d101604d..ea992006e 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/PocketController.php b/src/Wallabag/CoreBundle/Controller/Import/PocketController.php index ef510cd4f..b73f37da4 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/PocketController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php b/src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php index c2de4398b..fd431cc18 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php b/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php index 5fc3138eb..55bd8aa55 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php b/src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php index eef4e19ec..5c1239c68 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php b/src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php index c4a3bacd6..bdf39a28e 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php +++ b/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 { diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php b/src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php index f5ea6e746..288991d54 100644 --- a/src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php +++ b/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 { diff --git a/src/Wallabag/ImportBundle/Redis/Producer.php b/src/Wallabag/CoreBundle/Redis/Producer.php similarity index 96% rename from src/Wallabag/ImportBundle/Redis/Producer.php rename to src/Wallabag/CoreBundle/Redis/Producer.php index c77b51747..fbab0265a 100644 --- a/src/Wallabag/ImportBundle/Redis/Producer.php +++ b/src/Wallabag/CoreBundle/Redis/Producer.php @@ -1,6 +1,6 @@