Skip to content

Commit c5605e3

Browse files
nivpensonivpenso
committed
Merge branch 'master' into fix-1
2 parents 95959bd + a21d213 commit c5605e3

27 files changed

+317
-151
lines changed

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ bin/jp.php
99
bin/php-parse
1010
bin/google-cloud-batch
1111
bin/thruway
12+
bin/phpstan.phar
13+
bin/var-dump-server
14+
bin/yaml-lint
1215
vendor
1316
var
1417
.php_cs
1518
.php_cs.cache
16-
composer.lock
19+
composer.lock

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ install:
6868
- echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
6969
- php ./bin/fix-symfony-version.php "$SYMFONY_VERSION"
7070
- composer install
71+
- sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
7172
- if [ "$PREPARE_CONTAINER" = true ]; then docker --version; fi
7273
- if [ "$PREPARE_CONTAINER" = true ]; then docker-compose --version; fi
7374
- if [ "$PREPARE_CONTAINER" = true ]; then bin/dev -b; fi
@@ -78,7 +79,7 @@ script:
7879
- 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
7980
- if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi
8081
- if [ "$FUNCTIONAL_TESTS" = true ]; then bin/test.sh --exclude-group=rdkafka; fi
81-
- if [ "RDKAFKA_TESTS" = true ]; then bin/test.sh --group=rdkafka; fi
82+
- if [ "$RDKAFKA_TESTS" = true ]; then bin/test.sh --group=rdkafka; fi
8283

8384
notifications:
8485
webhooks:

‎CHANGELOG.md

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

3+
## [0.10.4](https://github.com/php-enqueue/enqueue-dev/tree/0.10.4) (2020-09-24)
4+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.3...0.10.4)
5+
6+
**Merged pull requests:**
7+
8+
- \[stomp\] Add first pass for Apache ActiveMQ Artemis support [\#1091](https://github.com/php-enqueue/enqueue-dev/pull/1091) ([atrauzzi](https://github.com/atrauzzi))
9+
- \[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))
10+
- \[async-command\] Fix service definition to apply the timeout [\#1084](https://github.com/php-enqueue/enqueue-dev/pull/1084) ([jcrombez](https://github.com/jcrombez))
11+
- \[mongodb\] fix\(MongoDB\) Redelivery not working \(fixes \#1077\) [\#1078](https://github.com/php-enqueue/enqueue-dev/pull/1078) ([josefsabl](https://github.com/josefsabl))
12+
- 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))
13+
- Docs: update Supported Brokers [\#1074](https://github.com/php-enqueue/enqueue-dev/pull/1074) ([Nebual](https://github.com/Nebual))
14+
- \[rdkafka\] Compatibility with Phprdkafka 4.0 [\#959](https://github.com/php-enqueue/enqueue-dev/pull/959) ([Steveb-p](https://github.com/Steveb-p))
15+
16+
## [0.10.3](https://github.com/php-enqueue/enqueue-dev/tree/0.10.3) (2020-07-31)
17+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.2...0.10.3)
18+
19+
**Merged pull requests:**
20+
21+
- Allow to install ramsey/uuid:^4 [\#1075](https://github.com/php-enqueue/enqueue-dev/pull/1075) ([snapshotpl](https://github.com/snapshotpl))
22+
- chore: add typehint to RdKafkaConsumer\#getQueue [\#1071](https://github.com/php-enqueue/enqueue-dev/pull/1071) ([qkdreyer](https://github.com/qkdreyer))
23+
- Fixes typo on client messages exemples doc [\#1065](https://github.com/php-enqueue/enqueue-dev/pull/1065) ([brunousml](https://github.com/brunousml))
24+
- Fix contact us link [\#1058](https://github.com/php-enqueue/enqueue-dev/pull/1058) ([andrew-demb](https://github.com/andrew-demb))
25+
- Fix typos [\#1049](https://github.com/php-enqueue/enqueue-dev/pull/1049) ([pgrimaud](https://github.com/pgrimaud))
26+
- Added support for ramsey/uuid 4.0 [\#1043](https://github.com/php-enqueue/enqueue-dev/pull/1043) ([a-menshchikov](https://github.com/a-menshchikov))
27+
- Changed: cast redelivery\_delay to int [\#1034](https://github.com/php-enqueue/enqueue-dev/pull/1034) ([balabis](https://github.com/balabis))
28+
- Add php 7.4 to test matrix [\#991](https://github.com/php-enqueue/enqueue-dev/pull/991) ([snapshotpl](https://github.com/snapshotpl))
29+
330
## [0.10.2](https://github.com/php-enqueue/enqueue-dev/tree/0.10.2) (2020-03-20)
431
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.1...0.10.2)
532

‎composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"queue-interop/queue-interop": "^0.7|^0.8",
2121
"bunny/bunny": "^0.2.4|^0.3|^0.4",
2222
"php-amqplib/php-amqplib": "^2.7",
23-
"doctrine/dbal": "^2.6",
23+
"doctrine/dbal": "^2.6,<2.10",
2424
"ramsey/uuid": "^2|^3.5|^4.0",
2525
"psr/log": "^1",
2626
"psr/container": "^1",
@@ -59,9 +59,12 @@
5959
"doctrine/doctrine-bundle": "~1.2|^2",
6060
"doctrine/mongodb-odm-bundle": "^3.5|^4",
6161
"alcaeus/mongo-php-adapter": "^1.0",
62-
"kwn/php-rdkafka-stubs": "^1.0.2",
62+
"kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0",
6363
"friendsofphp/php-cs-fixer": "^2"
6464
},
65+
"conflict": {
66+
"doctrine/persistence": ">=1.3.0"
67+
},
6568
"autoload": {
6669
"psr-4": {
6770
"Enqueue\\AmqpBunny\\": "pkg/amqp-bunny/",

‎docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ services:
9999
- '2181:2181'
100100

101101
kafka:
102-
image: 'wurstmeister/kafka:0.10.2.1'
102+
image: 'wurstmeister/kafka'
103103
ports:
104104
- '9092:9092'
105105
environment:
106106
KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
107-
volumes:
108-
- '/var/run/docker.sock:/var/run/docker.sock'
107+
KAFKA_ADVERTISED_HOST_NAME: kafka
108+
KAFKA_ADVERTISED_PORT: 9092
109109

110110
google-pubsub:
111111
image: 'google/cloud-sdk:latest'
@@ -122,7 +122,7 @@ services:
122122
- '9090:9090'
123123

124124
localstack:
125-
image: 'localstack/localstack:latest'
125+
image: 'localstack/localstack:0.8.10'
126126
ports:
127127
- '4576:4576'
128128
- '4575:4575'

‎docker/Dockerfile

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1-
FROM formapro/nginx-php-fpm:latest-all-exts
1+
FROM formapro/nginx-php-fpm:7.3-latest-all-exts
22

33
## libs
44
RUN set -x && \
55
apt-get update && \
6-
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
7-
8-
RUN set -x && \
9-
apt-get update && \
10-
apt-get install -y --no-install-recommends --no-install-suggests php-dev librabbitmq-dev make && \
11-
mkdir -p $HOME/php-amqp && \
12-
cd $HOME/php-amqp && \
13-
git clone https://github.com/pdezwart/php-amqp.git . && git checkout v1.9.3 && \
14-
phpize --clean && phpize && ./configure && make install
6+
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
157

168
## librdkafka
179
RUN set -x && \
1810
apt-get update && \
19-
apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php-dev && \
11+
apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php7.3-dev make && \
2012
mkdir -p $HOME/librdkafka && \
2113
cd $HOME/librdkafka && \
2214
git clone https://github.com/edenhill/librdkafka.git . && \
23-
git checkout v0.11.1 && \
15+
git checkout v1.0.0 && \
2416
./configure && make && make install && \
2517
pecl install rdkafka && \
26-
echo "extension=rdkafka.so" > /etc/php/7.2/cli/conf.d/10-rdkafka.ini && \
27-
echo "extension=rdkafka.so" > /etc/php/7.2/fpm/conf.d/10-rdkafka.ini
18+
echo "extension=rdkafka.so" > /etc/php/7.3/cli/conf.d/10-rdkafka.ini && \
19+
echo "extension=rdkafka.so" > /etc/php/7.3/fpm/conf.d/10-rdkafka.ini
2820

29-
COPY ./php/cli.ini /etc/php/7.2/cli/conf.d/1-dev_cli.ini
21+
COPY ./php/cli.ini /etc/php/7.3/cli/conf.d/1-dev_cli.ini
3022
COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh
3123
RUN chmod u+x /usr/local/bin/entrypoint.sh
3224

‎pkg/dbal/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"enqueue/null": "0.10.x-dev",
1818
"queue-interop/queue-spec": "^0.6"
1919
},
20+
"conflict": {
21+
"doctrine/persistence": ">=1.3.0"
22+
},
2023
"support": {
2124
"email": "opensource@forma-pro.com",
2225
"issues": "https://github.com/php-enqueue/enqueue-dev/issues",

‎pkg/enqueue/Tests/Client/Driver/RabbitMqStompDriverTest.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Enqueue\Client\MessagePriority;
1313
use Enqueue\Client\Route;
1414
use Enqueue\Client\RouteCollection;
15+
use Enqueue\Stomp\ExtensionType;
1516
use Enqueue\Stomp\StompContext;
1617
use Enqueue\Stomp\StompDestination;
1718
use Enqueue\Stomp\StompMessage;
@@ -47,7 +48,7 @@ public function testShouldBeSubClassOfStompDriver()
4748

4849
public function testShouldCreateAndReturnStompQueueInstance()
4950
{
50-
$expectedQueue = new StompDestination();
51+
$expectedQueue = new StompDestination(ExtensionType::RABBITMQ);
5152

5253
$context = $this->createContextMock();
5354
$context
@@ -185,10 +186,10 @@ public function testShouldInitDeliveryDelayIfDelayPropertyOnSendToProcessor()
185186

186187
public function shouldSendMessageToDelayExchangeIfDelaySet()
187188
{
188-
$queue = new StompDestination();
189+
$queue = new StompDestination(ExtensionType::RABBITMQ);
189190
$queue->setStompName('queueName');
190191

191-
$delayTopic = new StompDestination();
192+
$delayTopic = new StompDestination(ExtensionType::RABBITMQ);
192193
$delayTopic->setStompName('delayTopic');
193194

194195
$transportMessage = new StompMessage();
@@ -339,7 +340,7 @@ public function testShouldSetupBroker()
339340
->expects($this->any())
340341
->method('createQueue')
341342
->willReturnCallback(function (string $name) {
342-
$destination = new StompDestination();
343+
$destination = new StompDestination(ExtensionType::RABBITMQ);
343344
$destination->setType(StompDestination::TYPE_QUEUE);
344345
$destination->setStompName($name);
345346

@@ -431,7 +432,7 @@ public function testSetupBrokerShouldCreateDelayExchangeIfEnabled()
431432
->expects($this->any())
432433
->method('createQueue')
433434
->willReturnCallback(function (string $name) {
434-
$destination = new StompDestination();
435+
$destination = new StompDestination(ExtensionType::RABBITMQ);
435436
$destination->setType(StompDestination::TYPE_QUEUE);
436437
$destination->setStompName($name);
437438

@@ -442,7 +443,7 @@ public function testSetupBrokerShouldCreateDelayExchangeIfEnabled()
442443
->expects($this->any())
443444
->method('createTopic')
444445
->willReturnCallback(function (string $name) {
445-
$destination = new StompDestination();
446+
$destination = new StompDestination(ExtensionType::RABBITMQ);
446447
$destination->setType(StompDestination::TYPE_TOPIC);
447448
$destination->setStompName($name);
448449

@@ -503,7 +504,7 @@ protected function createProducerMock(): InteropProducer
503504
*/
504505
protected function createQueue(string $name): InteropQueue
505506
{
506-
$destination = new StompDestination();
507+
$destination = new StompDestination(ExtensionType::RABBITMQ);
507508
$destination->setType(StompDestination::TYPE_QUEUE);
508509
$destination->setStompName($name);
509510

@@ -515,7 +516,7 @@ protected function createQueue(string $name): InteropQueue
515516
*/
516517
protected function createTopic(string $name): InteropTopic
517518
{
518-
$destination = new StompDestination();
519+
$destination = new StompDestination(ExtensionType::RABBITMQ);
519520
$destination->setType(StompDestination::TYPE_TOPIC);
520521
$destination->setStompName($name);
521522

‎pkg/enqueue/Tests/Client/Driver/StompDriverTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Enqueue\Client\Message;
1010
use Enqueue\Client\MessagePriority;
1111
use Enqueue\Client\RouteCollection;
12+
use Enqueue\Stomp\ExtensionType;
1213
use Enqueue\Stomp\StompContext;
1314
use Enqueue\Stomp\StompDestination;
1415
use Enqueue\Stomp\StompMessage;
@@ -127,7 +128,7 @@ protected function createProducerMock(): InteropProducer
127128
*/
128129
protected function createQueue(string $name): InteropQueue
129130
{
130-
$destination = new StompDestination();
131+
$destination = new StompDestination(ExtensionType::RABBITMQ);
131132
$destination->setType(StompDestination::TYPE_QUEUE);
132133
$destination->setStompName($name);
133134

@@ -139,7 +140,7 @@ protected function createQueue(string $name): InteropQueue
139140
*/
140141
protected function createTopic(string $name): InteropTopic
141142
{
142-
$destination = new StompDestination();
143+
$destination = new StompDestination(ExtensionType::RABBITMQ);
143144
$destination->setType(StompDestination::TYPE_TOPIC);
144145
$destination->setStompName($name);
145146

‎pkg/job-queue/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"enqueue/enqueue": "^0.10",
1111
"enqueue/null": "^0.10",
1212
"queue-interop/queue-interop": "^0.8",
13-
"doctrine/orm": "~2.4"
13+
"doctrine/orm": "~2.4",
14+
"doctrine/dbal": "<2.10"
1415
},
1516
"require-dev": {
1617
"phpunit/phpunit": "~7.5",

‎pkg/rdkafka/RdKafkaConnectionFactory.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class RdKafkaConnectionFactory implements ConnectionFactory
2828
* 'partitioner' => null, // https://arnaud-lb.github.io/php-rdkafka/phpdoc/rdkafka-topicconf.setpartitioner.html
2929
* 'log_level' => null,
3030
* 'commit_async' => false,
31+
* 'shutdown_timeout' => -1, // https://github.com/arnaud-lb/php-rdkafka#proper-shutdown
3132
* ]
3233
*
3334
* or
@@ -38,6 +39,10 @@ class RdKafkaConnectionFactory implements ConnectionFactory
3839
*/
3940
public function __construct($config = 'kafka:')
4041
{
42+
if (version_compare(RdKafkaContext::getLibrdKafkaVersion(), '1.0.0', '<')) {
43+
throw new \RuntimeException('You must install librdkafka:1.0.0 or higher');
44+
}
45+
4146
if (empty($config) || 'kafka:' === $config) {
4247
$config = [];
4348
} elseif (is_string($config)) {

0 commit comments

Comments
 (0)