Merge branch 'master' into pr-250

Author: makasim

.travis.yml

@@ -20,6 +20,10 @@ matrix:
     - php: 7.0
       env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
     - php: 7.1
+      env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
+    - php: 7.1
+      env: SYMFONY_VERSION=3.4.* UNIT_TESTS=true
+    - php: 7.2
       services: docker
       env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
     - php: 7.1
@@ -31,6 +35,9 @@ matrix:
     - php: 7.1
       services: docker
       env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
+    - php: 7.1
+      services: docker
+      env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
     - php: 7.1
       services: docker
       env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true

CHANGELOG.md

@@ -1,15 +1,17 @@
-# Message Queue. Development Repository
+**Enqueue** is production ready, battle-tested messaging solution for PHP. Provides a common way for programs to create, send, read messages. 
+
+This is a main development repository. It provides a friendly environment for productive development and testing of all Enqueue related features&packages.
 
 [![Gitter](https://badges.gitter.im/php-enqueue/Lobby.svg)](https://gitter.im/php-enqueue/Lobby)
 [![Build Status](https://travis-ci.org/php-enqueue/enqueue-dev.png?branch=master)](https://travis-ci.org/php-enqueue/enqueue-dev)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
 
-This is where all development happens. The repository provides a friendly environment for productive development and testing of all enqueue related packages.
-
 Features:
 
 * [Feature rich](docs/quick_tour.md).
-* Implements [JMS](https://docs.oracle.com/javaee/7/api/javax/jms/package-summary.html) like transports based on [queue-interop](https://github.com/queue-interop/queue-interop) interfaces.
+
+* Adopts [queue interoperable](https://github.com/queue-interop/queue-interop) interfaces (inspired by [Java JMS](https://docs.oracle.com/javaee/7/api/javax/jms/package-summary.html)).
+* Battle-tested. Used in production.
 * Supported  transports 
     * [AMQP(s)](docs/transport/amqp.md) based on [PHP AMQP extension](https://github.com/pdezwart/php-amqp). 
 [![Build Status](https://travis-ci.org/php-enqueue/amqp-ext.png?branch=master)](https://travis-ci.org/php-enqueue/amqp-ext)
@@ -63,21 +65,24 @@ Features:
 [![Build Status](https://travis-ci.org/php-enqueue/null.png?branch=master)](https://travis-ci.org/php-enqueue/null)
 [![Total Downloads](https://poser.pugx.org/enqueue/null/d/total.png)](https://packagist.org/packages/enqueue/null)
 [![Latest Stable Version](https://poser.pugx.org/enqueue/null/version.png)](https://packagist.org/packages/enqueue/null)
-* [Symfony bundle](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/bundle/quick_tour.md)
-* [Magento1 extension](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/magento/quick_tour.md)
-* [Laravel extension](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/laravel/quick_tour.md)
-* [Message bus](http://www.enterpriseintegrationpatterns.com/patterns/messaging/MessageBus.html) support.
-* [RPC over MQ](https://www.rabbitmq.com/tutorials/tutorial-one-php.html) support.
+* [Symfony bundle](docs/bundle/quick_tour.md)
+* [Magento1 extension](docs/magento/quick_tour.md)
+* [Magento2 module](docs/magento2/quick_tour.md)
+* [Laravel extension](docs/laravel/quick_tour.md)
+* [Yii2. Amqp driver](docs/yii/amqp_driver.md)
+* [Message bus](docs/quick_tour.md#client) support.
+* [RPC over MQ](docs/quick_tour.md#remote-procedure-call-rpc) support.
 * Temporary queues support.
-* Well designed components decoupled and reusable.
-* Carefully tested including unit and functional tests.
+* Well designed, decoupled and reusable components.
+* Carefully tested (unit & functional).
 * For more visit [quick tour](docs/quick_tour.md).
 
 ## Resources
 
-* [Quick tour](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/quick_tour.md)
-* [Documentation](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md)
-* [Blog](https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md#blogs)
+* [Site](https://enqueue.forma-pro.com/)
+* [Quick tour](docs/quick_tour.md)
+* [Documentation](docs/index.md)
+* [Blog](docs/index.md#blogs)
 * [Questions](https://gitter.im/php-enqueue/Lobby)
 * [Issue Tracker](https://github.com/php-enqueue/enqueue-dev/issues)
 

README.md

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+
+(cd docker && docker build --rm --force-rm --no-cache --pull --squash --tag "enqueue/dev:latest" -f Dockerfile .)
+(cd docker && docker login --username="$DOCKER_USER" --password="$DOCKER_PASSWORD")
+(cd docker && docker push "enqueue/dev:latest")

bin/build-enqueue-dev-image.sh

@@ -6,13 +6,13 @@ set -e
 while getopts "bustefcdp" OPTION; do
   case $OPTION in
     b)
-      COMPOSE_PROJECT_NAME=mqdev docker-compose pull && COMPOSE_PROJECT_NAME=mqdev docker-compose build
+      docker-compose pull && docker-compose build
       ;;
     u)
-      COMPOSE_PROJECT_NAME=mqdev docker-compose up
+      docker-compose up
       ;;
     s)
-      COMPOSE_PROJECT_NAME=mqdev docker-compose stop
+      docker-compose stop
       ;;
     e)
       docker exec -it mqdev_dev_1 /bin/bash
@@ -24,10 +24,10 @@ while getopts "bustefcdp" OPTION; do
       ./bin/run-fun-test.sh "$2"
       ;;
     c)
-      COMPOSE_PROJECT_NAME=mqdev docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$2" --simple-list
+      docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$2" --simple-list
       ;;
 
-    d) COMPOSE_PROJECT_NAME=mqdev docker-compose run --workdir="/mqdev" --rm dev php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue -vvv
+    d) docker-compose run --workdir="/mqdev" --rm dev php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue -vvv
       ;;
     \?)
       echo "Invalid option: -$OPTARG" >&2

bin/dev

@@ -1,7 +1,8 @@
 {
   "name": "enqueue/enqueue-dev",
   "type": "project",
-  "minimum-stability": "stable",
+  "minimum-stability": "beta",
+  "homepage": "https://enqueue.forma-pro.com/",
   "require": {
     "php": ">=5.6",
     "enqueue/enqueue": "*@dev",
@@ -26,20 +27,21 @@
     "enqueue/simple-client": "*@dev",
     "enqueue/test": "*@dev",
     "enqueue/async-event-dispatcher": "*@dev",
-    "queue-interop/queue-interop": "^0.6@dev",
+    "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1",
     "queue-interop/amqp-interop": "^0.7@dev",
-    "queue-interop/queue-spec": "^0.5.1@dev",
+    "queue-interop/queue-spec": "^0.5.4@dev",
 
     "phpunit/phpunit": "^5",
     "doctrine/doctrine-bundle": "~1.2",
     "predis/predis": "^1.1",
-    "symfony/monolog-bundle": "^2.8|^3",
-    "symfony/browser-kit": "^2.8|^3",
-    "symfony/expression-language": "^2.8|^3",
-    "symfony/event-dispatcher": "^2.8|^3",
-    "symfony/console": "^2.8|^3",
+    "symfony/monolog-bundle": "^2.8|^3|^4",
+    "symfony/browser-kit": "^2.8|^3|^4",
+    "symfony/expression-language": "^2.8|^3|^4",
+    "symfony/event-dispatcher": "^2.8|^3|^4",
+    "symfony/console": "^2.8|^3|^4",
     "friendsofphp/php-cs-fixer": "^2",
-    "empi89/php-amqp-stubs": "*@dev"
+    "empi89/php-amqp-stubs": "*@dev",
+    "php-http/client-common": "^1.7@dev"
   },
   "autoload": {
     "files": [
@@ -56,7 +58,7 @@
   "config": {
     "bin-dir": "bin",
     "platform": {
-      "ext-amqp": "1.7",
+      "ext-amqp": "1.9.3",
       "ext-gearman": "1.1",
       "ext-rdkafka": "3.3"
     }

composer.json

@@ -3,7 +3,6 @@ version: '2'
 services:
   dev:
     image: enqueue/dev:latest
-    # build: { context: docker, dockerfile: Dockerfile }
     depends_on:
       - rabbitmq
       - mysql
@@ -20,23 +19,23 @@ services:
       - AMQP_DSN=amqp://guest:guest@rabbitmq:5672/mqdev
       - AMQPS_DSN=amqps://guest:guest@rabbitmqssl:5671
       - DOCTINE_DSN=mysql://root:rootpass@mysql/mqdev
-      - SYMFONY__RABBITMQ__HOST=rabbitmq
-      - SYMFONY__RABBITMQ__USER=guest
-      - SYMFONY__RABBITMQ__PASSWORD=guest
-      - SYMFONY__RABBITMQ__VHOST=mqdev
-      - SYMFONY__RABBITMQ__AMQP__PORT=5672
-      - SYMFONY__RABBITMQ__STOMP__PORT=61613
-      - SYMFONY__DB__DRIVER=pdo_mysql
-      - SYMFONY__DB__HOST=mysql
-      - SYMFONY__DB__PORT=3306
-      - SYMFONY__DB__NAME=mqdev
-      - SYMFONY__DB__USER=root
-      - SYMFONY__DB__PASSWORD=rootpass
-      - SYMFONY__REDIS__HOST=redis
-      - SYMFONY__REDIS__PORT=6379
-      - AWS__SQS__KEY=$ENQUEUE_AWS__SQS__KEY
-      - AWS__SQS__SECRET=$ENQUEUE_AWS__SQS__SECRET
-      - AWS__SQS__REGION=$ENQUEUE_AWS__SQS__REGION
+      - RABBITMQ_HOST=rabbitmq
+      - RABBITMQ_USER=guest
+      - RABBITMQ_PASSWORD=guest
+      - RABBITMQ_VHOST=mqdev
+      - RABBITMQ_AMQP__PORT=5672
+      - RABBITMQ_STOMP_PORT=61613
+      - DOCTRINE_DRIVER=pdo_mysql
+      - DOCTRINE_HOST=mysql
+      - DOCTRINE_PORT=3306
+      - DOCTRINE_DB_NAME=mqdev
+      - DOCTRINE_USER=root
+      - DOCTRINE_PASSWORD=rootpass
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - AWS_SQS_KEY=$ENQUEUE_AWS__SQS__KEY
+      - AWS_SQS_SECRET=$ENQUEUE_AWS__SQS__SECRET
+      - AWS_SQS_REGION=$ENQUEUE_AWS__SQS__REGION
       - BEANSTALKD_HOST=beanstalkd
       - BEANSTALKD_PORT=11300
       - BEANSTALKD_DSN=beanstalk://beanstalkd:11300
@@ -48,7 +47,6 @@ services:
 
   rabbitmq:
     image: 'enqueue/rabbitmq:latest'
-    # build: { context: docker, dockerfile: Dockerfile.rabbitmq }
     environment:
       - RABBITMQ_DEFAULT_USER=guest
       - RABBITMQ_DEFAULT_PASS=guest

docker-compose.yml

@@ -3,21 +3,34 @@ FROM formapro/nginx-php-fpm:latest-all-exts
 ## libs
 RUN set -x && \
     apt-get update && \
-    apt-get install -y wget curl openssl ca-certificates nano netcat php-dev php-redis git python
+    apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php-dev php-redis git python
+
+RUN set -x && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends --no-install-suggests php-dev librabbitmq-dev make  && \
+    mkdir -p $HOME/php-amqp && \
+    cd $HOME/php-amqp && \
+    git clone https://github.com/pdezwart/php-amqp.git . && git checkout v1.9.3 && \
+    phpize --clean && phpize && ./configure && make install
 
 ## confis
 
 # RUN rm -f /etc/php/7.0/cli/conf.d/*xdebug.ini
 
 ## librdkafka
-RUN git clone https://github.com/edenhill/librdkafka.git /root/librdkafka
-RUN cd /root/librdkafka && git checkout v0.11.0-RC2 && ./configure && make && make install
-RUN pecl install rdkafka
-RUN echo "extension=rdkafka.so" > /etc/php/7.1/cli/conf.d/10-rdkafka.ini
-RUN echo "extension=rdkafka.so" > /etc/php/7.1/fpm/conf.d/10-rdkafka.ini
+RUN set -x && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php-dev && \
+    mkdir -p $HOME/librdkafka && \
+    cd $HOME/librdkafka && \
+    git clone https://github.com/edenhill/librdkafka.git . && \
+    git checkout v0.11.1 && \
+    ./configure && make && make install && \
+    pecl install rdkafka && \
+    echo "extension=rdkafka.so" > /etc/php/7.1/cli/conf.d/10-rdkafka.ini && \
+    echo "extension=rdkafka.so" > /etc/php/7.1/fpm/conf.d/10-rdkafka.ini
 
 COPY ./php/cli.ini /etc/php/7.1/cli/conf.d/1-dev_cli.ini
-COPY ./php/amqp.so /usr/lib/php/20160303/amqp.so
 COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh
 RUN chmod u+x /usr/local/bin/entrypoint.sh
 

docker/Dockerfile

@@ -7,25 +7,24 @@ The consumer, once it receives the message, restores the event and dispatches it
 
 Async listeners benefits:
 
-* The response time lesser. It has to do less work.
-* Better fault tolerance. Bugs in async listener does not affect user. Messages will wait till you fix bugs.
+* Reduces response time. Work is deferred to consumer processes.
+* Better fault tolerance. Bugs in async listener do not affect user. Messages will wait till you fix bugs.
 * Better scaling. Add more consumers to meet the load.
 
-_**Note**: The php serializer transformer (the default one) does not work on Symfony prior 3.0. The event contains eventDispatcher and therefor could not be serialized. You have to register a transformer for every async event. Read the [event transformer](#event-transformer)._
+_**Note**: Prior to Symfony 3.0, events contain `eventDispatcher` and the default php serializer transformer is unable to serialize the object. A transformer should be registered for every async event. Read the [event transformer](#event-transformer)._
 
 ## Configuration
 
-I suppose you already [installed the bundle](quick_tour.md#install). 
-Now, you have to enable `async_events`. 
-If you do not enable it, events will be processed as before: synchronously.
+Symfony events are currently processed synchronously, enabling the async configuration for EnqueueBundle causes tagged listeners to defer action to a consumer asynchronously.
+If you already [installed the bundle](quick_tour.md#install), then enable `async_events`.
 
 ```yaml
 # app/config/config.yml
 
 enqueue:
    async_events:
       enabled: true
-      # if you'd like to send send messages onTerminate use spool_producer (it makes response time even lesser):
+      # if you'd like to send send messages onTerminate use spool_producer (it further reduces response time):
       # spool_producer: true
 ```
 
@@ -77,7 +76,7 @@ services:
 ## Event transformer
 
 The bundle uses [php serializer](https://github.com/php-enqueue/enqueue-dev/blob/master/pkg/enqueue-bundle/Events/PhpSerializerEventTransformer.php) transformer by default to pass events through MQ.
-You could create a transformer for the given event type. The transformer must implement `Enqueue\AsyncEventDispatcher\EventTransformer` interface.
+You can write a transformer for each event type by implementing the `Enqueue\AsyncEventDispatcher\EventTransformer` interface.
 Consider the next example. It shows how to send an event that contains Doctrine entity as a subject  
 
 ```php
@@ -165,4 +164,4 @@ services:
 The `eventName` attribute accepts a regexp. You can do next `eventName: '/foo\..*?/'`. 
 It uses this transformer for all event with the name beginning with `foo.`
 
-[back to index](../index.md)
+[back to index](../index.md)

docker/php/amqp.so

@@ -251,7 +251,7 @@ enqueue:
         app_name:             app
         router_topic:         default
         router_queue:         default
-        router_processor:     enqueue.client.router_processor
+        router_processor:     Enqueue\Client\RouterProcessor
         default_processor_queue: default
         redelivered_delay_time: 0
     consumption:

docs/bundle/async_events.md

@@ -1,6 +1,6 @@
 # Consumption extension
 
-Here, I show how you can crate a custom extension and register it.
+Here, I show how you can create a custom extension and register it.
 Let's first create an extension itself:
 
 ```php
@@ -38,4 +38,4 @@ services:
             - { name: 'enqueue.consumption.extension', priority: 10 }
 ```
 
-[back to index](../index.md)
+[back to index](../index.md)

docs/bundle/config_reference.md

@@ -63,9 +63,9 @@ Here's the result:
 
 ## Consume command verbosity 
 
-By default the commands `enqueu:conume` or `enqueue:transport:consume` does not output anything. 
+By default the commands `enqueue:consume` or `enqueue:transport:consume` does not output anything. 
 You can add `-vvv` to see more information.
 
 ![Consume command verbosity](../images/consume_command_verbosity.png)
 
-[back to index](../index.md)
+[back to index](../index.md)

docs/bundle/consumption_extension.md

@@ -72,7 +72,7 @@ class FooTest extends WebTestCase
      */
     private function getProducer()
     {
-        return $this->client->getContainer()->get('enqueue.producer');
+        return $this->client->getContainer()->get(TraceableProducer::class);
     }
 }
 ```