Move services and parameters to app services

src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php

@@ -2,9 +2,7 @@
 
 namespace Wallabag\ImportBundle\DependencyInjection;
 
-use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class WallabagImportExtension extends Extension
@@ -15,9 +13,6 @@ class WallabagImportExtension extends Extension
         $config = $this->processConfiguration($configuration, $configs);
         $container->setParameter('wallabag_import.allow_mimetypes', $config['allow_mimetypes']);
         $container->setParameter('wallabag_import.resource_dir', $config['resource_dir']);
-
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $loader->load('services.yml');
     }
 
     public function getAlias()

src/Wallabag/ImportBundle/Resources/config/rabbit.yml

@@ -1,82 +0,0 @@
-# RabbitMQ stuff
-services:
-    wallabag_import.consumer.amqp.pocket:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\PocketImport'
-            - "@event_dispatcher"
-            - "@logger"
-    wallabag_import.consumer.amqp.readability:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\ReadabilityImport'
-            - "@event_dispatcher"
-            - "@logger"
-    wallabag_import.consumer.amqp.instapaper:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\InstapaperImport'
-            - "@event_dispatcher"
-            - "@logger"
-    wallabag_import.consumer.amqp.pinboard:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\PinboardImport'
-            - "@event_dispatcher"
-            - "@logger"
-    wallabag_import.consumer.amqp.delicious:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\DeliciousImport'
-            - "@event_dispatcher"
-            - "@logger"
-    wallabag_import.consumer.amqp.wallabag_v1:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\WallabagV1Import'
-            - "@event_dispatcher"
-            - "@logger"
-    wallabag_import.consumer.amqp.wallabag_v2:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\WallabagV2Import'
-            - "@event_dispatcher"
-            - "@logger"
-    wallabag_import.consumer.amqp.elcurator:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\ElcuratorImport'
-            - "@event_dispatcher"
-            - "@logger"
-    wallabag_import.consumer.amqp.firefox:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\FirefoxImport'
-            - "@event_dispatcher"
-            - "@logger"
-    wallabag_import.consumer.amqp.chrome:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\ChromeImport'
-            - "@event_dispatcher"
-            - "@logger"

src/Wallabag/ImportBundle/Resources/config/redis.yml

@@ -1,211 +0,0 @@
-# Redis stuff
-services:
-    # readability
-    wallabag_import.queue.redis.readability:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.readability"
-
-    wallabag_import.producer.redis.readability:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.readability"
-
-    wallabag_import.consumer.redis.readability:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\ReadabilityImport'
-            - "@event_dispatcher"
-            - "@logger"
-
-    # instapaper
-    wallabag_import.queue.redis.instapaper:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.instapaper"
-
-    wallabag_import.producer.redis.instapaper:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.instapaper"
-
-    wallabag_import.consumer.redis.instapaper:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\InstapaperImport'
-            - "@event_dispatcher"
-            - "@logger"
-
-    # pinboard
-    wallabag_import.queue.redis.pinboard:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.pinboard"
-
-    wallabag_import.producer.redis.pinboard:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.pinboard"
-
-    wallabag_import.consumer.redis.pinboard:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\PinboardImport'
-            - "@event_dispatcher"
-            - "@logger"
-
-    # delicious
-    wallabag_import.queue.redis.delicious:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.delicious"
-
-    wallabag_import.producer.redis.delicious:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.delicious"
-
-    wallabag_import.consumer.redis.delicious:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\DeliciousImport'
-            - "@event_dispatcher"
-            - "@logger"
-
-    # pocket
-    wallabag_import.queue.redis.pocket:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.pocket"
-
-    wallabag_import.producer.redis.pocket:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.pocket"
-
-    wallabag_import.consumer.redis.pocket:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\PocketImport'
-            - "@event_dispatcher"
-            - "@logger"
-
-    # wallabag v1
-    wallabag_import.queue.redis.wallabag_v1:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.wallabag_v1"
-
-    wallabag_import.producer.redis.wallabag_v1:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.wallabag_v1"
-
-    wallabag_import.consumer.redis.wallabag_v1:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\WallabagV1Import'
-            - "@event_dispatcher"
-            - "@logger"
-
-    # wallabag v2
-    wallabag_import.queue.redis.wallabag_v2:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.wallabag_v2"
-
-    wallabag_import.producer.redis.wallabag_v2:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.wallabag_v2"
-
-    wallabag_import.consumer.redis.wallabag_v2:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\WallabagV2Import'
-            - "@event_dispatcher"
-            - "@logger"
-
-    # elcurator
-    wallabag_import.queue.redis.elcurator:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.elcurator"
-
-    wallabag_import.producer.redis.elcurator:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.elcurator"
-
-    wallabag_import.consumer.redis.elcurator:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\ElcuratorImport'
-            - "@event_dispatcher"
-            - "@logger"
-
-    # firefox
-    wallabag_import.queue.redis.firefox:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.firefox"
-
-    wallabag_import.producer.redis.firefox:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.firefox"
-
-    wallabag_import.consumer.redis.firefox:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\FirefoxImport'
-            - "@event_dispatcher"
-            - "@logger"
-
-    # chrome
-    wallabag_import.queue.redis.chrome:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            - '@Predis\Client'
-            - "wallabag.import.chrome"
-
-    wallabag_import.producer.redis.chrome:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.chrome"
-
-    wallabag_import.consumer.redis.chrome:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\UserBundle\Repository\UserRepository'
-            - '@Wallabag\ImportBundle\Import\ChromeImport'
-            - "@event_dispatcher"
-            - "@logger"

src/Wallabag/ImportBundle/Resources/config/services.yml

@@ -1,137 +0,0 @@
-imports:
-    - { resource: rabbit.yml }
-    - { resource: redis.yml }
-
-services:
-    Wallabag\ImportBundle\Import\ImportChain:
-        class: Wallabag\ImportBundle\Import\ImportChain
-
-    wallabag_import.pocket.client:
-        alias: 'httplug.client.wallabag_import.pocket.client'
-
-    Wallabag\ImportBundle\Import\PocketImport:
-        class: Wallabag\ImportBundle\Import\PocketImport
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-        calls:
-            - [ setClient, [ "@wallabag_import.pocket.client" ] ]
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: pocket }
-
-    Wallabag\ImportBundle\Import\WallabagV1Import:
-        class: Wallabag\ImportBundle\Import\WallabagV1Import
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-            - "%wallabag_core.fetching_error_message_title%"
-            - "%wallabag_core.fetching_error_message%"
-        calls:
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: wallabag_v1 }
-
-    Wallabag\ImportBundle\Import\WallabagV2Import:
-        class: Wallabag\ImportBundle\Import\WallabagV2Import
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-        calls:
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: wallabag_v2 }
-
-    Wallabag\ImportBundle\Import\ElcuratorImport:
-        class: Wallabag\ImportBundle\Import\ElcuratorImport
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-        calls:
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: elcurator }
-
-    Wallabag\ImportBundle\Import\ReadabilityImport:
-        class: Wallabag\ImportBundle\Import\ReadabilityImport
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-        calls:
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: readability }
-
-    Wallabag\ImportBundle\Import\InstapaperImport:
-        class: Wallabag\ImportBundle\Import\InstapaperImport
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-        calls:
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: instapaper }
-
-    Wallabag\ImportBundle\Import\PinboardImport:
-        class: Wallabag\ImportBundle\Import\PinboardImport
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-        calls:
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: pinboard }
-
-    Wallabag\ImportBundle\Import\DeliciousImport:
-        class: Wallabag\ImportBundle\Import\DeliciousImport
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-        calls:
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: delicious }
-
-    Wallabag\ImportBundle\Import\FirefoxImport:
-        class: Wallabag\ImportBundle\Import\FirefoxImport
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-        calls:
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: firefox }
-
-    Wallabag\ImportBundle\Import\ChromeImport:
-        class: Wallabag\ImportBundle\Import\ChromeImport
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - '@Wallabag\CoreBundle\Helper\ContentProxy'
-            - '@Wallabag\CoreBundle\Helper\TagsAssigner'
-            - "@event_dispatcher"
-        calls:
-            - [ setLogger, [ "@logger" ]]
-        tags:
-            -  { name: wallabag_import.import, alias: chrome }
-
-    Wallabag\ImportBundle\Command\:
-        resource: ../../Command/*
-        autoconfigure: true