Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 893b1df

Browse files
authored
Merge pull request #991 from snapshotpl/php74
Add php 7.4 to test matrix
2 parents 08bdd4b + f2e7fd1 commit 893b1df

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

‎.travis.yml‎

Lines changed: 10 additions & 0 deletions
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

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

Lines changed: 6 additions & 4 deletions
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/pheanstalk/PheanstalkConsumer.php‎

Lines changed: 5 additions & 5 deletions
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;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /