Skip to content

Commit 494ffe9

Browse files
committed
Merge branch 'master' into 0.9
2 parents fd235f5 + ab19759 commit 494ffe9

42 files changed

Lines changed: 89 additions & 56 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bin/test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ waitForService beanstalkd 11300 50
3737
waitForService gearmand 4730 50
3838
waitForService kafka 9092 50
3939

40-
php pkg/job-queue/Tests/Functional/app/console doctrine:database:create
40+
php pkg/job-queue/Tests/Functional/app/console doctrine:database:create --if-not-exists
4141
php pkg/job-queue/Tests/Functional/app/console doctrine:schema:update --force
4242

4343
#php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
environment:
1919
- AMQP_DSN=amqp://guest:guest@rabbitmq:5672/mqdev
2020
- AMQPS_DSN=amqps://guest:guest@rabbitmqssl:5671
21-
- DOCTINE_DSN=mysql://root:rootpass@mysql/mqdev
21+
- DOCTRINE_DSN=mysql://root:rootpass@mysql/mqdev
2222
- RABBITMQ_HOST=rabbitmq
2323
- RABBITMQ_USER=guest
2424
- RABBITMQ_PASSWORD=guest

‎docs/bundle/async_events.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ and register it:
154154
# app/config/config.yml
155155
156156
services:
157-
acme.foo_event_transofrmer:
157+
acme.foo_event_transformer:
158158
class: 'AcmeBundle\Listener\FooEventTransformer'
159159
arguments: ['@doctrine']
160160
tags:
File renamed without changes.

‎docs/bundle/functional_testing.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ In this chapter we give some advices on how to test message queue related logic.
77

88
## NULL transport
99

10-
While testing the application you dont usually need to send real message to real broker.
10+
While testing the application you don't usually need to send real message to real broker.
1111
Or even have a dependency on a MQ broker.
1212
Here's the purpose of the NULL transport.
1313
It simple do nothing when you ask it to send a message.

‎docs/bundle/job_queue.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $ bin/console doctrine:schema:update
7575

7676
Guarantee that there is only one job with such name running at a time.
7777
For example you have a task that builds a search index.
78-
It takes quite a lot of time and you dont want another instance of same task working at the same time.
78+
It takes quite a lot of time and you don't want another instance of same task working at the same time.
7979
Here's how to do it:
8080

8181
* Write a job processor class:

‎docs/client/message_examples.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ $producer->sendEvent('aTopic', $message);
8282
## Timestamp, Content type, Message id
8383

8484
Those are self describing things.
85-
Usually they are set by Client so you dont have to worry about them.
85+
Usually they are set by Client so you don't have to worry about them.
8686
If you do not like what Client set you can always set custom values:
8787

8888
```php

‎docs/client/supported_brokers.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ Here's the list of protocols and Client features supported by them
3131

3232
* \* Possible if a RabbitMQ delay plugin is installed.
3333
* \*\* Possible if topics (exchanges) are configured on broker side manually.
34-
* \*\*\* Possible if RabbitMQ Managment Plugin is installed.
34+
* \*\*\* Possible if RabbitMQ Management Plugin is installed.
3535

3636
[back to index](../index.md)

‎docs/consumption/message_processor.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class SendMailProcessor implements PsrProcessor
113113

114114
The consumption component provide some useful extensions, for example there is an extension that makes RPC processing simpler.
115115
The producer might wait for a reply from a consumer and in order to send it a processor has to return a reply result.
116-
Dont forget to add `ReplyExtension`.
116+
Don't forget to add `ReplyExtension`.
117117

118118
```php
119119
<?php

‎docs/contribution.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To run tests simply run
2323

2424
## Commit
2525

26-
When you try to commit changes `php-cs-fixer` is run. It fixes all coding style issues. Dont forget to stage them and commit everything.
26+
When you try to commit changes `php-cs-fixer` is run. It fixes all coding style issues. Don't forget to stage them and commit everything.
2727
Once everything is done open a pull request on official repository.
2828

2929
[back to index](index.md)

0 commit comments

Comments
 (0)