Merge remote-tracking branch 'upstream/master' into master

Author: balabis

.gitignore

@@ -9,8 +9,11 @@ bin/jp.php
 bin/php-parse
 bin/google-cloud-batch
 bin/thruway
+bin/phpstan.phar
+bin/var-dump-server
+bin/yaml-lint
 vendor
 var
 .php_cs
 .php_cs.cache
-composer.lock
+composer.lock

.travis.yml

@@ -68,6 +68,7 @@ install:
     - echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     - php ./bin/fix-symfony-version.php "$SYMFONY_VERSION"
     - composer install
+    - sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
     - if [ "$PREPARE_CONTAINER" = true ]; then docker --version; fi
     - if [ "$PREPARE_CONTAINER" = true ]; then docker-compose --version; fi
     - if [ "$PREPARE_CONTAINER" = true ]; then bin/dev -b; fi
@@ -78,7 +79,7 @@ script:
     - if [ "$PHPSTAN" = true ] && [ ! -z "${PKG_PHP_CHANGED_FILES}" ]; then docker run --workdir="/mqdev" -v "`pwd`:/mqdev" --rm enqueue/dev:latest php -d memory_limit=1024M bin/phpstan analyse -l 1 -c phpstan.neon -- ${PKG_PHP_CHANGED_FILES[@]} ; fi
     - if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi
     - if [ "$FUNCTIONAL_TESTS" = true ]; then bin/test.sh --exclude-group=rdkafka; fi
-    - if [ "RDKAFKA_TESTS" = true ]; then bin/test.sh --group=rdkafka; fi
+    - if [ "$RDKAFKA_TESTS" = true ]; then bin/test.sh --group=rdkafka; fi
 
 notifications:
   webhooks:

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Change Log
 
+## [0.10.4](https://github.com/php-enqueue/enqueue-dev/tree/0.10.4) (2020-09-24)
+[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.3...0.10.4)
+
+**Merged pull requests:**
+
+- \[stomp\] Add first pass for Apache ActiveMQ Artemis support [\#1091](https://github.com/php-enqueue/enqueue-dev/pull/1091) ([atrauzzi](https://github.com/atrauzzi))
+- \[amqp\]Solves binding Headers Exchange with Queue using custom arguments [\#1087](https://github.com/php-enqueue/enqueue-dev/pull/1087) ([dgafka](https://github.com/dgafka))
+- \[async-command\] Fix service definition to apply the timeout [\#1084](https://github.com/php-enqueue/enqueue-dev/pull/1084) ([jcrombez](https://github.com/jcrombez))
+- \[mongodb\] fix\(MongoDB\) Redelivery not working \(fixes \#1077\) [\#1078](https://github.com/php-enqueue/enqueue-dev/pull/1078) ([josefsabl](https://github.com/josefsabl))
+- Add php 7.3 and 7.4 travis env to every package [\#1076](https://github.com/php-enqueue/enqueue-dev/pull/1076) ([snapshotpl](https://github.com/snapshotpl))
+- Docs: update Supported Brokers [\#1074](https://github.com/php-enqueue/enqueue-dev/pull/1074) ([Nebual](https://github.com/Nebual))
+- \[rdkafka\] Compatibility with Phprdkafka 4.0 [\#959](https://github.com/php-enqueue/enqueue-dev/pull/959) ([Steveb-p](https://github.com/Steveb-p))
+
+## [0.10.3](https://github.com/php-enqueue/enqueue-dev/tree/0.10.3) (2020-07-31)
+[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.2...0.10.3)
+
+**Merged pull requests:**
+
+- Allow to install ramsey/uuid:^4 [\#1075](https://github.com/php-enqueue/enqueue-dev/pull/1075) ([snapshotpl](https://github.com/snapshotpl))
+- chore: add typehint to RdKafkaConsumer\#getQueue [\#1071](https://github.com/php-enqueue/enqueue-dev/pull/1071) ([qkdreyer](https://github.com/qkdreyer))
+- Fixes typo on client messages exemples doc [\#1065](https://github.com/php-enqueue/enqueue-dev/pull/1065) ([brunousml](https://github.com/brunousml))
+- Fix contact us link [\#1058](https://github.com/php-enqueue/enqueue-dev/pull/1058) ([andrew-demb](https://github.com/andrew-demb))
+- Fix typos [\#1049](https://github.com/php-enqueue/enqueue-dev/pull/1049) ([pgrimaud](https://github.com/pgrimaud))
+- Added support for ramsey/uuid 4.0 [\#1043](https://github.com/php-enqueue/enqueue-dev/pull/1043) ([a-menshchikov](https://github.com/a-menshchikov))
+- Changed: cast redelivery\_delay to int [\#1034](https://github.com/php-enqueue/enqueue-dev/pull/1034) ([balabis](https://github.com/balabis))
+- Add php 7.4 to test matrix [\#991](https://github.com/php-enqueue/enqueue-dev/pull/991) ([snapshotpl](https://github.com/snapshotpl))
+
 ## [0.10.2](https://github.com/php-enqueue/enqueue-dev/tree/0.10.2) (2020-03-20)
 [Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.1...0.10.2)
 

composer.json

@@ -20,7 +20,7 @@
     "queue-interop/queue-interop": "^0.7|^0.8",
     "bunny/bunny": "^0.2.4|^0.3|^0.4",
     "php-amqplib/php-amqplib": "^2.7",
-    "doctrine/dbal": "^2.6",
+    "doctrine/dbal": "^2.6,<2.10",
     "ramsey/uuid": "^2|^3.5|^4.0",
     "psr/log": "^1",
     "psr/container": "^1",
@@ -59,7 +59,7 @@
     "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",
+    "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0",
     "friendsofphp/php-cs-fixer": "^2"
   },
   "autoload": {
@@ -119,5 +119,8 @@
       "ext-mongo": "1.6.14"
     },
     "prefer-stable": true
+  },
+  "conflict": {
+    "doctrine/persistence": "<1.3.0"
   }
 }

docker-compose.yml

@@ -99,13 +99,13 @@ services:
       - '2181:2181'
 
   kafka:
-    image: 'wurstmeister/kafka:0.10.2.1'
+    image: 'wurstmeister/kafka'
     ports:
       - '9092:9092'
     environment:
       KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
-    volumes:
-      - '/var/run/docker.sock:/var/run/docker.sock'
+      KAFKA_ADVERTISED_HOST_NAME: kafka
+      KAFKA_ADVERTISED_PORT: 9092
 
   google-pubsub:
       image: 'google/cloud-sdk:latest'
@@ -122,7 +122,7 @@ services:
       - '9090:9090'
 
   localstack:
-    image: 'localstack/localstack:latest'
+    image: 'localstack/localstack:0.8.10'
     ports:
       - '4576:4576'
       - '4575:4575'

docker/Dockerfile

@@ -1,32 +1,24 @@
-FROM formapro/nginx-php-fpm:latest-all-exts
+FROM formapro/nginx-php-fpm:7.3-latest-all-exts
 
 ## libs
 RUN set -x && \
     apt-get update && \
-    apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php-dev php-redis php-pgsql 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
+    apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php7.3-dev php7.3-redis php7.3-pgsql git python php-amqp
 
 ## librdkafka
 RUN set -x && \
     apt-get update && \
-    apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php-dev && \
+    apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php7.3-dev make && \
     mkdir -p $HOME/librdkafka && \
     cd $HOME/librdkafka && \
     git clone https://github.com/edenhill/librdkafka.git . && \
-    git checkout v0.11.1 && \
+    git checkout v1.0.0 && \
     ./configure && make && make install && \
     pecl install rdkafka && \
-    echo "extension=rdkafka.so" > /etc/php/7.2/cli/conf.d/10-rdkafka.ini && \
-    echo "extension=rdkafka.so" > /etc/php/7.2/fpm/conf.d/10-rdkafka.ini
+    echo "extension=rdkafka.so" > /etc/php/7.3/cli/conf.d/10-rdkafka.ini && \
+    echo "extension=rdkafka.so" > /etc/php/7.3/fpm/conf.d/10-rdkafka.ini
 
-COPY ./php/cli.ini /etc/php/7.2/cli/conf.d/1-dev_cli.ini
+COPY ./php/cli.ini /etc/php/7.3/cli/conf.d/1-dev_cli.ini
 COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh
 RUN chmod u+x /usr/local/bin/entrypoint.sh
 

docs/transport/dbal.md

@@ -48,7 +48,7 @@ $context = $factory->createContext();
 ```php
 <?php
 use Enqueue\Dbal\ManagerRegistryConnectionFactory;
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 
 /** @var ManagerRegistry $registry */
 

pkg/dbal/ManagerRegistryConnectionFactory.php

@@ -4,8 +4,8 @@
 
 namespace Enqueue\Dbal;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Connection;
+use Doctrine\Persistence\ManagerRegistry;
 use Interop\Queue\ConnectionFactory;
 use Interop\Queue\Context;
 
@@ -28,9 +28,6 @@ class ManagerRegistryConnectionFactory implements ConnectionFactory
      *   'polling_interval' => 1000,    - How often query for new messages (milliseconds)
      *   'lazy' => true,                - Use lazy database connection (boolean)
      * ].
-     *
-     * @param ManagerRegistry $registry
-     * @param array           $config
      */
     public function __construct(ManagerRegistry $registry, array $config = [])
     {

pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php

@@ -2,8 +2,8 @@
 
 namespace Enqueue\Dbal\Tests;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Connection;
+use Doctrine\Persistence\ManagerRegistry;
 use Enqueue\Dbal\DbalContext;
 use Enqueue\Dbal\ManagerRegistryConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;

pkg/dbal/composer.json

@@ -17,6 +17,9 @@
         "enqueue/null": "0.10.x-dev",
         "queue-interop/queue-spec": "^0.6"
     },
+    "conflict": {
+        "doctrine/persistence": "<1.3.0"
+    },
     "support": {
         "email": "opensource@forma-pro.com",
         "issues": "https://github.com/php-enqueue/enqueue-dev/issues",