Merge branch 'master' into php74

Author: snapshotpl

.travis.yml

@@ -8,45 +8,51 @@ matrix:
   include:
     - php: 7.1
       sudo: false
-      env: SYMFONY_VERSION=3.4.* PHPSTAN=true
+      env: SYMFONY_VERSION=4.3.* PHPSTAN=true
     - php: 7.1
       sudo: false
-      env: SYMFONY_VERSION=3.4.* PHP_CS_FIXER=true
+      env: SYMFONY_VERSION=4.3.* PHP_CS_FIXER=true
     - php: 7.1
       sudo: false
-      env: SYMFONY_VERSION=3.4.* UNIT_TESTS=true
-    - php: 7.1
+      env: SYMFONY_VERSION=4.3.* UNIT_TESTS=true
+    - php: 7.2
       sudo: false
-      env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=4.3.* UNIT_TESTS=true
     - php: 7.2
       sudo: false
-      env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=5.0.* UNIT_TESTS=true
     - php: 7.3
       sudo: false
-      env: SYMFONY_VERSION=4.1.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=4.3.* UNIT_TESTS=true
     - php: 7.3
       sudo: false
-      env: SYMFONY_VERSION=4.2.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=4.4.* UNIT_TESTS=true
+    - php: 7.3
+      sudo: false
+      env: SYMFONY_VERSION=5.0.* UNIT_TESTS=true
+    - php: 7.4
+      sudo: false
+      env: SYMFONY_VERSION=4.3.* UNIT_TESTS=true
     - php: 7.4
       sudo: false
-      env: SYMFONY_VERSION=4.1.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=4.4.* UNIT_TESTS=true
     - php: 7.4
       sudo: false
-      env: SYMFONY_VERSION=4.2.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=5.0.* UNIT_TESTS=true
     - php: 7.1
-      services: docker
       sudo: required
-      env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
-    - php: 7.1
+      services: docker
+      env: SYMFONY_VERSION=4.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
+    - php: 7.3
       sudo: required
       services: docker
-      env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
+      env: SYMFONY_VERSION=5.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
     - php: 7.1
       sudo: required
       services: docker
-      env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
+      env: SYMFONY_VERSION=4.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
   allow_failures:
-    - env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
+    - env: SYMFONY_VERSION=4.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
 
 cache:
     directories:

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [0.10.0](https://github.com/php-enqueue/enqueue-dev/tree/0.10.0) (2019-12-19)
+[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.9.15...0.10.0)
+
+**Merged pull requests:**
+
+- Symfony 5 [\#997](https://github.com/php-enqueue/enqueue-dev/pull/997) ([kuraobi](https://github.com/kuraobi))
+- Replace the Magento 1 code into the Magento 2 documentation [\#999](https://github.com/php-enqueue/enqueue-dev/pull/999) ([hochgenug](https://github.com/hochgenug))
+- Wrong parameter description [\#994](https://github.com/php-enqueue/enqueue-dev/pull/994) ([bramstroker](https://github.com/bramstroker))
+
 ## [0.9.15](https://github.com/php-enqueue/enqueue-dev/tree/0.9.15) (2019-11-28)
 [Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.9.14...0.9.15)
 

composer.json

@@ -13,7 +13,7 @@
 
     "ext-amqp": "^1.9.3",
     "ext-gearman": "^2.0",
-    "ext-mongodb": "^1.3",
+    "ext-mongodb": "^1.5",
     "ext-rdkafka": "^3.0.3",
 
     "queue-interop/amqp-interop": "^0.8",
@@ -35,14 +35,14 @@
     "php-http/client-common": "^1.7@dev",
     "richardfullmer/rabbitmq-management-api": "^2.0",
     "predis/predis": "^1.1",
+    "thruway/client": "^0.5.0",
     "thruway/pawl-transport": "^0.5.0",
-    "voryx/thruway": "^0.5.3",
     "influxdb/influxdb-php": "^1.14",
     "datadog/php-datadogstatsd": "^1.3"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.5",
-    "phpstan/phpstan": "^0.10",
+    "phpunit/phpunit": "^7.5",
+    "phpstan/phpstan": "^0.12",
     "queue-interop/queue-spec": "^0.6",
     "symfony/browser-kit": "^3.4|^4",
     "symfony/config": "^3.4|^4",
@@ -54,9 +54,10 @@
     "symfony/http-kernel": "^3.4|^4",
     "symfony/filesystem": "^3.4|^4",
     "symfony/framework-bundle": "^3.4|^4",
+    "symfony/yaml": "^4.3|^5",
     "empi89/php-amqp-stubs": "*@dev",
-    "doctrine/doctrine-bundle": "~1.2",
-    "doctrine/mongodb-odm-bundle": "^3.5",
+    "doctrine/doctrine-bundle": "~1.2|^2",
+    "doctrine/mongodb-odm-bundle": "^3.5|^4",
     "alcaeus/mongo-php-adapter": "^1.0",
     "kwn/php-rdkafka-stubs": "^1.0.2",
     "friendsofphp/php-cs-fixer": "^2"
@@ -112,7 +113,7 @@
       "ext-amqp": "1.9.3",
       "ext-gearman": "2.0.3",
       "ext-rdkafka": "3.3",
-      "ext-mongodb": "1.3",
+      "ext-mongodb": "1.5",
       "ext-bcmath": "1",
       "ext-mbstring": "1",
       "ext-mongo": "1.6.14"

docker-compose.yml

@@ -117,15 +117,9 @@ services:
         - "27017:27017"
 
   thruway:
-    image: formapro/nginx-php-fpm:latest-all-exts
+    build: './docker/thruway'
     ports:
       - '9090:9090'
-    working_dir: '/app'
-    volumes:
-      - './:/app'
-    entrypoint:
-        - '/usr/bin/php'
-        - 'docker/thruway/WsRouter.php'
 
   localstack:
     image: 'localstack/localstack:latest'

docker/thruway/Dockerfile

@@ -0,0 +1,13 @@
+FROM formapro/nginx-php-fpm:latest-all-exts
+
+RUN mkdir -p /thruway
+WORKDIR /thruway
+
+# Thruway router
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+RUN COMPOSER_HOME=/thruway composer global require --prefer-dist --no-scripts voryx/thruway
+
+COPY WsRouter.php .
+
+CMD ["/usr/bin/php", "WsRouter.php"]
+

docker/thruway/WsRouter.php

@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__.'/../../vendor/autoload.php';
+require __DIR__.'/vendor/autoload.php';
 
 use Thruway\Peer\Router;
 use Thruway\Transport\RatchetTransportProvider;

docs/bundle/cli_commands.md

@@ -64,7 +64,7 @@ Arguments:
   message                  A message
 
 Options:
-  -c, --client[=CLIENT]    The client to consume messages from. [default: "default"]
+  -c, --client[=CLIENT]    The client to send messages to. [default: "default"]
       --topic[=TOPIC]      The topic to send a message to
       --command[=COMMAND]  The command to send a message to
   -h, --help               Display this help message

docs/magento2/quick_tour.md

@@ -61,13 +61,13 @@ To consume messages you have to define a processor class first:
 
 namespace Acme\Module\Helper\Async;
 
-use Interop\Queue\Context;
-use Interop\Queue\Message;
-use Interop\Queue\Processor;
+use Interop\Queue\PsrContext;
+use Interop\Queue\PsrMessage;
+use Interop\Queue\PsrProcessor;
 
 class Foo implements Processor
 {
-    public function process(Message $message, Context $context)
+    public function process(PsrMessage $message, PsrContext $context)
     {
         // do job
         // $message->getBody() -> 'payload'
@@ -83,15 +83,15 @@ than subscribe it to a topic or several topics:
 
 
 ```xml
-<!-- app/etc/local.xml -->
+<!-- app/code/Acme/Module/etc/config.xml -->
 
 <config>
   <default>
     <enqueue>
       <processors>
         <foo-processor>
           <topic>a_topic</topic>
-          <helper>acme/async_foo</helper>
+          <helper>Acme\Module\Helper\Async\foo</helper>
         </foo-processor>
       </processors>
     </enqueue>

docs/monitoring.md

@@ -294,7 +294,7 @@ There are available options (and all available metrics):
 Install additional packages:
 
 ```
-composer req thruway/pawl-transport:^0.5.0 voryx/thruway:^0.5.3
+composer req thruway/pawl-transport:^0.5.0 thruway/client:^0.5.0
 ```
 
 ```php

docs/transport/wamp.md

@@ -10,7 +10,7 @@ nav_order: 3
 
 A transport for [Web Application Messaging Protocol](https://wamp-proto.org/).
 WAMP is an open standard WebSocket subprotocol.
-It uses internally Thruway PHP library [voryx/thruway](https://github.com/voryx/Thruway)
+It uses internally Thruway PHP library [thruway/client](https://github.com/thruway/client)
 
 * [Installation](#installation)
 * [Start the WAMP router](#start-the-wamp-router)
@@ -27,7 +27,10 @@ $ composer require enqueue/wamp
 
 ## Start the WAMP router
 
+You can get a WAMP router with [Thruway](https://github.com/voryx/Thruway):
+
 ```bash
+$ composer require voryx/thruway
 $ php vendor/voryx/thruway/Examples/SimpleWsRouter.php
 ```