aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/config/config.yml8
-rw-r--r--src/Wallabag/ImportBundle/Consumer/AMQPEntryConsumer.php (renamed from src/Wallabag/ImportBundle/Consumer/AMPQEntryConsumer.php)2
-rw-r--r--src/Wallabag/ImportBundle/Resources/config/rabbit.yml16
-rw-r--r--tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php (renamed from tests/Wallabag/ImportBundle/Consumer/AMPQEntryConsumerTest.php)10
4 files changed, 18 insertions, 18 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index e18a932d..4b869c4f 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -254,7 +254,7 @@ old_sound_rabbit_mq:
254 type: topic 254 type: topic
255 queue_options: 255 queue_options:
256 name: 'wallabag.import.pocket' 256 name: 'wallabag.import.pocket'
257 callback: wallabag_import.consumer.ampq.pocket 257 callback: wallabag_import.consumer.amqp.pocket
258 import_readability: 258 import_readability:
259 connection: default 259 connection: default
260 exchange_options: 260 exchange_options:
@@ -262,7 +262,7 @@ old_sound_rabbit_mq:
262 type: topic 262 type: topic
263 queue_options: 263 queue_options:
264 name: 'wallabag.import.readability' 264 name: 'wallabag.import.readability'
265 callback: wallabag_import.consumer.ampq.readability 265 callback: wallabag_import.consumer.amqp.readability
266 import_wallabag_v1: 266 import_wallabag_v1:
267 connection: default 267 connection: default
268 exchange_options: 268 exchange_options:
@@ -270,7 +270,7 @@ old_sound_rabbit_mq:
270 type: topic 270 type: topic
271 queue_options: 271 queue_options:
272 name: 'wallabag.import.wallabag_v1' 272 name: 'wallabag.import.wallabag_v1'
273 callback: wallabag_import.consumer.ampq.wallabag_v1 273 callback: wallabag_import.consumer.amqp.wallabag_v1
274 import_wallabag_v2: 274 import_wallabag_v2:
275 connection: default 275 connection: default
276 exchange_options: 276 exchange_options:
@@ -278,4 +278,4 @@ old_sound_rabbit_mq:
278 type: topic 278 type: topic
279 queue_options: 279 queue_options:
280 name: 'wallabag.import.wallabag_v2' 280 name: 'wallabag.import.wallabag_v2'
281 callback: wallabag_import.consumer.ampq.wallabag_v2 281 callback: wallabag_import.consumer.amqp.wallabag_v2
diff --git a/src/Wallabag/ImportBundle/Consumer/AMPQEntryConsumer.php b/src/Wallabag/ImportBundle/Consumer/AMQPEntryConsumer.php
index d95a011d..5aaa8c03 100644
--- a/src/Wallabag/ImportBundle/Consumer/AMPQEntryConsumer.php
+++ b/src/Wallabag/ImportBundle/Consumer/AMQPEntryConsumer.php
@@ -5,7 +5,7 @@ namespace Wallabag\ImportBundle\Consumer;
5use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface; 5use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
6use PhpAmqpLib\Message\AMQPMessage; 6use PhpAmqpLib\Message\AMQPMessage;
7 7
8class AMPQEntryConsumer extends AbstractConsumer implements ConsumerInterface 8class AMQPEntryConsumer extends AbstractConsumer implements ConsumerInterface
9{ 9{
10 /** 10 /**
11 * {@inheritdoc} 11 * {@inheritdoc}
diff --git a/src/Wallabag/ImportBundle/Resources/config/rabbit.yml b/src/Wallabag/ImportBundle/Resources/config/rabbit.yml
index f09dda0d..aa049749 100644
--- a/src/Wallabag/ImportBundle/Resources/config/rabbit.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/rabbit.yml
@@ -1,28 +1,28 @@
1# RabbitMQ stuff 1# RabbitMQ stuff
2services: 2services:
3 wallabag_import.consumer.ampq.pocket: 3 wallabag_import.consumer.amqp.pocket:
4 class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer 4 class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
5 arguments: 5 arguments:
6 - "@doctrine.orm.entity_manager" 6 - "@doctrine.orm.entity_manager"
7 - "@wallabag_user.user_repository" 7 - "@wallabag_user.user_repository"
8 - "@wallabag_import.pocket.import" 8 - "@wallabag_import.pocket.import"
9 - "@logger" 9 - "@logger"
10 wallabag_import.consumer.ampq.readability: 10 wallabag_import.consumer.amqp.readability:
11 class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer 11 class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
12 arguments: 12 arguments:
13 - "@doctrine.orm.entity_manager" 13 - "@doctrine.orm.entity_manager"
14 - "@wallabag_user.user_repository" 14 - "@wallabag_user.user_repository"
15 - "@wallabag_import.readability.import" 15 - "@wallabag_import.readability.import"
16 - "@logger" 16 - "@logger"
17 wallabag_import.consumer.ampq.wallabag_v1: 17 wallabag_import.consumer.amqp.wallabag_v1:
18 class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer 18 class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
19 arguments: 19 arguments:
20 - "@doctrine.orm.entity_manager" 20 - "@doctrine.orm.entity_manager"
21 - "@wallabag_user.user_repository" 21 - "@wallabag_user.user_repository"
22 - "@wallabag_import.wallabag_v1.import" 22 - "@wallabag_import.wallabag_v1.import"
23 - "@logger" 23 - "@logger"
24 wallabag_import.consumer.ampq.wallabag_v2: 24 wallabag_import.consumer.amqp.wallabag_v2:
25 class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer 25 class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
26 arguments: 26 arguments:
27 - "@doctrine.orm.entity_manager" 27 - "@doctrine.orm.entity_manager"
28 - "@wallabag_user.user_repository" 28 - "@wallabag_user.user_repository"
diff --git a/tests/Wallabag/ImportBundle/Consumer/AMPQEntryConsumerTest.php b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php
index b13ade1d..a3263771 100644
--- a/tests/Wallabag/ImportBundle/Consumer/AMPQEntryConsumerTest.php
+++ b/tests/Wallabag/ImportBundle/Consumer/AMQPEntryConsumerTest.php
@@ -2,12 +2,12 @@
2 2
3namespace Tests\Wallabag\ImportBundle\Consumer\AMQP; 3namespace Tests\Wallabag\ImportBundle\Consumer\AMQP;
4 4
5use Wallabag\ImportBundle\Consumer\AMPQEntryConsumer; 5use Wallabag\ImportBundle\Consumer\AMQPEntryConsumer;
6use PhpAmqpLib\Message\AMQPMessage; 6use PhpAmqpLib\Message\AMQPMessage;
7use Wallabag\UserBundle\Entity\User; 7use Wallabag\UserBundle\Entity\User;
8use Wallabag\CoreBundle\Entity\Entry; 8use Wallabag\CoreBundle\Entity\Entry;
9 9
10class AMPQEntryConsumerTest extends \PHPUnit_Framework_TestCase 10class AMQPEntryConsumerTest extends \PHPUnit_Framework_TestCase
11{ 11{
12 public function testMessageOk() 12 public function testMessageOk()
13 { 13 {
@@ -112,7 +112,7 @@ JSON;
112 ->with(json_decode($body, true)) 112 ->with(json_decode($body, true))
113 ->willReturn($entry); 113 ->willReturn($entry);
114 114
115 $consumer = new AMPQEntryConsumer( 115 $consumer = new AMQPEntryConsumer(
116 $em, 116 $em,
117 $userRepository, 117 $userRepository,
118 $import 118 $import
@@ -157,7 +157,7 @@ JSON;
157 ->disableOriginalConstructor() 157 ->disableOriginalConstructor()
158 ->getMock(); 158 ->getMock();
159 159
160 $consumer = new AMPQEntryConsumer( 160 $consumer = new AMQPEntryConsumer(
161 $em, 161 $em,
162 $userRepository, 162 $userRepository,
163 $import 163 $import
@@ -212,7 +212,7 @@ JSON;
212 ->with(json_decode($body, true)) 212 ->with(json_decode($body, true))
213 ->willReturn(null); 213 ->willReturn(null);
214 214
215 $consumer = new AMPQEntryConsumer( 215 $consumer = new AMQPEntryConsumer(
216 $em, 216 $em,
217 $userRepository, 217 $userRepository,
218 $import 218 $import