pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #5748 from yguedidi/use-fqcn-as-service-name

Browse Source
This commit is contained in:
Jérémy Benoist
2022-08-25 07:37:06 +02:00
committed by GitHub
parent eda214c35d 538fd258fe
commit 009697f844
59 changed files with 367 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Wallabag/ImportBundle/Command/ImportCommand.php
View File

@ -9,6 +9,14 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Wallabag\ImportBundle\Import\ChromeImport;
use Wallabag\ImportBundle\Import\DeliciousImport;
use Wallabag\ImportBundle\Import\FirefoxImport;
use Wallabag\ImportBundle\Import\InstapaperImport;
use Wallabag\ImportBundle\Import\PinboardImport;
use Wallabag\ImportBundle\Import\ReadabilityImport;
use Wallabag\ImportBundle\Import\WallabagV1Import;
use Wallabag\ImportBundle\Import\WallabagV2Import;
class ImportCommand extends ContainerAwareCommand
{
@ -60,28 +68,28 @@ class ImportCommand extends ContainerAwareCommand
switch ($input->getOption('importer')) {
case 'v2':
$import = $this->getContainer()->get('wallabag_import.wallabag_v2.import');
$import = $this->getContainer()->get(WallabagV2Import::class);
break;
case 'firefox':
$import = $this->getContainer()->get('wallabag_import.firefox.import');
$import = $this->getContainer()->get(FirefoxImport::class);
break;
case 'chrome':
$import = $this->getContainer()->get('wallabag_import.chrome.import');
$import = $this->getContainer()->get(ChromeImport::class);
break;
case 'readability':
$import = $this->getContainer()->get('wallabag_import.readability.import');
$import = $this->getContainer()->get(ReadabilityImport::class);
break;
case 'instapaper':
$import = $this->getContainer()->get('wallabag_import.instapaper.import');
$import = $this->getContainer()->get(InstapaperImport::class);
break;
case 'pinboard':
$import = $this->getContainer()->get('wallabag_import.pinboard.import');
$import = $this->getContainer()->get(PinboardImport::class);
break;
case 'delicious':
$import = $this->getContainer()->get('wallabag_import.delicious.import');
$import = $this->getContainer()->get(DeliciousImport::class);
break;
default:
$import = $this->getContainer()->get('wallabag_import.wallabag_v1.import');
$import = $this->getContainer()->get(WallabagV1Import::class);
}
$import->setMarkAsRead($input->getOption('markAsRead'));

3
src/Wallabag/ImportBundle/Controller/ChromeController.php
View File

@ -4,6 +4,7 @@ namespace Wallabag\ImportBundle\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Import\ChromeImport;
class ChromeController extends BrowserController
{
@ -20,7 +21,7 @@ class ChromeController extends BrowserController
*/
protected function getImportService()
{
$service = $this->get('wallabag_import.chrome.import');
$service = $this->get(ChromeImport::class);
if ($this->get('craue_config')->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_chrome_producer'));

3
src/Wallabag/ImportBundle/Controller/DeliciousController.php
View File

@ -6,6 +6,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\DeliciousImport;
class DeliciousController extends Controller
{
@ -17,7 +18,7 @@ class DeliciousController extends Controller
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$delicious = $this->get('wallabag_import.delicious.import');
$delicious = $this->get(DeliciousImport::class);
$delicious->setUser($this->getUser());
if ($this->get('craue_config')->get('import_with_rabbitmq')) {

3
src/Wallabag/ImportBundle/Controller/ElcuratorController.php
View File

@ -4,6 +4,7 @@ namespace Wallabag\ImportBundle\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Import\ElcuratorImport;
class ElcuratorController extends WallabagController
{
@ -20,7 +21,7 @@ class ElcuratorController extends WallabagController
*/
protected function getImportService()
{
$service = $this->get('wallabag_import.elcurator.import');
$service = $this->get(ElcuratorImport::class);
if ($this->get('craue_config')->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_elcurator_producer'));

3
src/Wallabag/ImportBundle/Controller/FirefoxController.php
View File

@ -4,6 +4,7 @@ namespace Wallabag\ImportBundle\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Import\FirefoxImport;
class FirefoxController extends BrowserController
{
@ -20,7 +21,7 @@ class FirefoxController extends BrowserController
*/
protected function getImportService()
{
$service = $this->get('wallabag_import.firefox.import');
$service = $this->get(FirefoxImport::class);
if ($this->get('craue_config')->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_firefox_producer'));

6
src/Wallabag/ImportBundle/Controller/ImportController.php
View File

@ -2,8 +2,10 @@
namespace Wallabag\ImportBundle\Controller;
use Predis\Client;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Import\ImportChain;
class ImportController extends Controller
{
@ -13,7 +15,7 @@ class ImportController extends Controller
public function importAction()
{
return $this->render('WallabagImportBundle:Import:index.html.twig', [
'imports' => $this->get('wallabag_import.chain')->getAll(),
'imports' => $this->get(ImportChain::class)->getAll(),
]);
}
@ -50,7 +52,7 @@ class ImportController extends Controller
$rabbitNotInstalled = true;
}
} elseif ($this->get('craue_config')->get('import_with_redis')) {
$redis = $this->get('wallabag_core.redis.client');
$redis = $this->get(Client::class);
try {
$nbRedisMessages = $redis->llen('wallabag.import.pocket')

3
src/Wallabag/ImportBundle/Controller/InstapaperController.php
View File

@ -6,6 +6,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\InstapaperImport;
class InstapaperController extends Controller
{
@ -17,7 +18,7 @@ class InstapaperController extends Controller
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$instapaper = $this->get('wallabag_import.instapaper.import');
$instapaper = $this->get(InstapaperImport::class);
$instapaper->setUser($this->getUser());
if ($this->get('craue_config')->get('import_with_rabbitmq')) {

3
src/Wallabag/ImportBundle/Controller/PinboardController.php
View File

@ -6,6 +6,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\PinboardImport;
class PinboardController extends Controller
{
@ -17,7 +18,7 @@ class PinboardController extends Controller
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$pinboard = $this->get('wallabag_import.pinboard.import');
$pinboard = $this->get(PinboardImport::class);
$pinboard->setUser($this->getUser());
if ($this->get('craue_config')->get('import_with_rabbitmq')) {

3
src/Wallabag/ImportBundle/Controller/PocketController.php
View File

@ -7,6 +7,7 @@ use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\ImportBundle\Import\PocketImport;
class PocketController extends Controller
{
@ -110,7 +111,7 @@ class PocketController extends Controller
*/
private function getPocketImportService()
{
$pocket = $this->get('wallabag_import.pocket.import');
$pocket = $this->get(PocketImport::class);
$pocket->setUser($this->getUser());
if ($this->get('craue_config')->get('import_with_rabbitmq')) {

3
src/Wallabag/ImportBundle/Controller/ReadabilityController.php
View File

@ -6,6 +6,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Form\Type\UploadImportType;
use Wallabag\ImportBundle\Import\ReadabilityImport;
class ReadabilityController extends Controller
{
@ -17,7 +18,7 @@ class ReadabilityController extends Controller
$form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$readability = $this->get('wallabag_import.readability.import');
$readability = $this->get(ReadabilityImport::class);
$readability->setUser($this->getUser());
if ($this->get('craue_config')->get('import_with_rabbitmq')) {

3
src/Wallabag/ImportBundle/Controller/WallabagV1Controller.php
View File

@ -4,6 +4,7 @@ namespace Wallabag\ImportBundle\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Import\WallabagV1Import;
class WallabagV1Controller extends WallabagController
{
@ -20,7 +21,7 @@ class WallabagV1Controller extends WallabagController
*/
protected function getImportService()
{
$service = $this->get('wallabag_import.wallabag_v1.import');
$service = $this->get(WallabagV1Import::class);
if ($this->get('craue_config')->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_wallabag_v1_producer'));

3
src/Wallabag/ImportBundle/Controller/WallabagV2Controller.php
View File

@ -4,6 +4,7 @@ namespace Wallabag\ImportBundle\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\ImportBundle\Import\WallabagV2Import;
class WallabagV2Controller extends WallabagController
{
@ -20,7 +21,7 @@ class WallabagV2Controller extends WallabagController
*/
protected function getImportService()
{
$service = $this->get('wallabag_import.wallabag_v2.import');
$service = $this->get(WallabagV2Import::class);
if ($this->get('craue_config')->get('import_with_rabbitmq')) {
$service->setProducer($this->get('old_sound_rabbit_mq.import_wallabag_v2_producer'));

4
src/Wallabag/ImportBundle/Import/ImportCompilerPass.php
View File

@ -10,12 +10,12 @@ class ImportCompilerPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
{
if (!$container->hasDefinition('wallabag_import.chain')) {
if (!$container->hasDefinition(ImportChain::class)) {
return;
}
$definition = $container->getDefinition(
'wallabag_import.chain'
ImportChain::class
);
$taggedServices = $container->findTaggedServiceIds(

40
src/Wallabag/ImportBundle/Resources/config/rabbit.yml
View File

@ -4,79 +4,79 @@ services:
class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.pocket.import"
- '@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_user.user_repository"
- "@wallabag_import.readability.import"
- '@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_user.user_repository"
- "@wallabag_import.instapaper.import"
- '@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_user.user_repository"
- "@wallabag_import.pinboard.import"
- '@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_user.user_repository"
- "@wallabag_import.delicious.import"
- '@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_user.user_repository"
- "@wallabag_import.wallabag_v1.import"
- '@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_user.user_repository"
- "@wallabag_import.wallabag_v2.import"
- '@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_user.user_repository"
- "@wallabag_import.elcurator.import"
- '@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_user.user_repository"
- "@wallabag_import.firefox.import"
- '@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_user.user_repository"
- "@wallabag_import.chrome.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\ChromeImport'
- "@event_dispatcher"
- "@logger"

60
src/Wallabag/ImportBundle/Resources/config/redis.yml
View File

@ -4,7 +4,7 @@ services:
wallabag_import.queue.redis.readability:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.readability"
wallabag_import.producer.redis.readability:
@ -16,8 +16,8 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.readability.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\ReadabilityImport'
- "@event_dispatcher"
- "@logger"
@ -25,7 +25,7 @@ services:
wallabag_import.queue.redis.instapaper:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.instapaper"
wallabag_import.producer.redis.instapaper:
@ -37,8 +37,8 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.instapaper.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\InstapaperImport'
- "@event_dispatcher"
- "@logger"
@ -46,7 +46,7 @@ services:
wallabag_import.queue.redis.pinboard:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.pinboard"
wallabag_import.producer.redis.pinboard:
@ -58,8 +58,8 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.pinboard.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\PinboardImport'
- "@event_dispatcher"
- "@logger"
@ -67,7 +67,7 @@ services:
wallabag_import.queue.redis.delicious:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.delicious"
wallabag_import.producer.redis.delicious:
@ -79,8 +79,8 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.delicious.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\DeliciousImport'
- "@event_dispatcher"
- "@logger"
@ -88,7 +88,7 @@ services:
wallabag_import.queue.redis.pocket:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.pocket"
wallabag_import.producer.redis.pocket:
@ -100,8 +100,8 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.pocket.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\PocketImport'
- "@event_dispatcher"
- "@logger"
@ -109,7 +109,7 @@ services:
wallabag_import.queue.redis.wallabag_v1:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.wallabag_v1"
wallabag_import.producer.redis.wallabag_v1:
@ -121,8 +121,8 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.wallabag_v1.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\WallabagV1Import'
- "@event_dispatcher"
- "@logger"
@ -130,7 +130,7 @@ services:
wallabag_import.queue.redis.wallabag_v2:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.wallabag_v2"
wallabag_import.producer.redis.wallabag_v2:
@ -142,8 +142,8 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.wallabag_v2.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\WallabagV2Import'
- "@event_dispatcher"
- "@logger"
@ -151,7 +151,7 @@ services:
wallabag_import.queue.redis.elcurator:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.elcurator"
wallabag_import.producer.redis.elcurator:
@ -163,8 +163,8 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.elcurator.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\ElcuratorImport'
- "@event_dispatcher"
- "@logger"
@ -172,7 +172,7 @@ services:
wallabag_import.queue.redis.firefox:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.firefox"
wallabag_import.producer.redis.firefox:
@ -184,8 +184,8 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.firefox.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\FirefoxImport'
- "@event_dispatcher"
- "@logger"
@ -193,7 +193,7 @@ services:
wallabag_import.queue.redis.chrome:
class: Simpleue\Queue\RedisQueue
arguments:
- "@wallabag_core.redis.client"
- '@Predis\Client'
- "wallabag.import.chrome"
wallabag_import.producer.redis.chrome:
@ -205,7 +205,7 @@ services:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_user.user_repository"
- "@wallabag_import.chrome.import"
- '@Wallabag\UserBundle\Repository\UserRepository'
- '@Wallabag\ImportBundle\Import\ChromeImport'
- "@event_dispatcher"
- "@logger"

73
src/Wallabag/ImportBundle/Resources/config/services.yml
View File

@ -3,18 +3,18 @@ imports:
- { resource: redis.yml }
services:
wallabag_import.chain:
Wallabag\ImportBundle\Import\ImportChain:
class: Wallabag\ImportBundle\Import\ImportChain
wallabag_import.pocket.client:
alias: 'httplug.client.wallabag_import.pocket.client'
wallabag_import.pocket.import:
Wallabag\ImportBundle\Import\PocketImport:
class: Wallabag\ImportBundle\Import\PocketImport
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
calls:
- [ setClient, [ "@wallabag_import.pocket.client" ] ]
@ -22,12 +22,12 @@ services:
tags:
- { name: wallabag_import.import, alias: pocket }
wallabag_import.wallabag_v1.import:
Wallabag\ImportBundle\Import\WallabagV1Import:
class: Wallabag\ImportBundle\Import\WallabagV1Import
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
- "%wallabag_core.fetching_error_message_title%"
- "%wallabag_core.fetching_error_message%"
@ -36,105 +36,102 @@ services:
tags:
- { name: wallabag_import.import, alias: wallabag_v1 }
wallabag_import.wallabag_v2.import:
Wallabag\ImportBundle\Import\WallabagV2Import:
class: Wallabag\ImportBundle\Import\WallabagV2Import
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
calls:
- [ setLogger, [ "@logger" ]]
tags:
- { name: wallabag_import.import, alias: wallabag_v2 }
wallabag_import.elcurator.import:
Wallabag\ImportBundle\Import\ElcuratorImport:
class: Wallabag\ImportBundle\Import\ElcuratorImport
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
calls:
- [ setLogger, [ "@logger" ]]
tags:
- { name: wallabag_import.import, alias: elcurator }
wallabag_import.readability.import:
Wallabag\ImportBundle\Import\ReadabilityImport:
class: Wallabag\ImportBundle\Import\ReadabilityImport
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
calls:
- [ setLogger, [ "@logger" ]]
tags:
- { name: wallabag_import.import, alias: readability }
wallabag_import.instapaper.import:
Wallabag\ImportBundle\Import\InstapaperImport:
class: Wallabag\ImportBundle\Import\InstapaperImport
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
calls:
- [ setLogger, [ "@logger" ]]
tags:
- { name: wallabag_import.import, alias: instapaper }
wallabag_import.pinboard.import:
Wallabag\ImportBundle\Import\PinboardImport:
class: Wallabag\ImportBundle\Import\PinboardImport
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
calls:
- [ setLogger, [ "@logger" ]]
tags:
- { name: wallabag_import.import, alias: pinboard }
wallabag_import.delicious.import:
Wallabag\ImportBundle\Import\DeliciousImport:
class: Wallabag\ImportBundle\Import\DeliciousImport
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
calls:
- [ setLogger, [ "@logger" ]]
tags:
- { name: wallabag_import.import, alias: delicious }
wallabag_import.firefox.import:
Wallabag\ImportBundle\Import\FirefoxImport:
class: Wallabag\ImportBundle\Import\FirefoxImport
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
calls:
- [ setLogger, [ "@logger" ]]
tags:
- { name: wallabag_import.import, alias: firefox }
wallabag_import.chrome.import:
Wallabag\ImportBundle\Import\ChromeImport:
class: Wallabag\ImportBundle\Import\ChromeImport
arguments:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@wallabag_core.tags_assigner"
- '@Wallabag\CoreBundle\Helper\ContentProxy'
- '@Wallabag\CoreBundle\Helper\TagsAssigner'
- "@event_dispatcher"
calls:
- [ setLogger, [ "@logger" ]]
tags:
- { name: wallabag_import.import, alias: chrome }
wallabag_import.command.import:
class: Wallabag\ImportBundle\Command\ImportCommand
tags: ['console.command']
wallabag_import.command.redis_worker:
class: Wallabag\ImportBundle\Command\RedisWorkerCommand
tags: ['console.command']
Wallabag\ImportBundle\Command\:
resource: ../../Command/*
autoconfigure: true