Add Symfony 7.0 to reqs and CI, drop 6.2 from CI; drop PHP 7.4

.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' }}

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",

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&region=us-east-1&endpoint=http://localstack:4576&version=latest
-      - SNS_DSN=sns:?key=key&secret=secret&region=us-east-1&endpoint=http://localstack:4575&version=latest
-      - SNSQS_DSN=snsqs:?key=key&secret=secret&region=us-east-1&sns_endpoint=http://localstack:4575&sqs_endpoint=http://localstack:4576&version=latest
+      - SQS_DSN=sqs:?key=key&secret=secret&region=us-east-1&endpoint=http://localstack:4566&version=latest
+      - SNS_DSN=sns:?key=key&secret=secret&region=us-east-1&endpoint=http://localstack:4566&version=latest
+      - SNSQS_DSN=snsqs:?key=key&secret=secret&region=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'

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

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

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
 

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;

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)
             );

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"

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
 

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
         );
     }