Skip to content

Commit b836dc8

Browse files
committed
Merge remote-tracking branch 'origin/master' into dbal-transport
pkg/enqueue-bundle/Tests/Unit/EnqueueBundleTest.php
2 parents d1b3c13 + 0b5cbc6 commit b836dc8

187 files changed

Lines changed: 3782 additions & 320 deletions

File tree

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Change Log
22

3+
## [0.3.3](https://github.com/php-enqueue/enqueue-dev/tree/0.3.3) (2017-04-21)
4+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.3.2...0.3.3)
5+
6+
- \[client\] Redis driver [\#59](https://github.com/php-enqueue/enqueue-dev/pull/59) ([makasim](https://github.com/makasim))
7+
- Redis transport. [\#55](https://github.com/php-enqueue/enqueue-dev/pull/55) ([makasim](https://github.com/makasim))
8+
9+
- Move some dependencies to dev section [\#57](https://github.com/php-enqueue/enqueue-dev/issues/57)
10+
311
## [0.3.2](https://github.com/php-enqueue/enqueue-dev/tree/0.3.2) (2017-04-19)
412
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.3.1...0.3.2)
513

‎README.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,21 @@
33
[![Gitter](https://badges.gitter.im/php-enqueue/Lobby.svg)](https://gitter.im/php-enqueue/Lobby)
44
[![Build Status](https://travis-ci.org/php-enqueue/enqueue-dev.png?branch=master)](https://travis-ci.org/php-enqueue/enqueue-dev)
55

6-
This is where all development happens. The repository provides a friendly environment for productive development, testing.
6+
This is where all development happens. The repository provides a friendly environment for productive development and testing of all enqueue related packages.
7+
8+
Features:
9+
10+
* [JMS](https://docs.oracle.com/javaee/7/api/javax/jms/package-summary.html) like transport [abstraction](https://github.com/php-enqueue/psr-queue).
11+
* Feature rich.
12+
* Supports [AMQP](docs/amqp_transport.md) (RabbitMQ, ActiveMQ and others), [STOMP](docs/stomp_transport.md) (RabbitMQ, ActiveMQ and others), [Redis](docs/redis_transport.md), Doctrine DBAL, [Filesystem](docs/filesystem_transport.md), [Null](docs/null_transport.md) transports.
13+
* Generic purpose abstraction level (the transport level).
14+
* "Opinionated" easy to use abstraction level (the client level).
15+
* [Message bus](http://www.enterpriseintegrationpatterns.com/patterns/messaging/MessageBus.html) support.
16+
* [RPC over MQ](https://www.rabbitmq.com/tutorials/tutorial-one-php.html) support.
17+
* Temporary queues support.
18+
* Well designed components (decoupled, reusable,).
19+
* Tested with unit and functional tests.
20+
* For more visit [quick tour](docs/quick_tour.md).
721

822
## Resources
923

‎bin/release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fi
1313

1414
CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
1515

16-
for REMOTE in origin psr-queue enqueue amqp-ext fs enqueue-bundle job-queue stomp test
16+
for REMOTE in origin psr-queue stomp amqp-ext fs redis enqueue enqueue-bundle job-queue test
1717
do
1818
TMP_DIR="/tmp/enqueue-repo"
1919
REMOTE_URL=`git remote get-url $REMOTE`

‎bin/subtree-split‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ remote enqueue git@github.com:php-enqueue/enqueue.git
4848
remote stomp git@github.com:php-enqueue/stomp.git
4949
remote amqp-ext git@github.com:php-enqueue/amqp-ext.git
5050
remote fs git@github.com:php-enqueue/fs.git
51+
remote redis git@github.com:php-enqueue/redis.git
5152
remote enqueue-bundle git@github.com:php-enqueue/enqueue-bundle.git
5253
remote job-queue git@github.com:php-enqueue/job-queue.git
5354
remote test git@github.com:php-enqueue/test.git
@@ -57,6 +58,7 @@ split 'pkg/enqueue' enqueue
5758
split 'pkg/stomp' stomp
5859
split 'pkg/amqp-ext' amqp-ext
5960
split 'pkg/fs' fs
61+
split 'pkg/redis' redis
6062
split 'pkg/enqueue-bundle' enqueue-bundle
6163
split 'pkg/job-queue' job-queue
6264
split 'pkg/test' test

‎bin/test‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ function waitForService()
2222

2323
waitForService rabbitmq 5672 50
2424
waitForService mysql 3306 50
25+
waitForService redis 6379 50
2526

2627
php pkg/job-queue/Tests/Functional/app/console doctrine:database:create
2728
php pkg/job-queue/Tests/Functional/app/console doctrine:schema:update --force

‎composer.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88
"enqueue/enqueue": "*@dev",
99
"enqueue/stomp": "*@dev",
1010
"enqueue/amqp-ext": "*@dev",
11+
"enqueue/redis": "*@dev",
1112
"enqueue/fs": "*@dev",
1213
"enqueue/dbal": "*@dev",
1314
"enqueue/enqueue-bundle": "*@dev",
1415
"enqueue/job-queue": "*@dev",
15-
"enqueue/test": "*@dev"
16-
},
17-
"require-dev": {
16+
"enqueue/test": "*@dev",
17+
1818
"phpunit/phpunit": "^5",
1919
"doctrine/doctrine-bundle": "~1.2",
20+
"predis/predis": "^1.1",
2021
"symfony/monolog-bundle": "^2.8|^3",
2122
"symfony/browser-kit": "^2.8|^3",
2223
"symfony/expression-language": "^2.8|^3",
@@ -47,6 +48,10 @@
4748
"type": "path",
4849
"url": "pkg/amqp-ext"
4950
},
51+
{
52+
"type": "path",
53+
"url": "pkg/redis"
54+
},
5055
{
5156
"type": "path",
5257
"url": "pkg/enqueue-bundle"

‎docker-compose.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ services:
66
depends_on:
77
- rabbitmq
88
- mysql
9+
- redis
910
volumes:
10-
- ./:/mqdev
11+
- './:/mqdev'
1112
environment:
1213
- SYMFONY__RABBITMQ__HOST=rabbitmq
1314
- SYMFONY__RABBITMQ__USER=guest
@@ -21,6 +22,8 @@ services:
2122
- SYMFONY__DB__NAME=mqdev
2223
- SYMFONY__DB__USER=root
2324
- SYMFONY__DB__PASSWORD=rootpass
25+
- SYMFONY__REDIS__HOST=redis
26+
- SYMFONY__REDIS__PORT=6379
2427

2528
rabbitmq:
2629
image: enqueue/rabbitmq:latest
@@ -29,6 +32,11 @@ services:
2932
- RABBITMQ_DEFAULT_USER=guest
3033
- RABBITMQ_DEFAULT_PASS=guest
3134
- RABBITMQ_DEFAULT_VHOST=mqdev
35+
redis:
36+
image: 'redis:3'
37+
ports:
38+
- "6379:6379"
39+
3240
mysql:
3341
image: mariadb:10
3442
volumes:

‎docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM ubuntu:16.04
44
RUN set -x && \
55
apt-get update && \
66
apt-get install -y --no-install-recommends wget curl openssl ca-certificates nano netcat && \
7-
apt-get install -y --no-install-recommends php php-mysql php-curl php-intl php-mbstring php-zip php-mcrypt php-xdebug php-bcmath php-xml php-amqp
7+
apt-get install -y --no-install-recommends php php-mysql php-redis php-curl php-intl php-mbstring php-zip php-mcrypt php-xdebug php-bcmath php-xml php-amqp
88

99
## confis
1010

‎docs/filesystem_transport.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
Use files on local filesystem as queues.
44
It creates a file per queue\topic.
55
A message is a line inside the file.
6-
**Limitations** It works only in auto ack mode. Local by nature therefor messages are not visible on other servers.
6+
**Limitations** It works only in auto ack mode hence If consumer crashes the message is lost. Local by nature therefor messages are not visible on other servers.
77

88
* [Installation](#installation)
99
* [Create context](#create-context)
10-
* [Declare topic](#declare-topic)
11-
* [Declare queue](#decalre-queue)
12-
* [Bind queue to topic](#bind-queue-to-topic)
1310
* [Send message to topic](#send-message-to-topic)
1411
* [Send message to queue](#send-message-to-queue)
1512
* [Consume message](#consume-message)

‎docs/index.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
* [Quick tour](quick_tour.md)
44
* Transports
5-
- [Amqp](amqp_transport.md)
6-
- [Stomp](stomp_transport.md)
5+
- [Amqp (RabbitMQ, ActiveMQ)](amqp_transport.md)
6+
- [Stomp (RabbitMQ, ActiveMQ)](stomp_transport.md)
7+
- [Redis](redis_transport.md)
78
- [Filesystem](filesystem_transport.md)
89
- [Null](null_transport.md)
910
* Consumption

0 commit comments

Comments
 (0)