From 96b5e3a36d3278719c953dce3da28440dc1d2ad1 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 28 Nov 2019 21:53:25 +0100 Subject: [PATCH 1/7] Add support for php 7.4 --- .travis.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ecc11eaf0..994c91a98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,12 @@ matrix: - php: 7.3 sudo: false env: SYMFONY_VERSION=4.2.* UNIT_TESTS=true + - php: 7.4snapshot + sudo: false + env: SYMFONY_VERSION=4.1.* UNIT_TESTS=true + - php: 7.4snapshot + sudo: false + env: SYMFONY_VERSION=4.2.* UNIT_TESTS=true - php: 7.1 services: docker sudo: required @@ -66,12 +72,12 @@ script: - 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 - + notifications: webhooks: urls: - https://webhooks.gitter.im/e/3f8b3668e7792de23a49 - on_success: change - on_failure: always - on_start: never + on_success: change + on_failure: always + on_start: never From af8c91c638e6e12952395175ea94fda7e6dded5c Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Tue, 3 Dec 2019 20:41:49 +0100 Subject: [PATCH 2/7] Use stable 7.4 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 994c91a98..5570bf4cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,10 @@ matrix: - php: 7.3 sudo: false env: SYMFONY_VERSION=4.2.* UNIT_TESTS=true - - php: 7.4snapshot + - php: 7.4 sudo: false env: SYMFONY_VERSION=4.1.* UNIT_TESTS=true - - php: 7.4snapshot + - php: 7.4 sudo: false env: SYMFONY_VERSION=4.2.* UNIT_TESTS=true - php: 7.1 From f15a7e9e93df177db613fa1b9e9f628af3f691ad Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 2 Jan 2020 23:35:04 +0100 Subject: [PATCH 3/7] Use bionic to php 7.4 support --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5570bf4cb..d3d873aa4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ git: depth: 10 language: php +dist: bionic matrix: include: From 640ad86915181095b469871b1c80005a4e46befa Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 30 Jul 2020 13:02:35 +0200 Subject: [PATCH 4/7] Fix php7.4 issue --- pkg/pheanstalk/PheanstalkConsumer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/pheanstalk/PheanstalkConsumer.php b/pkg/pheanstalk/PheanstalkConsumer.php index d8460f58a..cec388785 100644 --- a/pkg/pheanstalk/PheanstalkConsumer.php +++ b/pkg/pheanstalk/PheanstalkConsumer.php @@ -111,7 +111,9 @@ private function convertJobToMessage(Job $job): PheanstalkMessage $stats = $this->pheanstalk->statsJob($job); $message = PheanstalkMessage::jsonUnserialize($job->getData()); - $message->setRedelivered($stats['reserves'] > 1); + if (isset($stats['reserves'])) { + $message->setRedelivered($stats['reserves'] > 1); + } $message->setJob($job); return $message; From 1173c7d6a7de48c3a43356c2fbfa1d2f76820f98 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 30 Jul 2020 13:27:26 +0200 Subject: [PATCH 5/7] CS fix --- pkg/pheanstalk/PheanstalkConsumer.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/pheanstalk/PheanstalkConsumer.php b/pkg/pheanstalk/PheanstalkConsumer.php index cec388785..3fb217683 100644 --- a/pkg/pheanstalk/PheanstalkConsumer.php +++ b/pkg/pheanstalk/PheanstalkConsumer.php @@ -91,10 +91,8 @@ public function reject(Message $message, bool $requeue = false): void InvalidMessageException::assertMessageInstanceOf($message, PheanstalkMessage::class); if (false == $message->getJob()) { - throw new \LogicException(sprintf( - 'The message could not be %s because it does not have job set.', - $requeue ? 'requeued' : 'rejected' - )); + $state = $requeue ? 'requeued' : 'rejected'; + throw new \LogicException(sprintf('The message could not be %s because it does not have job set.', $state)); } if ($requeue) { From 48420755f7d6abed09c1deda615b73ad445f9587 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 30 Jul 2020 14:00:17 +0200 Subject: [PATCH 6/7] Add more timeout --- pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php index 37b6e1b57..98d48a1ef 100644 --- a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php +++ b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php @@ -220,7 +220,7 @@ public function testProducerSendsEventMessageViaProduceCommand() $consumer = $this->getContext()->createConsumer($this->getTestQueue()); - $message = $consumer->receive(100); + $message = $consumer->receive(500); $this->assertInstanceOf(Message::class, $message); $consumer->acknowledge($message); From f2e7fd1c82afed9e1e71c7500bde7a8c87cbc811 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 30 Jul 2020 14:19:01 +0200 Subject: [PATCH 7/7] Move receive timeout to const --- pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php index 98d48a1ef..7c2936c0e 100644 --- a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php +++ b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php @@ -18,6 +18,8 @@ */ class UseCasesTest extends WebTestCase { + const RECEIVE_TIMEOUT = 500; + public function setUp() { // do not call parent::setUp. @@ -172,7 +174,7 @@ public function testProducerSendsEventMessage(array $enqueueConfig) $consumer = $this->getContext()->createConsumer($this->getTestQueue()); - $message = $consumer->receive(100); + $message = $consumer->receive(self::RECEIVE_TIMEOUT); $this->assertInstanceOf(Message::class, $message); $consumer->acknowledge($message); @@ -192,7 +194,7 @@ public function testProducerSendsCommandMessage(array $enqueueConfig) $consumer = $this->getContext()->createConsumer($this->getTestQueue()); - $message = $consumer->receive(100); + $message = $consumer->receive(self::RECEIVE_TIMEOUT); $this->assertInstanceOf(Message::class, $message); $consumer->acknowledge($message); @@ -220,7 +222,7 @@ public function testProducerSendsEventMessageViaProduceCommand() $consumer = $this->getContext()->createConsumer($this->getTestQueue()); - $message = $consumer->receive(500); + $message = $consumer->receive(self::RECEIVE_TIMEOUT); $this->assertInstanceOf(Message::class, $message); $consumer->acknowledge($message); @@ -247,7 +249,7 @@ public function testProducerSendsCommandMessageViaProduceCommand() $consumer = $this->getContext()->createConsumer($this->getTestQueue()); - $message = $consumer->receive(100); + $message = $consumer->receive(self::RECEIVE_TIMEOUT); $this->assertInstanceOf(Message::class, $message); $consumer->acknowledge($message);