Skip to content

Commit c373bd2

Browse files
balabisbalabis
committed
Merge remote-tracking branch 'upstream/master' into master
2 parents 7cbc437 + 8ec9506 commit c373bd2

File tree

14 files changed

+36
-21
lines changed

14 files changed

+36
-21
lines changed

‎.travis.yml

+10
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ git:
22
depth: 10
33

44
language: php
5+
dist: bionic
56

67
matrix:
78
include:
@@ -29,6 +30,15 @@ matrix:
2930
- php: 7.3
3031
sudo: false
3132
env: SYMFONY_VERSION=5.0.* UNIT_TESTS=true
33+
- php: 7.4
34+
sudo: false
35+
env: SYMFONY_VERSION=4.3.* UNIT_TESTS=true
36+
- php: 7.4
37+
sudo: false
38+
env: SYMFONY_VERSION=4.4.* UNIT_TESTS=true
39+
- php: 7.4
40+
sudo: false
41+
env: SYMFONY_VERSION=5.0.* UNIT_TESTS=true
3242
- php: 7.1
3343
sudo: required
3444
services: docker

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"bunny/bunny": "^0.2.4|^0.3|^0.4",
2222
"php-amqplib/php-amqplib": "^2.7",
2323
"doctrine/dbal": "^2.6",
24-
"ramsey/uuid": "^2|^3.5",
24+
"ramsey/uuid": "^2|^3.5|^4.0",
2525
"psr/log": "^1",
2626
"psr/container": "^1",
2727
"makasim/temp-file": "^0.2",

‎docs/client/message_examples.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ nav_order: 2
1616

1717
## Scope
1818

19-
There are two two types possible scopes: `Message:SCOPE_MESSAGE_BUS` and `Message::SCOPE_APP`.
19+
There are two types possible scopes: `Message:SCOPE_MESSAGE_BUS` and `Message::SCOPE_APP`.
2020
The first one instructs the client send messages (if driver supports) to the message bus so other apps can consume those messages.
2121
The second in turns limits the message to the application that sent it. No other apps could receive it.
2222

‎docs/client/rpc_call.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ You can do it by defining a command which returns something.
1515
## The consumer side
1616

1717
On the consumer side we have to register a command processor which computes the result and send it back to the sender.
18-
Pay attention that you have to add reply extension. It wont work without it.
18+
Pay attention that you have to add reply extension. It won't work without it.
1919

2020
Of course it is possible to implement rpc server side based on transport classes only. That would require a bit more work to do.
2121

‎docs/monitoring.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ nav_order: 95
99
# Monitoring.
1010

1111
Enqueue provides a tool for monitoring message queues.
12-
With it, you can control how many messages were sent, how many processed successfuly or failed.
12+
With it, you can control how many messages were sent, how many processed successfully or failed.
1313
How many consumers are working, their up time, processed messages stats, memory usage and system load.
1414
The tool could be integrated with virtually any analytics and monitoring platform.
1515
There are several integration:
@@ -20,7 +20,7 @@ We are working on a JS\WAMP based real-time UI tool, for more information please
2020

2121
![Grafana Monitoring](images/grafana_monitoring.jpg)
2222

23-
[contact us]([email protected]) if need a Grafana template such as on the picture.
23+
[contact us](mailto:[email protected]) if need a Grafana template such as on the picture.
2424

2525
* [Installation](#installation)
2626
* [Track sent messages](#track-sent-messages)

‎pkg/dbal/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"php": "^7.1.3",
1010
"queue-interop/queue-interop": "^0.8",
1111
"doctrine/dbal": "^2.6",
12-
"ramsey/uuid": "^3"
12+
"ramsey/uuid": "^3|^4"
1313
},
1414
"require-dev": {
1515
"phpunit/phpunit": "~7.5",

‎pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php

+6-4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
class UseCasesTest extends WebTestCase
2020
{
21+
const RECEIVE_TIMEOUT = 500;
22+
2123
public function setUp()
2224
{
2325
// do not call parent::setUp.
@@ -172,7 +174,7 @@ public function testProducerSendsEventMessage(array $enqueueConfig)
172174

173175
$consumer = $this->getContext()->createConsumer($this->getTestQueue());
174176

175-
$message = $consumer->receive(100);
177+
$message = $consumer->receive(self::RECEIVE_TIMEOUT);
176178
$this->assertInstanceOf(Message::class, $message);
177179
$consumer->acknowledge($message);
178180

@@ -192,7 +194,7 @@ public function testProducerSendsCommandMessage(array $enqueueConfig)
192194

193195
$consumer = $this->getContext()->createConsumer($this->getTestQueue());
194196

195-
$message = $consumer->receive(100);
197+
$message = $consumer->receive(self::RECEIVE_TIMEOUT);
196198
$this->assertInstanceOf(Message::class, $message);
197199
$consumer->acknowledge($message);
198200

@@ -220,7 +222,7 @@ public function testProducerSendsEventMessageViaProduceCommand()
220222

221223
$consumer = $this->getContext()->createConsumer($this->getTestQueue());
222224

223-
$message = $consumer->receive(100);
225+
$message = $consumer->receive(self::RECEIVE_TIMEOUT);
224226
$this->assertInstanceOf(Message::class, $message);
225227
$consumer->acknowledge($message);
226228

@@ -247,7 +249,7 @@ public function testProducerSendsCommandMessageViaProduceCommand()
247249

248250
$consumer = $this->getContext()->createConsumer($this->getTestQueue());
249251

250-
$message = $consumer->receive(100);
252+
$message = $consumer->receive(self::RECEIVE_TIMEOUT);
251253
$this->assertInstanceOf(Message::class, $message);
252254
$consumer->acknowledge($message);
253255

‎pkg/enqueue/Tests/Rpc/PromiseTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ public function testOnReceiveShouldCallReceiveCallBackWithTimeout()
5050
$receiveInvoked = false;
5151
$receivePromise = null;
5252
$receiveTimeout = null;
53-
$receivecb = function ($promise, $timout) use (&$receiveInvoked, &$receivePromise, &$receiveTimeout) {
53+
$receivecb = function ($promise, $timeout) use (&$receiveInvoked, &$receivePromise, &$receiveTimeout) {
5454
$receiveInvoked = true;
5555
$receivePromise = $promise;
56-
$receiveTimeout = $timout;
56+
$receiveTimeout = $timeout;
5757
};
5858

5959
$promise = new Promise($receivecb, function () {}, function () {});

‎pkg/enqueue/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"queue-interop/queue-interop": "^0.8",
1212
"enqueue/null": "^0.10",
1313
"enqueue/dsn": "^0.10",
14-
"ramsey/uuid": "^2|^3.5",
14+
"ramsey/uuid": "^2|^3.5|^4",
1515
"psr/log": "^1",
1616
"psr/container": "^1"
1717
},

‎pkg/monitoring/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Enqueue is an MIT-licensed open source project with its ongoing development made
1212
Queue Monitoring tool. Track sent, consumed messages. Consumers performances.
1313

1414
* Could be used with any message queue library.
15-
* Could be intergrated to any PHP framework
15+
* Could be integrated to any PHP framework
1616
* Could send stats to any analytical platform
1717
* Supports Datadog, InfluxDb, Grafana and WAMP out of the box.
1818
* Provides integration for Enqueue

‎pkg/monitoring/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"require": {
99
"php": "^7.1.3",
1010
"enqueue/enqueue": "^0.10",
11-
"ramsey/uuid": "^3",
11+
"ramsey/uuid": "^3|^4",
1212
"enqueue/dsn": "^0.10"
1313
},
1414
"require-dev": {

‎pkg/pheanstalk/PheanstalkConsumer.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ public function reject(Message $message, bool $requeue = false): void
9191
InvalidMessageException::assertMessageInstanceOf($message, PheanstalkMessage::class);
9292

9393
if (false == $message->getJob()) {
94-
throw new \LogicException(sprintf(
95-
'The message could not be %s because it does not have job set.',
96-
$requeue ? 'requeued' : 'rejected'
97-
));
94+
$state = $requeue ? 'requeued' : 'rejected';
95+
throw new \LogicException(sprintf('The message could not be %s because it does not have job set.', $state));
9896
}
9997

10098
if ($requeue) {
@@ -111,7 +109,9 @@ private function convertJobToMessage(Job $job): PheanstalkMessage
111109
$stats = $this->pheanstalk->statsJob($job);
112110

113111
$message = PheanstalkMessage::jsonUnserialize($job->getData());
114-
$message->setRedelivered($stats['reserves'] > 1);
112+
if (isset($stats['reserves'])) {
113+
$message->setRedelivered($stats['reserves'] > 1);
114+
}
115115
$message->setJob($job);
116116

117117
return $message;

‎pkg/rdkafka/RdKafkaConsumer.php

+3
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ public function setOffset(int $offset = null): void
7575
$this->offset = $offset;
7676
}
7777

78+
/**
79+
* @return RdKafkaTopic
80+
*/
7881
public function getQueue(): Queue
7982
{
8083
return $this->topic;

‎pkg/redis/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"php": "^7.1.3",
1010
"queue-interop/queue-interop": "^0.8",
1111
"enqueue/dsn": "^0.10",
12-
"ramsey/uuid": "^3"
12+
"ramsey/uuid": "^3|^4"
1313
},
1414
"require-dev": {
1515
"phpunit/phpunit": "~7.5",

0 commit comments

Comments
 (0)