aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-15 21:30:55 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-09-11 21:57:09 +0200
commit40d2a29443df8ef6fdf1f2d09b5ba8808543c245 (patch)
tree2bc78f398472867864adddcf03bf62ac0c390083 /src
parente31ee20dd7ed0f92e5c41c35a0876529d0b03436 (diff)
downloadwallabag-40d2a29443df8ef6fdf1f2d09b5ba8808543c245.tar.gz
wallabag-40d2a29443df8ef6fdf1f2d09b5ba8808543c245.tar.zst
wallabag-40d2a29443df8ef6fdf1f2d09b5ba8808543c245.zip
Replace RabbitMQ injection with CraueConfiguration
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php5
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php5
-rw-r--r--src/Wallabag/ImportBundle/Import/PocketImport.php4
-rw-r--r--src/Wallabag/ImportBundle/Resources/config/services.yml1
4 files changed, 12 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 143def4f..8a2439ec 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -322,6 +322,11 @@ class InstallCommand extends ContainerAwareCommand
322 'section' => 'import', 322 'section' => 'import',
323 ], 323 ],
324 [ 324 [
325 'name' => 'rabbitmq',
326 'value' => '0',
327 'section' => 'import',
328 ],
329 [
325 'name' => 'show_printlink', 330 'name' => 'show_printlink',
326 'value' => '1', 331 'value' => '1',
327 'section' => 'entry', 332 'section' => 'entry',
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
index b4309304..778f91ed 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
@@ -96,6 +96,11 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
96 'section' => 'import', 96 'section' => 'import',
97 ], 97 ],
98 [ 98 [
99 'name' => 'rabbitmq',
100 'value' => '0',
101 'section' => 'import',
102 ],
103 [
99 'name' => 'show_printlink', 104 'name' => 'show_printlink',
100 'value' => '1', 105 'value' => '1',
101 'section' => 'entry', 106 'section' => 'entry',
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index b02894f0..7d1c0c61 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -25,14 +25,14 @@ class PocketImport extends AbstractImport
25 private $producer; 25 private $producer;
26 private $rabbitMQ; 26 private $rabbitMQ;
27 27
28 public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, Config $craueConfig, $rabbitMQ, Producer $producer) 28 public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, Config $craueConfig, Producer $producer)
29 { 29 {
30 $this->user = $tokenStorage->getToken()->getUser(); 30 $this->user = $tokenStorage->getToken()->getUser();
31 $this->em = $em; 31 $this->em = $em;
32 $this->contentProxy = $contentProxy; 32 $this->contentProxy = $contentProxy;
33 $this->consumerKey = $craueConfig->get('pocket_consumer_key'); 33 $this->consumerKey = $craueConfig->get('pocket_consumer_key');
34 $this->logger = new NullLogger(); 34 $this->logger = new NullLogger();
35 $this->rabbitMQ = $rabbitMQ; 35 $this->rabbitMQ = $craueConfig->get('rabbitmq');
36 $this->producer = $producer; 36 $this->producer = $producer;
37 } 37 }
38 38
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml
index 7ea54162..60eb4e18 100644
--- a/src/Wallabag/ImportBundle/Resources/config/services.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@@ -25,7 +25,6 @@ services:
25 - "@doctrine.orm.entity_manager" 25 - "@doctrine.orm.entity_manager"
26 - "@wallabag_core.content_proxy" 26 - "@wallabag_core.content_proxy"
27 - "@craue_config" 27 - "@craue_config"
28 - %rabbitmq%
29 - "@old_sound_rabbit_mq.wallabag_producer" 28 - "@old_sound_rabbit_mq.wallabag_producer"
30 calls: 29 calls:
31 - [ setClient, [ "@wallabag_import.pocket.client" ] ] 30 - [ setClient, [ "@wallabag_import.pocket.client" ] ]