diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c29d8430c..136623755 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
- uses: shivammathur/setup-php@v2
with:
- php-version: '7.4'
+ php-version: '8.0'
coverage: none
extensions: mongodb, redis, :xdebug
ini-values: memory_limit=2048M
@@ -77,18 +77,18 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
- symfony_version: ['5.4.*', '6.2.*', '6.3.*']
+ php: ['8.0', '8.1', '8.2']
+ symfony_version: ['5.4.*', '6.3.*', '6.4.*', '7.0.*']
dependencies: ['--prefer-lowest', '--prefer-dist']
exclude:
- - php: '7.4'
- symfony_version: '6.2.*'
- - php: '7.4'
+ - php: '8.0'
symfony_version: '6.3.*'
- php: '8.0'
- symfony_version: '6.2.*'
+ symfony_version: '6.4.*'
- php: '8.0'
- symfony_version: '6.3.*'
+ symfony_version: '7.0.*'
+ - php: '8.1'
+ symfony_version: '7.0.*'
name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
@@ -127,18 +127,18 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2'] # same as in the container
- symfony_version: ['5.4.*', '6.2.*', '6.3.*']
+ php: ['8.0', '8.1', '8.2'] # same as in the container
+ symfony_version: ['5.4.*', '6.3.*', '6.4.*', '7.0.*']
dependencies: ['--prefer-lowest', '--prefer-dist']
exclude:
- - php: '7.4'
- symfony_version: '6.2.*'
- - php: '7.4'
+ - php: '8.0'
symfony_version: '6.3.*'
- php: '8.0'
- symfony_version: '6.2.*'
+ symfony_version: '6.4.*'
- php: '8.0'
- symfony_version: '6.3.*'
+ symfony_version: '7.0.*'
+ - php: '8.1'
+ symfony_version: '7.0.*'
name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
@@ -180,4 +180,4 @@ jobs:
if: ${{ matrix.php != '8.1' && matrix.php != '8.2' }}
- run: bin/test.sh --exclude-group=gearman
- if: ${{ matrix.php == '8.1' && matrix.php != '8.2' }}
+ if: ${{ matrix.php == '8.1' || matrix.php == '8.2' }}
diff --git a/composer.json b/composer.json
index 5c0108e27..3223b837f 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
"phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon"
},
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"ext-amqp": "^1.9.3|^2.0.0",
"ext-gearman": "^2.0",
@@ -19,7 +19,7 @@
"queue-interop/amqp-interop": "^0.8.2",
"queue-interop/queue-interop": "^0.8.1",
"bunny/bunny": "^0.4|^0.5",
- "php-amqplib/php-amqplib": "^3.0",
+ "php-amqplib/php-amqplib": "^3.6",
"doctrine/dbal": "^2.12|^3.1",
"ramsey/uuid": "^3.5|^4",
"psr/log": "^1.1 || ^2.0 || ^3.0",
@@ -50,27 +50,27 @@
},
"require-dev": {
"ext-pcntl": "*",
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"phpstan/phpstan": "^0.12",
"queue-interop/queue-spec": "^0.6.2",
- "symfony/browser-kit": "^5.4|^6.0",
- "symfony/config": "^5.4|^6.0",
- "symfony/process": "^5.4|^6.0",
- "symfony/console": "^5.4|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/event-dispatcher": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/filesystem": "^5.4|^6.0",
- "symfony/framework-bundle": "^5.4|^6.0",
- "symfony/validator": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0",
+ "symfony/browser-kit": "^5.4|^6.0|^7.0",
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/process": "^5.4|^6.0|^7.0",
+ "symfony/console": "^5.4|^6.0|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/http-kernel": "^5.4|^6.0|^7.0",
+ "symfony/filesystem": "^5.4|^6.0|^7.0",
+ "symfony/framework-bundle": "^5.4|^6.0|^7.0",
+ "symfony/validator": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0",
"empi89/php-amqp-stubs": "*@dev",
"doctrine/doctrine-bundle": "^2.3.2",
- "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
+ "doctrine/mongodb-odm-bundle": "^3.5|^4.3|5.0.x-dev",
"alcaeus/mongo-php-adapter": "^1.0",
"kwn/php-rdkafka-stubs": "^2.0.3",
- "friendsofphp/php-cs-fixer": "^3.4",
+ "friendsofphp/php-cs-fixer": "^3.43",
"dms/phpunit-arraysubset-asserts": "^0.2.1",
"phpspec/prophecy-phpunit": "^2.0"
},
@@ -125,7 +125,7 @@
"ext-amqp": "1.9.3",
"ext-gearman": "2.0.3",
"ext-rdkafka": "4.0",
- "ext-mongodb": "1.5",
+ "ext-mongodb": "1.17",
"ext-bcmath": "1",
"ext-mbstring": "1",
"ext-mongo": "1.6.14",
diff --git a/docker-compose.yml b/docker-compose.yml
index c5fa5545b..86f31be78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,11 +3,11 @@ version: '2'
services:
dev:
# when image publishing gets sorted:
-# image: enqueue/dev:${PHP_VERSION:-7.4}
+# image: enqueue/dev:${PHP_VERSION:-8.0}
build:
context: docker
args:
- PHP_VERSION: "${PHP_VERSION:-7.4}"
+ PHP_VERSION: "${PHP_VERSION:-8.0}"
depends_on:
- rabbitmq
- mysql
@@ -38,16 +38,16 @@ services:
- PREDIS_DSN=redis+predis://redis
- PHPREDIS_DSN=redis+phpredis://redis
- GPS_DSN=gps:?projectId=mqdev&emulatorHost=http://google-pubsub:8085
- - SQS_DSN=sqs:?key=key&secret=secret®ion=us-east-1&endpoint=http://localstack:4576&version=latest
- - SNS_DSN=sns:?key=key&secret=secret®ion=us-east-1&endpoint=http://localstack:4575&version=latest
- - SNSQS_DSN=snsqs:?key=key&secret=secret®ion=us-east-1&sns_endpoint=http://localstack:4575&sqs_endpoint=http://localstack:4576&version=latest
+ - SQS_DSN=sqs:?key=key&secret=secret®ion=us-east-1&endpoint=http://localstack:4566&version=latest
+ - SNS_DSN=sns:?key=key&secret=secret®ion=us-east-1&endpoint=http://localstack:4566&version=latest
+ - SNSQS_DSN=snsqs:?key=key&secret=secret®ion=us-east-1&sns_endpoint=http://localstack:4566&sqs_endpoint=http://localstack:4566&version=latest
- WAMP_DSN=wamp://thruway:9090
- REDIS_HOST=redis
- REDIS_PORT=6379
- AWS_SQS_KEY=key
- AWS_SQS_SECRET=secret
- AWS_SQS_REGION=us-east-1
- - AWS_SQS_ENDPOINT=http://localstack:4576
+ - AWS_SQS_ENDPOINT=http://localstack:4566
- AWS_SQS_VERSION=latest
- BEANSTALKD_DSN=beanstalk://beanstalkd:11300
- GEARMAN_DSN=gearman://gearmand:4730
@@ -127,13 +127,15 @@ services:
- '9090:9090'
localstack:
- image: 'localstack/localstack:0.8.10'
+ image: 'localstack/localstack:3.0'
ports:
- - '4576:4576'
- - '4575:4575'
+ - '4566:4566'
environment:
- HOSTNAME_EXTERNAL: 'localstack'
+ LOCALSTACK_HOST: 'localstack:4566'
SERVICES: 'sqs,sns'
+ SQS_ENDPOINT_STRATEGY: 'off'
+ EAGER_SERVICE_LOADING: 1
+ DEBUG: 1
influxdb:
image: 'influxdb:latest'
diff --git a/docker/bin/test.sh b/docker/bin/test.sh
index 2070584bb..cfc94aab5 100755
--- a/docker/bin/test.sh
+++ b/docker/bin/test.sh
@@ -39,7 +39,7 @@ waitForService gearmand 4730 50
waitForService kafka 9092 50
waitForService mongo 27017 50
waitForService thruway 9090 50
-waitForService localstack 4576 50
+waitForService localstack 4566 50
php docker/bin/refresh-mysql-database.php || exit 1
php docker/bin/refresh-postgres-database.php || exit 1
diff --git a/docker/thruway/Dockerfile b/docker/thruway/Dockerfile
index 042a49d64..8cc98a4bf 100644
--- a/docker/thruway/Dockerfile
+++ b/docker/thruway/Dockerfile
@@ -1,4 +1,4 @@
-FROM makasim/nginx-php-fpm:7.4-all-exts
+FROM makasim/nginx-php-fpm:8.0-all-exts
RUN mkdir -p /thruway
WORKDIR /thruway
diff --git a/pkg/amqp-bunny/.github/workflows/ci.yml b/pkg/amqp-bunny/.github/workflows/ci.yml
index 5448d7b1a..7218b3b23 100644
--- a/pkg/amqp-bunny/.github/workflows/ci.yml
+++ b/pkg/amqp-bunny/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/amqp-bunny/AmqpContext.php b/pkg/amqp-bunny/AmqpContext.php
index f57554335..35405ac9a 100644
--- a/pkg/amqp-bunny/AmqpContext.php
+++ b/pkg/amqp-bunny/AmqpContext.php
@@ -51,7 +51,6 @@ class AmqpContext implements InteropAmqpContext, DelayStrategyAware
* Callable must return instance of \Bunny\Channel once called.
*
* @param Channel|callable $bunnyChannel
- * @param array $config
*/
public function __construct($bunnyChannel, array $config)
{
@@ -218,7 +217,7 @@ public function bind(InteropAmqpBind $bind): void
$this->getBunnyChannel()->exchangeBind(
$bind->getTarget()->getTopicName(),
$bind->getSource()->getTopicName(),
- $bind->getRoutingKey(),
+ (string) $bind->getRoutingKey(),
(bool) ($bind->getFlags() & InteropAmqpBind::FLAG_NOWAIT),
$bind->getArguments()
);
@@ -227,7 +226,7 @@ public function bind(InteropAmqpBind $bind): void
$this->getBunnyChannel()->queueBind(
$bind->getSource()->getQueueName(),
$bind->getTarget()->getTopicName(),
- $bind->getRoutingKey(),
+ (string) $bind->getRoutingKey(),
(bool) ($bind->getFlags() & InteropAmqpBind::FLAG_NOWAIT),
$bind->getArguments()
);
@@ -236,7 +235,7 @@ public function bind(InteropAmqpBind $bind): void
$this->getBunnyChannel()->queueBind(
$bind->getTarget()->getQueueName(),
$bind->getSource()->getTopicName(),
- $bind->getRoutingKey(),
+ (string) $bind->getRoutingKey(),
(bool) ($bind->getFlags() & InteropAmqpBind::FLAG_NOWAIT),
$bind->getArguments()
);
@@ -294,10 +293,7 @@ public function getBunnyChannel(): Channel
if (false == $this->bunnyChannel) {
$bunnyChannel = call_user_func($this->bunnyChannelFactory);
if (false == $bunnyChannel instanceof Channel) {
- throw new \LogicException(sprintf(
- 'The factory must return instance of \Bunny\Channel. It returned %s',
- is_object($bunnyChannel) ? get_class($bunnyChannel) : gettype($bunnyChannel)
- ));
+ throw new \LogicException(sprintf('The factory must return instance of \Bunny\Channel. It returned %s', is_object($bunnyChannel) ? $bunnyChannel::class : gettype($bunnyChannel)));
}
$this->bunnyChannel = $bunnyChannel;
diff --git a/pkg/amqp-bunny/AmqpProducer.php b/pkg/amqp-bunny/AmqpProducer.php
index 76892ebeb..a5ce5484b 100644
--- a/pkg/amqp-bunny/AmqpProducer.php
+++ b/pkg/amqp-bunny/AmqpProducer.php
@@ -79,7 +79,7 @@ public function send(Destination $destination, Message $message): void
/**
* @return self
*/
- public function setDeliveryDelay(int $deliveryDelay = null): Producer
+ public function setDeliveryDelay(?int $deliveryDelay = null): Producer
{
if (null === $this->delayStrategy) {
throw DeliveryDelayNotSupportedException::providerDoestNotSupportIt();
@@ -98,7 +98,7 @@ public function getDeliveryDelay(): ?int
/**
* @return self
*/
- public function setPriority(int $priority = null): Producer
+ public function setPriority(?int $priority = null): Producer
{
$this->priority = $priority;
@@ -113,7 +113,7 @@ public function getPriority(): ?int
/**
* @return self
*/
- public function setTimeToLive(int $timeToLive = null): Producer
+ public function setTimeToLive(?int $timeToLive = null): Producer
{
$this->timeToLive = $timeToLive;
@@ -152,8 +152,8 @@ private function doSend(InteropAmqpDestination $destination, InteropAmqpMessage
$this->channel->publish(
$message->getBody(),
$amqpProperties,
- $destination->getTopicName(),
- $message->getRoutingKey(),
+ (string) $destination->getTopicName(),
+ (string) $message->getRoutingKey(),
(bool) ($message->getFlags() & InteropAmqpMessage::FLAG_MANDATORY),
(bool) ($message->getFlags() & InteropAmqpMessage::FLAG_IMMEDIATE)
);
@@ -162,7 +162,7 @@ private function doSend(InteropAmqpDestination $destination, InteropAmqpMessage
$message->getBody(),
$amqpProperties,
'',
- $destination->getQueueName(),
+ (string) $destination->getQueueName(),
(bool) ($message->getFlags() & InteropAmqpMessage::FLAG_MANDATORY),
(bool) ($message->getFlags() & InteropAmqpMessage::FLAG_IMMEDIATE)
);
diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json
index 5bffcebd8..4ad6e0525 100644
--- a/pkg/amqp-bunny/composer.json
+++ b/pkg/amqp-bunny/composer.json
@@ -6,14 +6,14 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/amqp-interop": "^0.8.2",
"queue-interop/queue-interop": "^0.8",
"bunny/bunny": "^0.4|^0.5",
"enqueue/amqp-tools": "^0.10"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
diff --git a/pkg/amqp-ext/.github/workflows/ci.yml b/pkg/amqp-ext/.github/workflows/ci.yml
index d48deb0af..69f428c7a 100644
--- a/pkg/amqp-ext/.github/workflows/ci.yml
+++ b/pkg/amqp-ext/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/amqp-ext/AmqpConsumer.php b/pkg/amqp-ext/AmqpConsumer.php
index 03c949714..e3ad2d9b6 100644
--- a/pkg/amqp-ext/AmqpConsumer.php
+++ b/pkg/amqp-ext/AmqpConsumer.php
@@ -43,7 +43,7 @@ public function __construct(AmqpContext $context, InteropAmqpQueue $queue)
$this->flags = self::FLAG_NOPARAM;
}
- public function setConsumerTag(string $consumerTag = null): void
+ public function setConsumerTag(?string $consumerTag = null): void
{
$this->consumerTag = $consumerTag;
}
@@ -93,7 +93,7 @@ public function receive(int $timeout = 0): ?Message
return $message;
}
- usleep(100000); //100ms
+ usleep(100000); // 100ms
}
return null;
@@ -118,7 +118,7 @@ public function acknowledge(Message $message): void
{
InvalidMessageException::assertMessageInstanceOf($message, InteropAmqpMessage::class);
- $this->getExtQueue()->ack($message->getDeliveryTag());
+ $this->getExtQueue()->ack((int) $message->getDeliveryTag());
}
/**
@@ -130,7 +130,7 @@ public function reject(Message $message, bool $requeue = false): void
$this->getExtQueue()->reject(
$message->getDeliveryTag(),
- $requeue ? AMQP_REQUEUE : AMQP_NOPARAM
+ $requeue ? \AMQP_REQUEUE : \AMQP_NOPARAM
);
}
diff --git a/pkg/amqp-ext/AmqpContext.php b/pkg/amqp-ext/AmqpContext.php
index 5ea099da2..cd7145122 100644
--- a/pkg/amqp-ext/AmqpContext.php
+++ b/pkg/amqp-ext/AmqpContext.php
@@ -177,7 +177,7 @@ public function unbind(InteropAmqpBind $bind): void
public function createTemporaryQueue(): Queue
{
$extQueue = new \AMQPQueue($this->getExtChannel());
- $extQueue->setFlags(AMQP_EXCLUSIVE);
+ $extQueue->setFlags(\AMQP_EXCLUSIVE);
$extQueue->declareQueue();
@@ -243,10 +243,7 @@ public function getExtChannel(): \AMQPChannel
if (false == $this->extChannel) {
$extChannel = call_user_func($this->extChannelFactory);
if (false == $extChannel instanceof \AMQPChannel) {
- throw new \LogicException(sprintf(
- 'The factory must return instance of AMQPChannel. It returns %s',
- is_object($extChannel) ? get_class($extChannel) : gettype($extChannel)
- ));
+ throw new \LogicException(sprintf('The factory must return instance of AMQPChannel. It returns %s', is_object($extChannel) ? $extChannel::class : gettype($extChannel)));
}
$this->extChannel = $extChannel;
@@ -278,7 +275,7 @@ public function convertMessage(\AMQPEnvelope $extEnvelope): InteropAmqpMessage
]
);
$message->setRedelivered($extEnvelope->isRedelivery());
- $message->setDeliveryTag($extEnvelope->getDeliveryTag());
+ $message->setDeliveryTag((int) $extEnvelope->getDeliveryTag());
$message->setRoutingKey($extEnvelope->getRoutingKey());
return $message;
diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json
index b81363bb9..71306ff64 100644
--- a/pkg/amqp-ext/composer.json
+++ b/pkg/amqp-ext/composer.json
@@ -6,14 +6,14 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"ext-amqp": "^1.9.3|^2.0.0",
"queue-interop/amqp-interop": "^0.8.2",
"queue-interop/queue-interop": "^0.8",
"enqueue/amqp-tools": "^0.10"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2",
diff --git a/pkg/amqp-lib/.github/workflows/ci.yml b/pkg/amqp-lib/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/amqp-lib/.github/workflows/ci.yml
+++ b/pkg/amqp-lib/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json
index dfb73a311..3001efd55 100644
--- a/pkg/amqp-lib/composer.json
+++ b/pkg/amqp-lib/composer.json
@@ -6,14 +6,14 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
- "php-amqplib/php-amqplib": "^3.2",
+ "php": "^8.0",
+ "php-amqplib/php-amqplib": "^3.6",
"queue-interop/amqp-interop": "^0.8.2",
"queue-interop/queue-interop": "^0.8",
"enqueue/amqp-tools": "^0.10"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
diff --git a/pkg/amqp-tools/.github/workflows/ci.yml b/pkg/amqp-tools/.github/workflows/ci.yml
index 5448d7b1a..7218b3b23 100644
--- a/pkg/amqp-tools/.github/workflows/ci.yml
+++ b/pkg/amqp-tools/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json
index 55f82f5d7..de0ef7892 100644
--- a/pkg/amqp-tools/composer.json
+++ b/pkg/amqp-tools/composer.json
@@ -6,13 +6,13 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/amqp-interop": "^0.8.2",
"queue-interop/queue-interop": "^0.8",
"enqueue/dsn": "^0.10"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev"
},
diff --git a/pkg/async-command/.github/workflows/ci.yml b/pkg/async-command/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/async-command/.github/workflows/ci.yml
+++ b/pkg/async-command/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/async-command/composer.json b/pkg/async-command/composer.json
index 48fd6f089..738d6191e 100644
--- a/pkg/async-command/composer.json
+++ b/pkg/async-command/composer.json
@@ -6,19 +6,19 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"enqueue/enqueue": "^0.10",
"queue-interop/queue-interop": "^0.8",
- "symfony/console": "^5.4|^6.0",
- "symfony/process": "^5.4|^6.0"
+ "symfony/console": "^5.4|^6.0|^7.0",
+ "symfony/process": "^5.4|^6.0|^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/config": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/filesystem": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0",
+ "phpunit/phpunit": "^9.6.15",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/http-kernel": "^5.4|^6.0|^7.0",
+ "symfony/filesystem": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0",
"enqueue/null": "0.10.x-dev",
"enqueue/fs": "0.10.x-dev",
"enqueue/test": "0.10.x-dev"
@@ -31,7 +31,7 @@
"docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
},
"suggest": {
- "symfony/dependency-injection": "^5.4|^6.0 If you'd like to use async event dispatcher container extension."
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0 If you'd like to use async event dispatcher container extension."
},
"autoload": {
"psr-4": { "Enqueue\\AsyncCommand\\": "" },
diff --git a/pkg/async-event-dispatcher/.github/workflows/ci.yml b/pkg/async-event-dispatcher/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/async-event-dispatcher/.github/workflows/ci.yml
+++ b/pkg/async-event-dispatcher/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/async-event-dispatcher/ContainerAwareRegistry.php b/pkg/async-event-dispatcher/ContainerAwareRegistry.php
index 2763ed72b..01adeb3a9 100644
--- a/pkg/async-event-dispatcher/ContainerAwareRegistry.php
+++ b/pkg/async-event-dispatcher/ContainerAwareRegistry.php
@@ -2,13 +2,10 @@
namespace Enqueue\AsyncEventDispatcher;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
-class ContainerAwareRegistry implements Registry, ContainerAwareInterface
+class ContainerAwareRegistry implements Registry
{
- use ContainerAwareTrait;
-
/**
* @var string[]
*/
@@ -19,6 +16,8 @@ class ContainerAwareRegistry implements Registry, ContainerAwareInterface
*/
private $transformersMap;
+ private ContainerInterface $container;
+
/**
* @param string[] $eventsMap [eventName => transformerName]
* @param string[] $transformersMap [transformerName => transformerServiceId]
@@ -29,9 +28,11 @@ public function __construct(array $eventsMap, array $transformersMap)
$this->transformersMap = $transformersMap;
}
- /**
- * {@inheritdoc}
- */
+ public function setContainer(?ContainerInterface $container = null)
+ {
+ $this->container = $container;
+ }
+
public function getTransformerNameForEvent($eventName)
{
$transformerName = null;
@@ -58,9 +59,6 @@ public function getTransformerNameForEvent($eventName)
return $transformerName;
}
- /**
- * {@inheritdoc}
- */
public function getTransformer($name)
{
if (false == array_key_exists($name, $this->transformersMap)) {
@@ -69,12 +67,8 @@ public function getTransformer($name)
$transformer = $this->container->get($this->transformersMap[$name]);
- if (false == $transformer instanceof EventTransformer) {
- throw new \LogicException(sprintf(
- 'The container must return instance of %s but got %s',
- EventTransformer::class,
- is_object($transformer) ? get_class($transformer) : gettype($transformer)
- ));
+ if (false == $transformer instanceof EventTransformer) {
+ throw new \LogicException(sprintf('The container must return instance of %s but got %s', EventTransformer::class, is_object($transformer) ? $transformer::class : gettype($transformer)));
}
return $transformer;
diff --git a/pkg/async-event-dispatcher/DependencyInjection/Configuration.php b/pkg/async-event-dispatcher/DependencyInjection/Configuration.php
index 56151e956..7b85a469d 100644
--- a/pkg/async-event-dispatcher/DependencyInjection/Configuration.php
+++ b/pkg/async-event-dispatcher/DependencyInjection/Configuration.php
@@ -7,10 +7,7 @@
class Configuration implements ConfigurationInterface
{
- /**
- * {@inheritdoc}
- */
- public function getConfigTreeBuilder()
+ public function getConfigTreeBuilder(): TreeBuilder
{
if (method_exists(TreeBuilder::class, 'getRootNode')) {
$tb = new TreeBuilder('enqueue_async_event_dispatcher');
diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json
index a2cef0d79..2f6b914a1 100644
--- a/pkg/async-event-dispatcher/composer.json
+++ b/pkg/async-event-dispatcher/composer.json
@@ -6,18 +6,18 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"enqueue/enqueue": "^0.10",
"queue-interop/queue-interop": "^0.8",
- "symfony/event-dispatcher": "^5.4|^6.0"
+ "symfony/event-dispatcher": "^5.4|^6.0|^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/config": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/filesystem": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0",
+ "phpunit/phpunit": "^9.6.15",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/http-kernel": "^5.4|^6.0|^7.0",
+ "symfony/filesystem": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0",
"enqueue/null": "0.10.x-dev",
"enqueue/fs": "0.10.x-dev",
"enqueue/test": "0.10.x-dev"
@@ -30,7 +30,7 @@
"docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
},
"suggest": {
- "symfony/dependency-injection": "^5.4|^6.0 If you'd like to use async event dispatcher container extension."
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0 If you'd like to use async event dispatcher container extension."
},
"autoload": {
"psr-4": { "Enqueue\\AsyncEventDispatcher\\": "" },
diff --git a/pkg/dbal/.github/workflows/ci.yml b/pkg/dbal/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/dbal/.github/workflows/ci.yml
+++ b/pkg/dbal/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json
index a4d4af7f4..45d93087f 100644
--- a/pkg/dbal/composer.json
+++ b/pkg/dbal/composer.json
@@ -6,14 +6,14 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8",
"doctrine/dbal": "^2.12|^3.1",
"doctrine/persistence": "^2.0|^3.0",
"ramsey/uuid": "^3.5|^4"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
diff --git a/pkg/dsn/.github/workflows/ci.yml b/pkg/dsn/.github/workflows/ci.yml
index 71bcbbd61..c4ac94e9f 100644
--- a/pkg/dsn/.github/workflows/ci.yml
+++ b/pkg/dsn/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/dsn/composer.json b/pkg/dsn/composer.json
index 94fb18a9f..dbd39aed7 100644
--- a/pkg/dsn/composer.json
+++ b/pkg/dsn/composer.json
@@ -6,7 +6,7 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0"
+ "php": "^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
diff --git a/pkg/enqueue-bundle/.github/workflows/ci.yml b/pkg/enqueue-bundle/.github/workflows/ci.yml
index 4c397bef1..da6d006c1 100644
--- a/pkg/enqueue-bundle/.github/workflows/ci.yml
+++ b/pkg/enqueue-bundle/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json
index 7ee50c269..aa21ec754 100644
--- a/pkg/enqueue-bundle/composer.json
+++ b/pkg/enqueue-bundle/composer.json
@@ -6,8 +6,8 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
- "symfony/framework-bundle": "^5.4|^6.0",
+ "php": "^8.0",
+ "symfony/framework-bundle": "^5.4|^6.0|^7.0",
"queue-interop/amqp-interop": "^0.8.2",
"queue-interop/queue-interop": "^0.8",
"enqueue/enqueue": "^0.10",
@@ -21,7 +21,7 @@
"docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/stomp": "0.10.x-dev",
"enqueue/amqp-ext": "0.10.x-dev",
"enqueue/amqp-lib": "0.10.x-dev",
@@ -35,14 +35,14 @@
"enqueue/test": "0.10.x-dev",
"enqueue/async-event-dispatcher": "0.10.x-dev",
"enqueue/async-command": "0.10.x-dev",
- "php-amqplib/php-amqplib": "^3.0",
+ "php-amqplib/php-amqplib": "^3.6",
"doctrine/doctrine-bundle": "^2.3.2",
- "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
+ "doctrine/mongodb-odm-bundle": "^3.5|^4.3|5.0.x-dev",
"alcaeus/mongo-php-adapter": "^1.0",
- "symfony/browser-kit": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/validator": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0"
+ "symfony/browser-kit": "^5.4|^6.0|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/validator": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0"
},
"suggest": {
"enqueue/async-command": "If want to run Symfony command via message queue",
diff --git a/pkg/enqueue/.github/workflows/ci.yml b/pkg/enqueue/.github/workflows/ci.yml
index 28a46e908..9e85d5004 100644
--- a/pkg/enqueue/.github/workflows/ci.yml
+++ b/pkg/enqueue/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/enqueue/Client/DriverFactory.php b/pkg/enqueue/Client/DriverFactory.php
index 0dd9412d8..70539d837 100644
--- a/pkg/enqueue/Client/DriverFactory.php
+++ b/pkg/enqueue/Client/DriverFactory.php
@@ -31,18 +31,10 @@ public function create(ConnectionFactory $factory, Config $config, RouteCollecti
$knownDrivers = Resources::getKnownDrivers();
if ($driverInfo = $this->findDriverInfo($dsn, $knownDrivers)) {
- throw new \LogicException(sprintf(
- 'To use given scheme "%s" a package has to be installed. Run "composer req %s" to add it.',
- $dsn->getScheme(),
- implode(' ', $driverInfo['packages'])
- ));
+ throw new \LogicException(sprintf('To use given scheme "%s" a package has to be installed. Run "composer req %s" to add it.', $dsn->getScheme(), implode(' ', $driverInfo['packages'])));
}
- throw new \LogicException(sprintf(
- 'A given scheme "%s" is not supported. Maybe it is a custom driver, make sure you registered it with "%s::addDriver".',
- $dsn->getScheme(),
- Resources::class
- ));
+ throw new \LogicException(sprintf('A given scheme "%s" is not supported. Maybe it is a custom driver, make sure you registered it with "%s::addDriver".', $dsn->getScheme(), Resources::class));
}
private function findDriverInfo(Dsn $dsn, array $factories): ?array
@@ -84,7 +76,7 @@ private function findDriverInfo(Dsn $dsn, array $factories): ?array
private function createRabbitMqStompDriver(ConnectionFactory $factory, Dsn $dsn, Config $config, RouteCollection $collection): RabbitMqStompDriver
{
$defaultManagementHost = $dsn->getHost() ?: $config->getTransportOption('host', 'localhost');
- $managementVast = ltrim($dsn->getPath(), '/') ?: $config->getTransportOption('vhost', '/');
+ $managementVast = ltrim((string) $dsn->getPath(), '/') ?: $config->getTransportOption('vhost', '/');
$managementClient = StompManagementClient::create(
urldecode($managementVast),
diff --git a/pkg/enqueue/Symfony/Client/ConsumeCommand.php b/pkg/enqueue/Symfony/Client/ConsumeCommand.php
index 39af6d592..b6a283b9f 100644
--- a/pkg/enqueue/Symfony/Client/ConsumeCommand.php
+++ b/pkg/enqueue/Symfony/Client/ConsumeCommand.php
@@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
try {
$consumer = $this->getQueueConsumer($client);
} catch (NotFoundExceptionInterface $e) {
- throw new \LogicException(sprintf('Client "%s" is not supported.', $client), null, $e);
+ throw new \LogicException(message: sprintf('Client "%s" is not supported.', $client), previous: $e);
}
$driver = $this->getDriver($client);
diff --git a/pkg/enqueue/Symfony/Client/DependencyInjection/ClientFactory.php b/pkg/enqueue/Symfony/Client/DependencyInjection/ClientFactory.php
index 2eede31b7..4e8fefd71 100644
--- a/pkg/enqueue/Symfony/Client/DependencyInjection/ClientFactory.php
+++ b/pkg/enqueue/Symfony/Client/DependencyInjection/ClientFactory.php
@@ -79,7 +79,7 @@ public static function getConfiguration(bool $debug, string $name = 'client'): N
->info('The array contains driver specific options')
->ignoreExtraKeys(false)
->end()
- ->end()->end()
+ ->end()
;
return $builder;
diff --git a/pkg/enqueue/Symfony/Client/ProduceCommand.php b/pkg/enqueue/Symfony/Client/ProduceCommand.php
index 6064f82e1..5db37a94e 100644
--- a/pkg/enqueue/Symfony/Client/ProduceCommand.php
+++ b/pkg/enqueue/Symfony/Client/ProduceCommand.php
@@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
try {
$producer = $this->getProducer($client);
} catch (NotFoundExceptionInterface $e) {
- throw new \LogicException(sprintf('Client "%s" is not supported.', $client), null, $e);
+ throw new \LogicException(message: sprintf('Client "%s" is not supported.', $client), previous: $e);
}
if ($topic) {
diff --git a/pkg/enqueue/Symfony/Client/RoutesCommand.php b/pkg/enqueue/Symfony/Client/RoutesCommand.php
index 59a4a4d98..61c503164 100644
--- a/pkg/enqueue/Symfony/Client/RoutesCommand.php
+++ b/pkg/enqueue/Symfony/Client/RoutesCommand.php
@@ -65,7 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
try {
$this->driver = $this->getDriver($input->getOption('client'));
} catch (NotFoundExceptionInterface $e) {
- throw new \LogicException(sprintf('Client "%s" is not supported.', $input->getOption('client')), null, $e);
+ throw new \LogicException(message: sprintf('Client "%s" is not supported.', $input->getOption('client')), previous: $e);
}
$routes = $this->driver->getRouteCollection()->all();
diff --git a/pkg/enqueue/Symfony/Client/SetupBrokerCommand.php b/pkg/enqueue/Symfony/Client/SetupBrokerCommand.php
index 68aebb582..6cdb45124 100644
--- a/pkg/enqueue/Symfony/Client/SetupBrokerCommand.php
+++ b/pkg/enqueue/Symfony/Client/SetupBrokerCommand.php
@@ -57,7 +57,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
try {
$this->getDriver($client)->setupBroker(new ConsoleLogger($output));
} catch (NotFoundExceptionInterface $e) {
- throw new \LogicException(sprintf('Client "%s" is not supported.', $client), null, $e);
+ throw new \LogicException(message: sprintf('Client "%s" is not supported.', $client), previous: $e);
}
$output->writeln('Broker set up');
diff --git a/pkg/enqueue/Symfony/Consumption/ConfigurableConsumeCommand.php b/pkg/enqueue/Symfony/Consumption/ConfigurableConsumeCommand.php
index 234eb0497..aa673cd1a 100644
--- a/pkg/enqueue/Symfony/Consumption/ConfigurableConsumeCommand.php
+++ b/pkg/enqueue/Symfony/Consumption/ConfigurableConsumeCommand.php
@@ -81,7 +81,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
try {
$consumer = $this->getQueueConsumer($transport);
} catch (NotFoundExceptionInterface $e) {
- throw new \LogicException(sprintf('Transport "%s" is not supported.', $transport), null, $e);
+ throw new \LogicException(message: sprintf('Transport "%s" is not supported.', $transport), previous: $e);
}
$this->setQueueConsumerOptions($consumer, $input);
diff --git a/pkg/enqueue/Symfony/Consumption/ConsumeCommand.php b/pkg/enqueue/Symfony/Consumption/ConsumeCommand.php
index 870cc5f60..8cc9e54a4 100644
--- a/pkg/enqueue/Symfony/Consumption/ConsumeCommand.php
+++ b/pkg/enqueue/Symfony/Consumption/ConsumeCommand.php
@@ -67,7 +67,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
// QueueConsumer must be pre configured outside of the command!
$consumer = $this->getQueueConsumer($transport);
} catch (NotFoundExceptionInterface $e) {
- throw new \LogicException(sprintf('Transport "%s" is not supported.', $transport), null, $e);
+ throw new \LogicException(message: sprintf('Transport "%s" is not supported.', $transport), previous: $e);
}
$this->setQueueConsumerOptions($consumer, $input);
diff --git a/pkg/enqueue/Tests/Mocks/JsonSerializableObject.php b/pkg/enqueue/Tests/Mocks/JsonSerializableObject.php
index 5b74106dc..e1cc91475 100644
--- a/pkg/enqueue/Tests/Mocks/JsonSerializableObject.php
+++ b/pkg/enqueue/Tests/Mocks/JsonSerializableObject.php
@@ -4,7 +4,7 @@
class JsonSerializableObject implements \JsonSerializable
{
- public function jsonSerialize()
+ public function jsonSerialize(): array
{
return ['foo' => 'fooVal'];
}
diff --git a/pkg/enqueue/Tests/Util/Fixtures/JsonSerializableClass.php b/pkg/enqueue/Tests/Util/Fixtures/JsonSerializableClass.php
index b612978e7..26a8cb569 100644
--- a/pkg/enqueue/Tests/Util/Fixtures/JsonSerializableClass.php
+++ b/pkg/enqueue/Tests/Util/Fixtures/JsonSerializableClass.php
@@ -6,7 +6,7 @@ class JsonSerializableClass implements \JsonSerializable
{
public $keyPublic = 'public';
- public function jsonSerialize()
+ public function jsonSerialize(): array
{
return [
'key' => 'value',
diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json
index 0da00ee4b..4299493ad 100644
--- a/pkg/enqueue/composer.json
+++ b/pkg/enqueue/composer.json
@@ -6,7 +6,7 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/amqp-interop": "^0.8.2",
"queue-interop/queue-interop": "^0.8",
"enqueue/null": "^0.10",
@@ -16,13 +16,13 @@
"psr/container": "^1.1 || ^2.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
- "symfony/console": "^5.41|^6.0",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/config": "^5.4|^6.0",
- "symfony/event-dispatcher": "^5.4|^6.0",
- "symfony/http-kernel": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0",
+ "phpunit/phpunit": "^9.6.15",
+ "symfony/console": "^5.41|^6.0|^7.0",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/config": "^5.4|^6.0|^7.0",
+ "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+ "symfony/http-kernel": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0",
"enqueue/amqp-ext": "0.10.x-dev",
"enqueue/amqp-lib": "0.10.x-dev",
"enqueue/amqp-bunny": "0.10.x-dev",
@@ -42,9 +42,9 @@
"enqueue/dsn": "0.10.x-dev"
},
"suggest": {
- "symfony/console": "^5.4|^6.0 If you want to use cli commands",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/config": "^5.4|^6.0",
+ "symfony/console": "^5.4|^6.0|^7.0 If you want to use cli commands",
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/config": "^5.4|^6.0|^7.0",
"enqueue/amqp-ext": "AMQP transport (based on php extension)",
"enqueue/stomp": "STOMP transport",
"enqueue/fs": "Filesystem transport",
diff --git a/pkg/fs/.github/workflows/ci.yml b/pkg/fs/.github/workflows/ci.yml
index 65cfbbb2d..4e754688d 100644
--- a/pkg/fs/.github/workflows/ci.yml
+++ b/pkg/fs/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json
index b44900541..0666e429c 100644
--- a/pkg/fs/composer.json
+++ b/pkg/fs/composer.json
@@ -6,19 +6,19 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8",
"enqueue/dsn": "^0.10",
- "symfony/filesystem": "^5.4|^6.0",
+ "symfony/filesystem": "^5.4|^6.0|^7.0",
"makasim/temp-file": "^0.2@stable"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/null": "0.10.x-dev",
"enqueue/test": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2",
- "symfony/dependency-injection": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0"
+ "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0"
},
"support": {
"email": "opensource@forma-pro.com",
diff --git a/pkg/gearman/.github/workflows/ci.yml b/pkg/gearman/.github/workflows/ci.yml
index 28ae81b0f..1b3bb032b 100644
--- a/pkg/gearman/.github/workflows/ci.yml
+++ b/pkg/gearman/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json
index eb06f62e3..b0b1e01f1 100644
--- a/pkg/gearman/composer.json
+++ b/pkg/gearman/composer.json
@@ -6,12 +6,12 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"ext-gearman": "^2.0",
"queue-interop/queue-interop": "^0.8"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
diff --git a/pkg/gps/.github/workflows/ci.yml b/pkg/gps/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/gps/.github/workflows/ci.yml
+++ b/pkg/gps/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json
index 2da6b7468..485db2598 100644
--- a/pkg/gps/composer.json
+++ b/pkg/gps/composer.json
@@ -6,13 +6,13 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8",
"google/cloud-pubsub": "^1.4.3",
"enqueue/dsn": "^0.10"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
},
diff --git a/pkg/job-queue/.github/workflows/ci.yml b/pkg/job-queue/.github/workflows/ci.yml
index 28a9a9c02..03b088ebe 100644
--- a/pkg/job-queue/.github/workflows/ci.yml
+++ b/pkg/job-queue/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/job-queue/Test/DbalPersistedConnection.php b/pkg/job-queue/Test/DbalPersistedConnection.php
index add0f3ddc..64ffe46c4 100644
--- a/pkg/job-queue/Test/DbalPersistedConnection.php
+++ b/pkg/job-queue/Test/DbalPersistedConnection.php
@@ -22,9 +22,6 @@ class DbalPersistedConnection extends Connection
*/
protected static $persistedTransactionNestingLevels;
- /**
- * {@inheritdoc}
- */
public function connect()
{
if ($this->isConnected()) {
@@ -41,28 +38,19 @@ public function connect()
return true;
}
- /**
- * {@inheritdoc}
- */
public function beginTransaction()
{
- $this->wrapTransactionNestingLevel('beginTransaction');
+ return $this->wrapTransactionNestingLevel('beginTransaction');
}
- /**
- * {@inheritdoc}
- */
public function commit()
{
- $this->wrapTransactionNestingLevel('commit');
+ return $this->wrapTransactionNestingLevel('commit');
}
- /**
- * {@inheritdoc}
- */
public function rollBack()
{
- $this->wrapTransactionNestingLevel('rollBack');
+ return $this->wrapTransactionNestingLevel('rollBack');
}
/**
@@ -135,14 +123,14 @@ private function setTransactionNestingLevel($level)
*
* @throws \Exception
*/
- private function wrapTransactionNestingLevel($method)
+ private function wrapTransactionNestingLevel($method): bool
{
$e = null;
$this->setTransactionNestingLevel($this->getPersistedTransactionNestingLevel());
try {
- call_user_func(['parent', $method]);
+ $result = call_user_func([parent::class, $method]);
} catch (\Exception $e) {
}
@@ -151,5 +139,7 @@ private function wrapTransactionNestingLevel($method)
if ($e) {
throw $e;
}
+
+ return $result;
}
}
diff --git a/pkg/job-queue/Tests/Functional/Entity/Job.php b/pkg/job-queue/Tests/Functional/Entity/Job.php
index ccbf4fda9..934302721 100644
--- a/pkg/job-queue/Tests/Functional/Entity/Job.php
+++ b/pkg/job-queue/Tests/Functional/Entity/Job.php
@@ -3,99 +3,67 @@
namespace Enqueue\JobQueue\Tests\Functional\Entity;
use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\Mapping as ORM;
use Enqueue\JobQueue\Job as BaseJob;
-/**
- * @ORM\Entity
- * @ORM\Table(name="enqueue_job_queue")
- */
class Job extends BaseJob
{
/**
* @var int
- *
- * @ORM\Column(name="id", type="integer")
- * @ORM\Id
- * @ORM\GeneratedValue(strategy="AUTO")
*/
protected $id;
/**
* @var string
- *
- * @ORM\Column(name="owner_id", type="string", nullable=true)
*/
protected $ownerId;
/**
* @var string
- *
- * @ORM\Column(name="name", type="string", nullable=false)
*/
protected $name;
/**
* @var string
- *
- * @ORM\Column(name="status", type="string", nullable=false)
*/
protected $status;
/**
* @var bool
- *
- * @ORM\Column(name="interrupted", type="boolean")
*/
protected $interrupted;
/**
* @var bool;
- *
- * @ORM\Column(name="`unique`", type="boolean")
*/
protected $unique;
/**
* @var Job
- *
- * @ORM\ManyToOne(targetEntity="Job", inversedBy="childJobs")
- * @ORM\JoinColumn(name="root_job_id", referencedColumnName="id", onDelete="CASCADE")
*/
protected $rootJob;
/**
* @var Job[]
- *
- * @ORM\OneToMany(targetEntity="Job", mappedBy="rootJob")
*/
protected $childJobs;
/**
* @var \DateTime
- *
- * @ORM\Column(name="created_at", type="datetime", nullable=false)
*/
protected $createdAt;
/**
* @var \DateTime
- *
- * @ORM\Column(name="started_at", type="datetime", nullable=true)
*/
protected $startedAt;
/**
* @var \DateTime
- *
- * @ORM\Column(name="stopped_at", type="datetime", nullable=true)
*/
protected $stoppedAt;
/**
* @var array
- *
- * @ORM\Column(name="data", type="json", nullable=true)
*/
protected $data;
diff --git a/pkg/job-queue/Tests/Functional/Entity/JobUnique.php b/pkg/job-queue/Tests/Functional/Entity/JobUnique.php
index 4d8a33745..b6b771e0f 100644
--- a/pkg/job-queue/Tests/Functional/Entity/JobUnique.php
+++ b/pkg/job-queue/Tests/Functional/Entity/JobUnique.php
@@ -2,17 +2,7 @@
namespace Enqueue\JobQueue\Tests\Functional\Entity;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="enqueue_job_queue_unique")
- */
class JobUnique
{
- /**
- * @ORM\Id
- * @ORM\Column(name="name", type="string", nullable=false)
- */
protected $name;
}
diff --git a/pkg/job-queue/Tests/Functional/app/AppKernel.php b/pkg/job-queue/Tests/Functional/app/AppKernel.php
index 3cef602c2..e8f2af933 100644
--- a/pkg/job-queue/Tests/Functional/app/AppKernel.php
+++ b/pkg/job-queue/Tests/Functional/app/AppKernel.php
@@ -1,17 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pkg/job-queue/Tests/Functional/mapping/JobUnique.orm.xml b/pkg/job-queue/Tests/Functional/mapping/JobUnique.orm.xml
new file mode 100644
index 000000000..096687f29
--- /dev/null
+++ b/pkg/job-queue/Tests/Functional/mapping/JobUnique.orm.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json
index 55d37d5da..10f9dc8cd 100644
--- a/pkg/job-queue/composer.json
+++ b/pkg/job-queue/composer.json
@@ -6,7 +6,7 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"enqueue/enqueue": "^0.10",
"enqueue/null": "^0.10",
"queue-interop/queue-interop": "^0.8",
@@ -14,13 +14,13 @@
"doctrine/dbal": "^2.12 | ^3.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"doctrine/doctrine-bundle": "^2.3.2",
- "symfony/browser-kit": "^5.4|^6.0",
- "symfony/expression-language": "^5.4|^6.0",
- "symfony/framework-bundle": "^5.4|^6.0",
- "symfony/yaml": "^5.4|^6.0"
+ "symfony/browser-kit": "^5.4|^6.0|^7.0",
+ "symfony/expression-language": "^5.4|^6.0|^7.0",
+ "symfony/framework-bundle": "^5.4|^6.0|^7.0",
+ "symfony/yaml": "^5.4|^6.0|^7.0"
},
"support": {
"email": "opensource@forma-pro.com",
diff --git a/pkg/mongodb/.github/workflows/ci.yml b/pkg/mongodb/.github/workflows/ci.yml
index 415baf634..8feb0e9eb 100644
--- a/pkg/mongodb/.github/workflows/ci.yml
+++ b/pkg/mongodb/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/mongodb/composer.json b/pkg/mongodb/composer.json
index 775452949..99e47afb1 100644
--- a/pkg/mongodb/composer.json
+++ b/pkg/mongodb/composer.json
@@ -10,13 +10,13 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8",
"mongodb/mongodb": "^1.2",
"ext-mongodb": "^1.5"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"queue-interop/queue-spec": "^0.6.2",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev"
diff --git a/pkg/monitoring/.github/workflows/ci.yml b/pkg/monitoring/.github/workflows/ci.yml
index 5448d7b1a..7218b3b23 100644
--- a/pkg/monitoring/.github/workflows/ci.yml
+++ b/pkg/monitoring/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/monitoring/composer.json b/pkg/monitoring/composer.json
index e19da2fa9..a8dde648d 100644
--- a/pkg/monitoring/composer.json
+++ b/pkg/monitoring/composer.json
@@ -6,12 +6,12 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"enqueue/enqueue": "^0.10",
"enqueue/dsn": "^0.10"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"influxdb/influxdb-php": "^1.14",
"datadog/php-datadogstatsd": "^1.3",
diff --git a/pkg/null/.github/workflows/ci.yml b/pkg/null/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/null/.github/workflows/ci.yml
+++ b/pkg/null/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/null/composer.json b/pkg/null/composer.json
index 0f4ac4eeb..4f3a121ef 100644
--- a/pkg/null/composer.json
+++ b/pkg/null/composer.json
@@ -6,11 +6,11 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
},
diff --git a/pkg/pheanstalk/.github/workflows/ci.yml b/pkg/pheanstalk/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/pheanstalk/.github/workflows/ci.yml
+++ b/pkg/pheanstalk/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json
index 8d920a4ff..e7d1f0dd6 100644
--- a/pkg/pheanstalk/composer.json
+++ b/pkg/pheanstalk/composer.json
@@ -6,12 +6,12 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"pda/pheanstalk": "^3.1",
"queue-interop/queue-interop": "^0.8"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
diff --git a/pkg/rdkafka/.github/workflows/ci.yml b/pkg/rdkafka/.github/workflows/ci.yml
index 9e0ceb121..8056d03ba 100644
--- a/pkg/rdkafka/.github/workflows/ci.yml
+++ b/pkg/rdkafka/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json
index 068b9d204..40c532bc6 100644
--- a/pkg/rdkafka/composer.json
+++ b/pkg/rdkafka/composer.json
@@ -6,12 +6,12 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"ext-rdkafka": "^4.0|^5.0|^6.0",
"queue-interop/queue-interop": "^0.8.1"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2",
diff --git a/pkg/redis/.github/workflows/ci.yml b/pkg/redis/.github/workflows/ci.yml
index 57d501bee..13d289db0 100644
--- a/pkg/redis/.github/workflows/ci.yml
+++ b/pkg/redis/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/redis/PhpRedis.php b/pkg/redis/PhpRedis.php
index d6f5baffa..023b87563 100644
--- a/pkg/redis/PhpRedis.php
+++ b/pkg/redis/PhpRedis.php
@@ -96,18 +96,14 @@ public function connect(): void
$supportedSchemes = ['redis', 'rediss', 'tcp', 'unix'];
if (false == in_array($this->config['scheme'], $supportedSchemes, true)) {
- throw new \LogicException(sprintf(
- 'The given scheme protocol "%s" is not supported by php extension. It must be one of "%s"',
- $this->config['scheme'],
- implode('", "', $supportedSchemes)
- ));
+ throw new \LogicException(sprintf('The given scheme protocol "%s" is not supported by php extension. It must be one of "%s"', $this->config['scheme'], implode('", "', $supportedSchemes)));
}
$this->redis = new \Redis();
$connectionMethod = $this->config['persistent'] ? 'pconnect' : 'connect';
- $host = $this->config['scheme'] === 'rediss' ? 'tls://' . $this->config['host'] : $this->config['host'];
+ $host = 'rediss' === $this->config['scheme'] ? 'tls://'.$this->config['host'] : $this->config['host'];
$result = call_user_func(
[$this->redis, $connectionMethod],
@@ -115,8 +111,8 @@ public function connect(): void
$this->config['port'],
$this->config['timeout'],
$this->config['persistent'] ? ($this->config['phpredis_persistent_id'] ?? null) : null,
- $this->config['phpredis_retry_interval'] ?? null,
- $this->config['read_write_timeout']
+ (int) ($this->config['phpredis_retry_interval'] ?? null),
+ (int) $this->config['read_write_timeout']
);
if (false == $result) {
diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json
index 4742b3385..263eca52b 100644
--- a/pkg/redis/composer.json
+++ b/pkg/redis/composer.json
@@ -6,13 +6,13 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8",
"enqueue/dsn": "^0.10",
"ramsey/uuid": "^3.5|^4"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"predis/predis": "^1.1",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
diff --git a/pkg/simple-client/.github/workflows/ci.yml b/pkg/simple-client/.github/workflows/ci.yml
index 6b24b0f30..14eacfd6b 100644
--- a/pkg/simple-client/.github/workflows/ci.yml
+++ b/pkg/simple-client/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json
index 7cb07b6b3..be01585c8 100644
--- a/pkg/simple-client/composer.json
+++ b/pkg/simple-client/composer.json
@@ -6,19 +6,19 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"enqueue/enqueue": "^0.10",
"queue-interop/amqp-interop": "^0.8.2",
"queue-interop/queue-interop": "^0.8",
- "symfony/config": "^5.4|^6.0"
+ "symfony/config": "^5.4|^6.0|^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/amqp-ext": "0.10.x-dev",
"enqueue/fs": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
- "symfony/yaml": "^5.4|^6.0"
+ "symfony/yaml": "^5.4|^6.0|^7.0"
},
"support": {
"email": "opensource@forma-pro.com",
diff --git a/pkg/sns/.github/workflows/ci.yml b/pkg/sns/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/sns/.github/workflows/ci.yml
+++ b/pkg/sns/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/sns/composer.json b/pkg/sns/composer.json
index 297fac858..8da57e7c5 100644
--- a/pkg/sns/composer.json
+++ b/pkg/sns/composer.json
@@ -6,13 +6,13 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8",
"enqueue/dsn": "^0.10",
"aws/aws-sdk-php": "~3.155"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
},
diff --git a/pkg/snsqs/.github/workflows/ci.yml b/pkg/snsqs/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/snsqs/.github/workflows/ci.yml
+++ b/pkg/snsqs/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/snsqs/Tests/Spec/SnsQsFactoryTrait.php b/pkg/snsqs/Tests/Spec/SnsQsFactoryTrait.php
index efc4a7046..a83f70b8d 100644
--- a/pkg/snsqs/Tests/Spec/SnsQsFactoryTrait.php
+++ b/pkg/snsqs/Tests/Spec/SnsQsFactoryTrait.php
@@ -33,13 +33,18 @@ protected function createSnsQsContext(): SnsQsContext
protected function createSnsQsQueue(string $queueName): SnsQsQueue
{
- $queueName = $queueName.time();
+ $queueName .= time();
$this->snsQsQueue = $this->snsQsContext->createQueue($queueName);
$this->snsQsContext->declareQueue($this->snsQsQueue);
+ echo "Declared queue $queueName\n";
+ ob_flush();
+ sleep(1);
if ($this->snsQsTopic) {
$this->snsQsContext->bind($this->snsQsTopic, $this->snsQsQueue);
+ echo "Bound queue $queueName to topic\n";
+ ob_flush();
}
return $this->snsQsQueue;
@@ -47,7 +52,7 @@ protected function createSnsQsQueue(string $queueName): SnsQsQueue
protected function createSnsQsTopic(string $topicName): SnsQsTopic
{
- $topicName = $topicName.time();
+ $topicName .= time();
$this->snsQsTopic = $this->snsQsContext->createTopic($topicName);
$this->snsQsContext->declareTopic($this->snsQsTopic);
diff --git a/pkg/snsqs/Tests/Spec/SnsQsSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/snsqs/Tests/Spec/SnsQsSendToTopicAndReceiveNoWaitFromQueueTest.php
index e370c1f32..433fcf3a7 100644
--- a/pkg/snsqs/Tests/Spec/SnsQsSendToTopicAndReceiveNoWaitFromQueueTest.php
+++ b/pkg/snsqs/Tests/Spec/SnsQsSendToTopicAndReceiveNoWaitFromQueueTest.php
@@ -8,6 +8,7 @@
/**
* @group functional
+ *
* @retry 5
*/
class SnsQsSendToTopicAndReceiveNoWaitFromQueueTest extends SendToTopicAndReceiveNoWaitFromQueueSpec
diff --git a/pkg/snsqs/composer.json b/pkg/snsqs/composer.json
index 27a4e038e..6b40c8431 100644
--- a/pkg/snsqs/composer.json
+++ b/pkg/snsqs/composer.json
@@ -6,14 +6,14 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8",
"enqueue/dsn": "^0.10",
"enqueue/sns": "^0.10",
"enqueue/sqs": "^0.10"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
},
diff --git a/pkg/sqs/.github/workflows/ci.yml b/pkg/sqs/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/sqs/.github/workflows/ci.yml
+++ b/pkg/sqs/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json
index d48b89015..a88ba3ba6 100644
--- a/pkg/sqs/composer.json
+++ b/pkg/sqs/composer.json
@@ -6,13 +6,13 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8",
"enqueue/dsn": "^0.10",
"aws/aws-sdk-php": "~3.155"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
},
diff --git a/pkg/stomp/.github/workflows/ci.yml b/pkg/stomp/.github/workflows/ci.yml
index 0492424e8..38112779e 100644
--- a/pkg/stomp/.github/workflows/ci.yml
+++ b/pkg/stomp/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json
index 461205852..2fd956ea1 100644
--- a/pkg/stomp/composer.json
+++ b/pkg/stomp/composer.json
@@ -6,7 +6,7 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"enqueue/dsn": "^0.10",
"stomp-php/stomp-php": "^4.5|^5.0",
"queue-interop/queue-interop": "^0.8",
@@ -17,7 +17,7 @@
"php-http/discovery": "^1.13"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"
diff --git a/pkg/wamp/.github/workflows/ci.yml b/pkg/wamp/.github/workflows/ci.yml
index 5448d7b1a..7218b3b23 100644
--- a/pkg/wamp/.github/workflows/ci.yml
+++ b/pkg/wamp/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4', '8.0', '8.1', '8.2']
+ php: ['8.0', '8.1', '8.2']
name: PHP ${{ matrix.php }} tests
diff --git a/pkg/wamp/composer.json b/pkg/wamp/composer.json
index be0321c6f..a03d9a84d 100644
--- a/pkg/wamp/composer.json
+++ b/pkg/wamp/composer.json
@@ -6,7 +6,7 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
- "php": "^7.4|^8.0",
+ "php": "^8.0",
"queue-interop/queue-interop": "^0.8.1",
"enqueue/dsn": "^0.10.8",
"thruway/client": "^0.5.5",
@@ -17,7 +17,7 @@
"react/promise": "^2.8"
},
"require-dev": {
- "phpunit/phpunit": "^9.5",
+ "phpunit/phpunit": "^9.6.15",
"enqueue/test": "0.10.x-dev",
"enqueue/null": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2"