From 0ba34ede64c077643e403f91b35962493a5a9f2a Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 11 Feb 2021 02:35:46 +0200
Subject: [PATCH 01/27] Split tests into different matrices

---
 .github/workflows/ci.yml | 125 +++++++++++----------------------------
 1 file changed, 33 insertions(+), 92 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9e9887e2b..10a614e43 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,92 +59,14 @@ jobs:
       - run: ./bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff -v --path-mode=intersection -- ${{ env.GIT_DIFF_FILTERED }}
         if: env.GIT_DIFF_FILTERED
 
-  tests:
+  unit_tests:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4']
-        include:
-          - php: 7.3
-            symfony_version: 4.3.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: 7.3
-            symfony_version: 4.4.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: 7.3
-            symfony_version: 5.0.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: 7.4
-            symfony_version: 4.3.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: 7.4
-            symfony_version: 4.4.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: 7.4
-            symfony_version: 5.0.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: 7.4
-            symfony_version: 5.2.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: 7.3 # same as in the container
-            symfony_version: 4.3.*
-            unit_tests: false
-            functional_tests: true
-            rdkafka_tests: false
-            prepare_container: true
-          - php: 7.3 # same as in the container
-            symfony_version: 5.0.*
-            unit_tests: false
-            functional_tests: true
-            rdkafka_tests: false
-            prepare_container: true
-          - php: 7.3 # same as in the container
-            symfony_version: 4.3.*
-            unit_tests: false
-            functional_tests: false
-            rdkafka_tests: true
-            prepare_container: true
-          - php: "8.0"
-            symfony_version: 5.2.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: "8.0"
-            symfony_version: 5.2.*
-            unit_tests: false
-            functional_tests: true
-            rdkafka_tests: false
-            prepare_container: true
-          - php: "8.0"
-            symfony_version: 5.2.*
-            unit_tests: false
-            rdkafka_tests: true
-            prepare_container: true
-
-    name: PHP ${{ matrix.php }} tests on Sf ${{ matrix.symfony_version }}, unit=${{ matrix.unit_tests }}, func=${{ matrix.functional_tests }}, rdkafka=${{ matrix.rdkafka_tests }}
+        php: ['7.3', '7.4']
+        symfony_version: ['4.3.*', '4.4.*', '5.0.*']
+    name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}
 
     steps:
       - uses: actions/checkout@v2
@@ -162,16 +84,35 @@ jobs:
 
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 
-      - run: bin/dev -b
-        env:
-          PHP_VERSION: "${{ matrix.php }}"
-        if: matrix.prepare_container
-
       - run: bin/phpunit --exclude-group=functional
-        if: matrix.unit_tests
 
-      - run: bin/test.sh --exclude-group=rdkafka
-        if: matrix.functional_tests
+  functional_tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.3'] # same as in the container
+        symfony_version: ['4.3.*', '5.0.*']
+        rdkafka_action: ['exclude-group', 'group']
+
+    name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+          extensions: mongodb, redis, :xdebug
+          ini-values: memory_limit=2048M
+
+      - run: php ./bin/fix-symfony-version.php "${{ matrix.symfony_version }}"
+
+      - uses: "ramsey/composer-install@v1"
+
+      - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
+
+      - run: bin/dev -b
 
-      - run: bin/test.sh --group=rdkafka
-        if: matrix.rdkafka_tests
+      - run: bin/test.sh --${{ matrix.rdkafka_action }}=rdkafka

From bae2a729adb2f9d72f566cc1a4d5a4b1ab027905 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 11 Feb 2021 02:43:01 +0200
Subject: [PATCH 02/27] Add lowest and highest dependencies to the matrix

---
 .github/workflows/ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10a614e43..d411b9593 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,7 +66,8 @@ jobs:
       matrix:
         php: ['7.3', '7.4']
         symfony_version: ['4.3.*', '4.4.*', '5.0.*']
-    name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}
+        dependencies: ['lowest', 'highest']
+    name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
 
     steps:
       - uses: actions/checkout@v2
@@ -81,6 +82,8 @@ jobs:
       - run: php ./bin/fix-symfony-version.php "${{ matrix.symfony_version }}"
 
       - uses: "ramsey/composer-install@v1"
+        with:
+          dependency-versions: ${{ matrix.dependencies }}
 
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 
@@ -93,9 +96,10 @@ jobs:
       matrix:
         php: ['7.3'] # same as in the container
         symfony_version: ['4.3.*', '5.0.*']
+        dependencies: ['lowest', 'highest']
         rdkafka_action: ['exclude-group', 'group']
 
-    name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}
+    name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}, deps=${{ matrix.dependencies }}
 
     steps:
       - uses: actions/checkout@v2
@@ -110,6 +114,8 @@ jobs:
       - run: php ./bin/fix-symfony-version.php "${{ matrix.symfony_version }}"
 
       - uses: "ramsey/composer-install@v1"
+        with:
+          dependency-versions: ${{ matrix.dependencies }}
 
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 

From cb27166ebc34e9502f91064030f4455a589a8614 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 11 Feb 2021 03:45:55 +0200
Subject: [PATCH 03/27] Bump some minimal deps

---
 composer.json                | 34 ++++++++++++++++------------------
 pkg/amqp-bunny/composer.json |  2 +-
 pkg/amqp-ext/composer.json   |  2 +-
 pkg/amqp-lib/composer.json   |  2 +-
 pkg/dbal/composer.json       | 10 ++++------
 pkg/enqueue/composer.json    |  2 +-
 pkg/fs/composer.json         |  2 +-
 pkg/gearman/composer.json    |  2 +-
 pkg/gps/composer.json        |  2 +-
 pkg/mongodb/composer.json    |  2 +-
 pkg/null/composer.json       |  2 +-
 pkg/pheanstalk/composer.json |  2 +-
 pkg/rdkafka/composer.json    |  2 +-
 pkg/redis/composer.json      |  4 ++--
 pkg/sns/composer.json        |  2 +-
 pkg/snsqs/composer.json      |  2 +-
 pkg/sqs/composer.json        |  2 +-
 pkg/stomp/composer.json      |  2 +-
 pkg/wamp/composer.json       |  2 +-
 19 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/composer.json b/composer.json
index 9d899a5f4..d0d308b48 100644
--- a/composer.json
+++ b/composer.json
@@ -23,20 +23,21 @@
     "ext-rdkafka": "^3.0.3|^4.0|^5.0",
 
     "queue-interop/amqp-interop": "^0.8",
-    "queue-interop/queue-interop": "^0.7|^0.8",
+    "queue-interop/queue-interop": "^0.8",
     "bunny/bunny": "^0.2.4|^0.3|^0.4",
     "php-amqplib/php-amqplib": "^2.7",
     "doctrine/dbal": "^2.12",
-    "ramsey/uuid": "^2|^3.5|^4.0",
-    "psr/log": "^1",
+    "ramsey/uuid": "^3.5|^4.0",
+    "psr/log": "^1.1",
     "psr/container": "^1",
     "makasim/temp-file": "^0.2",
     "google/cloud-pubsub": "^0.6.1|^1.0",
     "doctrine/orm": "~2.4",
+    "doctrine/persistence": "^1.3.3|^2.0",
     "mongodb/mongodb": "^1.2",
     "pda/pheanstalk": "^3",
     "aws/aws-sdk-php": "^3.26",
-    "stomp-php/stomp-php": "^4|^5",
+    "stomp-php/stomp-php": "^4.1.4|^5",
     "php-http/guzzle7-adapter": "^0.1.1",
     "php-http/client-common": "^2.2.1",
     "richardfullmer/rabbitmq-management-api": "^2.1.1",
@@ -50,17 +51,17 @@
     "ext-pcntl": "*",
     "phpunit/phpunit": "^9.5",
     "phpstan/phpstan": "^0.12",
-    "queue-interop/queue-spec": "^0.6",
-    "symfony/browser-kit": "^3.4|^4",
-    "symfony/config": "^3.4|^4",
-    "symfony/process": "^3.4|^4",
-    "symfony/console": "^3.4|^4",
-    "symfony/dependency-injection": "^3.4|^4",
-    "symfony/event-dispatcher": "^3.4|^4",
-    "symfony/expression-language": "^3.4|^4",
-    "symfony/http-kernel": "^3.4|^4",
-    "symfony/filesystem": "^3.4|^4",
-    "symfony/framework-bundle": "^3.4|^4",
+    "queue-interop/queue-spec": "^0.6.2",
+    "symfony/browser-kit": "^4.3|^5",
+    "symfony/config": "^4.3|^5",
+    "symfony/process": "^4.3|^5",
+    "symfony/console": "^4.3|^5",
+    "symfony/dependency-injection": "^4.3|^5",
+    "symfony/event-dispatcher": "^4.3|^5",
+    "symfony/expression-language": "^4.3|^5",
+    "symfony/http-kernel": "^4.3|^5",
+    "symfony/filesystem": "^4.3|^5",
+    "symfony/framework-bundle": "^4.3|^5",
     "symfony/yaml": "^4.3|^5",
     "empi89/php-amqp-stubs": "*@dev",
     "doctrine/doctrine-bundle": "~1.2|^2",
@@ -128,8 +129,5 @@
       "ext-mongo": "1.6.14"
     },
     "prefer-stable": true
-  },
-  "conflict": {
-    "doctrine/persistence": "<1.3.0"
   }
 }
diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json
index 9e7d83bb4..9b8ed2dbb 100644
--- a/pkg/amqp-bunny/composer.json
+++ b/pkg/amqp-bunny/composer.json
@@ -16,7 +16,7 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json
index 18b1f72cb..758f1ab64 100644
--- a/pkg/amqp-ext/composer.json
+++ b/pkg/amqp-ext/composer.json
@@ -16,7 +16,7 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6",
+        "queue-interop/queue-spec": "^0.6.2",
         "empi89/php-amqp-stubs": "*@dev"
     },
     "support": {
diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json
index 71867a911..be75355fc 100644
--- a/pkg/amqp-lib/composer.json
+++ b/pkg/amqp-lib/composer.json
@@ -16,7 +16,7 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json
index fc9c4a595..2e21bf936 100644
--- a/pkg/dbal/composer.json
+++ b/pkg/dbal/composer.json
@@ -9,17 +9,15 @@
         "php": "^7.3|^8.0",
         "queue-interop/queue-interop": "^0.8",
         "doctrine/dbal": "^2.12",
-        "ramsey/uuid": "^3|^4"
+        "doctrine/persistence": "^1.3.3|^2.0",
+        "ramsey/uuid": "^3.5|^4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
-    },
-    "conflict": {
-        "doctrine/persistence": "<1.3.0"
-    },
+        "queue-interop/queue-spec": "^0.6.2"
+    }
     "support": {
         "email": "opensource@forma-pro.com",
         "issues": "https://github.com/php-enqueue/enqueue-dev/issues",
diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json
index 3c525f510..09822cf97 100644
--- a/pkg/enqueue/composer.json
+++ b/pkg/enqueue/composer.json
@@ -11,7 +11,7 @@
         "queue-interop/queue-interop": "^0.8",
         "enqueue/null": "^0.10",
         "enqueue/dsn": "^0.10",
-        "ramsey/uuid": "^2|^3.5|^4",
+        "ramsey/uuid": "^3.5|^4",
         "psr/log": "^1",
         "psr/container": "^1"
     },
diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json
index e2b8119f1..54f91e378 100644
--- a/pkg/fs/composer.json
+++ b/pkg/fs/composer.json
@@ -16,7 +16,7 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/null": "0.10.x-dev",
         "enqueue/test": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6",
+        "queue-interop/queue-spec": "^0.6.2",
         "symfony/dependency-injection": "^4.3|^5",
         "symfony/yaml": "^4.3|^5"
     },
diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json
index b88fa542e..4dfdb3781 100644
--- a/pkg/gearman/composer.json
+++ b/pkg/gearman/composer.json
@@ -14,7 +14,7 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json
index 1d2ed5fd3..e8b1ed9d8 100644
--- a/pkg/gps/composer.json
+++ b/pkg/gps/composer.json
@@ -14,7 +14,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/mongodb/composer.json b/pkg/mongodb/composer.json
index a894816f7..8089c1a4f 100644
--- a/pkg/mongodb/composer.json
+++ b/pkg/mongodb/composer.json
@@ -17,7 +17,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5",
-    "queue-interop/queue-spec": "^0.6",
+    "queue-interop/queue-spec": "^0.6.2",
     "enqueue/test": "0.10.x-dev",
     "enqueue/null": "0.10.x-dev"
   },
diff --git a/pkg/null/composer.json b/pkg/null/composer.json
index bd00fb0b0..ab84dc36e 100644
--- a/pkg/null/composer.json
+++ b/pkg/null/composer.json
@@ -12,7 +12,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json
index 0274089a5..f07603657 100644
--- a/pkg/pheanstalk/composer.json
+++ b/pkg/pheanstalk/composer.json
@@ -14,7 +14,7 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json
index 7128a525f..5743a7d17 100644
--- a/pkg/rdkafka/composer.json
+++ b/pkg/rdkafka/composer.json
@@ -14,7 +14,7 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6",
+        "queue-interop/queue-spec": "^0.6.2",
         "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0"
     },
     "support": {
diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json
index 2bd867650..4fd68f139 100644
--- a/pkg/redis/composer.json
+++ b/pkg/redis/composer.json
@@ -9,14 +9,14 @@
         "php": "^7.3|^8.0",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/dsn": "^0.10",
-        "ramsey/uuid": "^3|^4"
+        "ramsey/uuid": "^3.5|^4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "predis/predis": "^1.1",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/sns/composer.json b/pkg/sns/composer.json
index 25fd1a345..04fc1579d 100644
--- a/pkg/sns/composer.json
+++ b/pkg/sns/composer.json
@@ -14,7 +14,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/snsqs/composer.json b/pkg/snsqs/composer.json
index ec52b67bc..bf68aeb8d 100644
--- a/pkg/snsqs/composer.json
+++ b/pkg/snsqs/composer.json
@@ -15,7 +15,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json
index 96dc89252..ed515a248 100644
--- a/pkg/sqs/composer.json
+++ b/pkg/sqs/composer.json
@@ -14,7 +14,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json
index 301631f43..87be9a62a 100644
--- a/pkg/stomp/composer.json
+++ b/pkg/stomp/composer.json
@@ -24,7 +24,7 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",
diff --git a/pkg/wamp/composer.json b/pkg/wamp/composer.json
index 1ad6b5110..f0892a609 100644
--- a/pkg/wamp/composer.json
+++ b/pkg/wamp/composer.json
@@ -16,7 +16,7 @@
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
-        "queue-interop/queue-spec": "^0.6"
+        "queue-interop/queue-spec": "^0.6.2"
     },
     "support": {
         "email": "opensource@forma-pro.com",

From 86ba387cc26098d008c771883d582dd918470606 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 11 Feb 2021 03:52:52 +0200
Subject: [PATCH 04/27] Bump

---
 composer.json                | 4 ++--
 pkg/pheanstalk/composer.json | 2 +-
 pkg/rdkafka/composer.json    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index d0d308b48..b2f19759e 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
     "doctrine/orm": "~2.4",
     "doctrine/persistence": "^1.3.3|^2.0",
     "mongodb/mongodb": "^1.2",
-    "pda/pheanstalk": "^3",
+    "pda/pheanstalk": "^3.1",
     "aws/aws-sdk-php": "^3.26",
     "stomp-php/stomp-php": "^4.1.4|^5",
     "php-http/guzzle7-adapter": "^0.1.1",
@@ -67,7 +67,7 @@
     "doctrine/doctrine-bundle": "~1.2|^2",
     "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
     "alcaeus/mongo-php-adapter": "^1.0",
-    "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0",
+    "kwn/php-rdkafka-stubs": "^2.0.3",
     "friendsofphp/php-cs-fixer": "^2",
     "dms/phpunit-arraysubset-asserts": "^0.2.1",
     "phpspec/prophecy-phpunit": "^2.0"
diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json
index f07603657..bb019e2d9 100644
--- a/pkg/pheanstalk/composer.json
+++ b/pkg/pheanstalk/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "pda/pheanstalk": "^3",
+        "pda/pheanstalk": "^3.1",
         "queue-interop/queue-interop": "^0.8"
     },
     "require-dev": {
diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json
index 5743a7d17..e322a8492 100644
--- a/pkg/rdkafka/composer.json
+++ b/pkg/rdkafka/composer.json
@@ -15,7 +15,7 @@
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
         "queue-interop/queue-spec": "^0.6.2",
-        "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0"
+        "kwn/php-rdkafka-stubs": "^2.0.3"
     },
     "support": {
         "email": "opensource@forma-pro.com",

From 01995e1ba6a00b48713a5afd3729bbc74cbe5f54 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 11 Feb 2021 03:54:22 +0200
Subject: [PATCH 05/27] Trigger CI


From 0ca270959d952b8072629940395396d3500ee567 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 11 Feb 2021 03:56:32 +0200
Subject: [PATCH 06/27] Drop ext-rdkafka 3

---
 composer.json             | 4 ++--
 pkg/rdkafka/composer.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index b2f19759e..46aea2155 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
     "ext-amqp": "^1.9.3",
     "ext-gearman": "^2.0",
     "ext-mongodb": "^1.5",
-    "ext-rdkafka": "^3.0.3|^4.0|^5.0",
+    "ext-rdkafka": "^4.0|^5.0",
 
     "queue-interop/amqp-interop": "^0.8",
     "queue-interop/queue-interop": "^0.8",
@@ -122,7 +122,7 @@
     "platform": {
       "ext-amqp": "1.9.3",
       "ext-gearman": "2.0.3",
-      "ext-rdkafka": "3.3",
+      "ext-rdkafka": "4.0",
       "ext-mongodb": "1.5",
       "ext-bcmath": "1",
       "ext-mbstring": "1",
diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json
index e322a8492..72c5535a8 100644
--- a/pkg/rdkafka/composer.json
+++ b/pkg/rdkafka/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "ext-rdkafka": "^3.0.3|^4.0|^5.0",
+        "ext-rdkafka": "^4.0|^5.0",
         "queue-interop/queue-interop": "^0.8"
     },
     "require-dev": {

From f8d94a0ba61d35baa5dfa6513ba9c1ba9b7b8442 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Tue, 16 Feb 2021 19:54:41 +0200
Subject: [PATCH 07/27] Bump doctrine-bundle

---
 composer.json                    | 2 +-
 pkg/enqueue-bundle/composer.json | 2 +-
 pkg/job-queue/composer.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 46aea2155..95dda4b3b 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,7 @@
     "symfony/framework-bundle": "^4.3|^5",
     "symfony/yaml": "^4.3|^5",
     "empi89/php-amqp-stubs": "*@dev",
-    "doctrine/doctrine-bundle": "~1.2|^2",
+    "doctrine/doctrine-bundle": "^1.6.12|^2",
     "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
     "alcaeus/mongo-php-adapter": "^1.0",
     "kwn/php-rdkafka-stubs": "^2.0.3",
diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json
index aded35069..35ca6bc18 100644
--- a/pkg/enqueue-bundle/composer.json
+++ b/pkg/enqueue-bundle/composer.json
@@ -36,7 +36,7 @@
         "enqueue/async-event-dispatcher": "0.10.x-dev",
         "enqueue/async-command": "0.10.x-dev",
         "php-amqplib/php-amqplib": "^2.7",
-        "doctrine/doctrine-bundle": "~1.2|^2",
+        "doctrine/doctrine-bundle": "^1.6.12|^2",
         "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
         "alcaeus/mongo-php-adapter": "^1.0",
         "symfony/browser-kit": "^4.3|^5",
diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json
index 980e57619..77206a95d 100644
--- a/pkg/job-queue/composer.json
+++ b/pkg/job-queue/composer.json
@@ -16,7 +16,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
-        "doctrine/doctrine-bundle": "~1.2|^2",
+        "doctrine/doctrine-bundle": "^1.6.12|^2",
         "symfony/browser-kit": "^4.3|^5",
         "symfony/expression-language": "^4.3|^5",
         "symfony/framework-bundle": "^4.3|^5",

From 502d2ea548c4eebfb79ecc8fdc3747d0d9c1b57b Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Tue, 16 Feb 2021 21:49:12 +0200
Subject: [PATCH 08/27] Drop doctrine-bundle <2

---
 pkg/job-queue/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json
index 77206a95d..b1362ce5b 100644
--- a/pkg/job-queue/composer.json
+++ b/pkg/job-queue/composer.json
@@ -16,7 +16,7 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
-        "doctrine/doctrine-bundle": "^1.6.12|^2",
+        "doctrine/doctrine-bundle": "^2.0",
         "symfony/browser-kit": "^4.3|^5",
         "symfony/expression-language": "^4.3|^5",
         "symfony/framework-bundle": "^4.3|^5",

From 39f8afc8e34e8ab2840657afbeac67c9ca719b8d Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Tue, 16 Feb 2021 22:40:02 +0200
Subject: [PATCH 09/27] More bumps

---
 composer.json                    | 12 +++++++-----
 pkg/amqp-lib/composer.json       |  2 +-
 pkg/enqueue-bundle/composer.json |  4 ++--
 pkg/job-queue/composer.json      |  2 +-
 pkg/monitoring/composer.json     |  3 ++-
 pkg/stomp/composer.json          |  2 +-
 pkg/wamp/composer.json           |  3 ++-
 7 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 95dda4b3b..82a484f30 100644
--- a/composer.json
+++ b/composer.json
@@ -25,19 +25,19 @@
     "queue-interop/amqp-interop": "^0.8",
     "queue-interop/queue-interop": "^0.8",
     "bunny/bunny": "^0.2.4|^0.3|^0.4",
-    "php-amqplib/php-amqplib": "^2.7",
+    "php-amqplib/php-amqplib": "^2.12.2",
     "doctrine/dbal": "^2.12",
-    "ramsey/uuid": "^3.5|^4.0",
+    "ramsey/uuid": "^3.5|^4",
     "psr/log": "^1.1",
     "psr/container": "^1",
     "makasim/temp-file": "^0.2",
     "google/cloud-pubsub": "^0.6.1|^1.0",
-    "doctrine/orm": "~2.4",
+    "doctrine/orm": "^2.7.4",
     "doctrine/persistence": "^1.3.3|^2.0",
     "mongodb/mongodb": "^1.2",
     "pda/pheanstalk": "^3.1",
     "aws/aws-sdk-php": "^3.26",
-    "stomp-php/stomp-php": "^4.1.4|^5",
+    "stomp-php/stomp-php": "^4.5|^5",
     "php-http/guzzle7-adapter": "^0.1.1",
     "php-http/client-common": "^2.2.1",
     "richardfullmer/rabbitmq-management-api": "^2.1.1",
@@ -45,7 +45,9 @@
     "thruway/client": "^0.5.0",
     "thruway/pawl-transport": "^0.5.0",
     "influxdb/influxdb-php": "^1.14",
-    "datadog/php-datadogstatsd": "^1.3"
+    "datadog/php-datadogstatsd": "^1.3",
+    "guzzlehttp/guzzle": "^6.3",
+    "voryx/thruway-common": "^1.0.1"
   },
   "require-dev": {
     "ext-pcntl": "*",
diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json
index be75355fc..415b3d34e 100644
--- a/pkg/amqp-lib/composer.json
+++ b/pkg/amqp-lib/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "php-amqplib/php-amqplib": "^2.10",
+        "php-amqplib/php-amqplib": "^2.12.2",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/amqp-tools": "^0.10"
diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json
index 35ca6bc18..2585e5bdf 100644
--- a/pkg/enqueue-bundle/composer.json
+++ b/pkg/enqueue-bundle/composer.json
@@ -35,8 +35,8 @@
         "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": "^2.7",
-        "doctrine/doctrine-bundle": "^1.6.12|^2",
+        "php-amqplib/php-amqplib": "^2.12.2",
+        "doctrine/doctrine-bundle": "^2.0",
         "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
         "alcaeus/mongo-php-adapter": "^1.0",
         "symfony/browser-kit": "^4.3|^5",
diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json
index b1362ce5b..81c265f2f 100644
--- a/pkg/job-queue/composer.json
+++ b/pkg/job-queue/composer.json
@@ -10,7 +10,7 @@
         "enqueue/enqueue": "^0.10",
         "enqueue/null": "^0.10",
         "queue-interop/queue-interop": "^0.8",
-        "doctrine/orm": "~2.4",
+        "doctrine/orm": "~2.7.4",
         "doctrine/dbal": "^2.12"
     },
     "require-dev": {
diff --git a/pkg/monitoring/composer.json b/pkg/monitoring/composer.json
index 9942ec910..70d52973b 100644
--- a/pkg/monitoring/composer.json
+++ b/pkg/monitoring/composer.json
@@ -16,7 +16,8 @@
         "influxdb/influxdb-php": "^1.14",
         "datadog/php-datadogstatsd": "^1.3",
         "thruway/client": "^0.5",
-        "thruway/pawl-transport": "^0.5"
+        "thruway/pawl-transport": "^0.5",
+        "voryx/thruway-common": "^1.0.1"
     },
     "suggest": {
         "thruway/client": "Client for Thruway and the WAMP (Web Application Messaging Protocol).",
diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json
index 87be9a62a..7e6efc4bf 100644
--- a/pkg/stomp/composer.json
+++ b/pkg/stomp/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^7.3|^8.0",
         "enqueue/dsn": "^0.10",
-        "stomp-php/stomp-php": "^4.0|^5.0",
+        "stomp-php/stomp-php": "^4.5|^5.0",
         "queue-interop/queue-interop": "^0.8",
         "php-http/guzzle7-adapter": "^0.1.1",
         "php-http/client-common": "^2.2.1",
diff --git a/pkg/wamp/composer.json b/pkg/wamp/composer.json
index f0892a609..3b93d281f 100644
--- a/pkg/wamp/composer.json
+++ b/pkg/wamp/composer.json
@@ -10,7 +10,8 @@
         "queue-interop/queue-interop": "^0.8",
         "enqueue/dsn": "^0.10",
         "thruway/client": "^0.5.0",
-        "thruway/pawl-transport": "^0.5.0"
+        "thruway/pawl-transport": "^0.5.0",
+        "voryx/thruway-common": "^1.0.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

From e4170faa8555201134939e739f203b47852c203a Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Tue, 16 Feb 2021 23:48:24 +0200
Subject: [PATCH 10/27] Retrigger CI


From 72a0e0e289ffe90f98b81463aad3f0aa428d2d5a Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 13:40:58 +0200
Subject: [PATCH 11/27] Bump google/cloud-pubsub

---
 composer.json         | 2 +-
 pkg/gps/composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 82a484f30..80122dbed 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
     "psr/log": "^1.1",
     "psr/container": "^1",
     "makasim/temp-file": "^0.2",
-    "google/cloud-pubsub": "^0.6.1|^1.0",
+    "google/cloud-pubsub": "^1.4.3",
     "doctrine/orm": "^2.7.4",
     "doctrine/persistence": "^1.3.3|^2.0",
     "mongodb/mongodb": "^1.2",
diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json
index e8b1ed9d8..53445fe32 100644
--- a/pkg/gps/composer.json
+++ b/pkg/gps/composer.json
@@ -8,7 +8,7 @@
     "require": {
         "php": "^7.3|^8.0",
         "queue-interop/queue-interop": "^0.8",
-        "google/cloud-pubsub": "^1.0",
+        "google/cloud-pubsub": "^1.4.3",
         "enqueue/dsn": "^0.10"
     },
     "require-dev": {

From 20e3d2f590e70027ad3f8d7f5c176daad3b336cc Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 14:41:27 +0200
Subject: [PATCH 12/27] Improve Dockerfile for local work

---
 docker/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2b21de82b..785898446 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,6 +25,7 @@ RUN set -x && \
         libgearman-dev \
         php-pear \
         make \
+        unzip \
     && \
     pecl channel-update pecl.php.net && \
     pecl install gearman && \
@@ -56,4 +57,6 @@ RUN chmod u+x /usr/local/bin/entrypoint.sh
 RUN mkdir -p /mqdev
 WORKDIR /mqdev
 
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
 CMD /usr/local/bin/entrypoint.sh

From d2e4f3980db998b5cc44937351014a7b0bf2c980 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 14:42:53 +0200
Subject: [PATCH 13/27] Bump guzzle

---
 composer.json           | 3 ++-
 pkg/stomp/composer.json | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 80122dbed..6672edeef 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,8 @@
     "thruway/pawl-transport": "^0.5.0",
     "influxdb/influxdb-php": "^1.14",
     "datadog/php-datadogstatsd": "^1.3",
-    "guzzlehttp/guzzle": "^6.3",
+    "guzzlehttp/guzzle": "^7.0.1",
+    "php-http/discovery": "^1.13",
     "voryx/thruway-common": "^1.0.1"
   },
   "require-dev": {
diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json
index 7e6efc4bf..2e4963400 100644
--- a/pkg/stomp/composer.json
+++ b/pkg/stomp/composer.json
@@ -18,7 +18,9 @@
         "queue-interop/queue-interop": "^0.8",
         "php-http/guzzle7-adapter": "^0.1.1",
         "php-http/client-common": "^2.2.1",
-        "richardfullmer/rabbitmq-management-api": "^2.1.1"
+        "richardfullmer/rabbitmq-management-api": "^2.1.1",
+        "guzzlehttp/guzzle": "^7.0.1",
+        "php-http/discovery": "^1.13"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

From 2d69640fbcb1bfaf0ca92f8b0160b7d2417375fc Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 14:45:37 +0200
Subject: [PATCH 14/27] Re-add php 8 and sf 5.2

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d411b9593..0ef2330ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,8 +64,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
-        symfony_version: ['4.3.*', '4.4.*', '5.0.*']
+        php: ['7.3', '7.4', '8.0']
+        symfony_version: ['4.3.*', '4.4.*', '5.0.*', '5.2.*']
         dependencies: ['lowest', 'highest']
     name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
 
@@ -94,8 +94,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3'] # same as in the container
-        symfony_version: ['4.3.*', '5.0.*']
+        php: ['7.3', '8.0'] # same as in the container
+        symfony_version: ['4.3.*', '5.0.*', '5.2.*']
         dependencies: ['lowest', 'highest']
         rdkafka_action: ['exclude-group', 'group']
 

From f1f873a8a8ecf034465103d60250fc9489df6629 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 15:01:51 +0200
Subject: [PATCH 15/27] Remove old sf from php8; fix amqplib requirement

---
 .github/workflows/ci.yml         | 8 ++++++++
 composer.json                    | 2 +-
 pkg/amqp-lib/composer.json       | 2 +-
 pkg/enqueue-bundle/composer.json | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ef2330ef..5023ec4e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,6 +67,14 @@ jobs:
         php: ['7.3', '7.4', '8.0']
         symfony_version: ['4.3.*', '4.4.*', '5.0.*', '5.2.*']
         dependencies: ['lowest', 'highest']
+        exclude:
+          - php: '8.0'
+            symfony_version: '4.3.*'
+          - php: '8.0'
+            symfony_version: '4.4.*'
+          - php: '8.0'
+            symfony_version: '5.0.*'
+
     name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
 
     steps:
diff --git a/composer.json b/composer.json
index 6672edeef..f22dd1fc8 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
     "queue-interop/amqp-interop": "^0.8",
     "queue-interop/queue-interop": "^0.8",
     "bunny/bunny": "^0.2.4|^0.3|^0.4",
-    "php-amqplib/php-amqplib": "^2.12.2",
+    "php-amqplib/php-amqplib": "^2.12.1",
     "doctrine/dbal": "^2.12",
     "ramsey/uuid": "^3.5|^4",
     "psr/log": "^1.1",
diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json
index 415b3d34e..caa903108 100644
--- a/pkg/amqp-lib/composer.json
+++ b/pkg/amqp-lib/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "php-amqplib/php-amqplib": "^2.12.2",
+        "php-amqplib/php-amqplib": "^2.12.1",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/amqp-tools": "^0.10"
diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json
index 2585e5bdf..d643b8a30 100644
--- a/pkg/enqueue-bundle/composer.json
+++ b/pkg/enqueue-bundle/composer.json
@@ -35,7 +35,7 @@
         "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": "^2.12.2",
+        "php-amqplib/php-amqplib": "^2.12.1",
         "doctrine/doctrine-bundle": "^2.0",
         "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
         "alcaeus/mongo-php-adapter": "^1.0",

From fb348b15bb5812928e2cbc5b739119475a15b7f5 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 15:03:59 +0200
Subject: [PATCH 16/27] Remove old sf from php8 in functional tests

---
 .github/workflows/ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5023ec4e6..f2abecfff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -106,6 +106,11 @@ jobs:
         symfony_version: ['4.3.*', '5.0.*', '5.2.*']
         dependencies: ['lowest', 'highest']
         rdkafka_action: ['exclude-group', 'group']
+        exclude:
+          - php: '8.0'
+            symfony_version: '4.3.*'
+          - php: '8.0'
+            symfony_version: '5.0.*'
 
     name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}, deps=${{ matrix.dependencies }}
 

From 9e84178aa4d02cc54ed669cfb0bf381ab677380c Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 15:26:13 +0200
Subject: [PATCH 17/27] Bump aws-sdk

---
 composer.json         | 2 +-
 pkg/sns/composer.json | 2 +-
 pkg/sqs/composer.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index f22dd1fc8..6b0b0c5d9 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
     "doctrine/persistence": "^1.3.3|^2.0",
     "mongodb/mongodb": "^1.2",
     "pda/pheanstalk": "^3.1",
-    "aws/aws-sdk-php": "^3.26",
+    "aws/aws-sdk-php": "^3.155",
     "stomp-php/stomp-php": "^4.5|^5",
     "php-http/guzzle7-adapter": "^0.1.1",
     "php-http/client-common": "^2.2.1",
diff --git a/pkg/sns/composer.json b/pkg/sns/composer.json
index 04fc1579d..ef3cf6f87 100644
--- a/pkg/sns/composer.json
+++ b/pkg/sns/composer.json
@@ -9,7 +9,7 @@
         "php": "^7.3|^8.0",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/dsn": "^0.10",
-        "aws/aws-sdk-php": "~3.26"
+        "aws/aws-sdk-php": "~3.155"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json
index ed515a248..2b2473927 100644
--- a/pkg/sqs/composer.json
+++ b/pkg/sqs/composer.json
@@ -9,7 +9,7 @@
         "php": "^7.3|^8.0",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/dsn": "^0.10",
-        "aws/aws-sdk-php": "~3.26"
+        "aws/aws-sdk-php": "~3.155"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

From 6268ab63d49ceee85bb3cbc00e39cb799f53965e Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 16:08:12 +0200
Subject: [PATCH 18/27] Back to clunky composer install for better caching

---
 .github/workflows/ci.yml | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f2abecfff..981b6040b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,7 +66,7 @@ jobs:
       matrix:
         php: ['7.3', '7.4', '8.0']
         symfony_version: ['4.3.*', '4.4.*', '5.0.*', '5.2.*']
-        dependencies: ['lowest', 'highest']
+        dependencies: ['--prefer-lowest', '--prefer-dist']
         exclude:
           - php: '8.0'
             symfony_version: '4.3.*'
@@ -80,6 +80,18 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-
+
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
@@ -89,9 +101,7 @@ jobs:
 
       - run: php ./bin/fix-symfony-version.php "${{ matrix.symfony_version }}"
 
-      - uses: "ramsey/composer-install@v1"
-        with:
-          dependency-versions: ${{ matrix.dependencies }}
+      - run: composer install --no-progress ${{ matrix.dependencies }}
 
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 
@@ -104,7 +114,7 @@ jobs:
       matrix:
         php: ['7.3', '8.0'] # same as in the container
         symfony_version: ['4.3.*', '5.0.*', '5.2.*']
-        dependencies: ['lowest', 'highest']
+        dependencies: ['--prefer-lowest', '--prefer-dist']
         rdkafka_action: ['exclude-group', 'group']
         exclude:
           - php: '8.0'
@@ -117,6 +127,18 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-
+
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
@@ -126,9 +148,7 @@ jobs:
 
       - run: php ./bin/fix-symfony-version.php "${{ matrix.symfony_version }}"
 
-      - uses: "ramsey/composer-install@v1"
-        with:
-          dependency-versions: ${{ matrix.dependencies }}
+      - run: composer install --no-progress ${{ matrix.dependencies }}
 
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 

From 6c7d6c2cb37201fd38f779c31be0d7184adda510 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 16:10:08 +0200
Subject: [PATCH 19/27] Derp

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 981b6040b..ee5f93d7d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,7 +101,7 @@ jobs:
 
       - run: php ./bin/fix-symfony-version.php "${{ matrix.symfony_version }}"
 
-      - run: composer install --no-progress ${{ matrix.dependencies }}
+      - run: composer update --no-progress ${{ matrix.dependencies }}
 
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 
@@ -148,7 +148,7 @@ jobs:
 
       - run: php ./bin/fix-symfony-version.php "${{ matrix.symfony_version }}"
 
-      - run: composer install --no-progress ${{ matrix.dependencies }}
+      - run: composer update --no-progress ${{ matrix.dependencies }}
 
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 

From 0909932478e50a35992e6a3ed421d9d5a3a48427 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 16:27:36 +0200
Subject: [PATCH 20/27] Re-bump doctrine bundle

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6b0b0c5d9..a3c27ad9b 100644
--- a/composer.json
+++ b/composer.json
@@ -67,7 +67,7 @@
     "symfony/framework-bundle": "^4.3|^5",
     "symfony/yaml": "^4.3|^5",
     "empi89/php-amqp-stubs": "*@dev",
-    "doctrine/doctrine-bundle": "^1.6.12|^2",
+    "doctrine/doctrine-bundle": "^2.0",
     "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
     "alcaeus/mongo-php-adapter": "^1.0",
     "kwn/php-rdkafka-stubs": "^2.0.3",

From dd50b60b5e006afa0ce82c24806be65ef826f09b Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 20:57:43 +0200
Subject: [PATCH 21/27] Bump amqp-interop and queue-interop

---
 composer.json                    | 4 ++--
 pkg/amqp-bunny/composer.json     | 2 +-
 pkg/amqp-ext/composer.json       | 2 +-
 pkg/amqp-lib/composer.json       | 2 +-
 pkg/amqp-tools/composer.json     | 2 +-
 pkg/enqueue-bundle/composer.json | 2 +-
 pkg/enqueue/composer.json        | 2 +-
 pkg/rdkafka/composer.json        | 2 +-
 pkg/simple-client/composer.json  | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index a3c27ad9b..2fb2d97d5 100644
--- a/composer.json
+++ b/composer.json
@@ -22,8 +22,8 @@
     "ext-mongodb": "^1.5",
     "ext-rdkafka": "^4.0|^5.0",
 
-    "queue-interop/amqp-interop": "^0.8",
-    "queue-interop/queue-interop": "^0.8",
+    "queue-interop/amqp-interop": "^0.8.2",
+    "queue-interop/queue-interop": "^0.8.1",
     "bunny/bunny": "^0.2.4|^0.3|^0.4",
     "php-amqplib/php-amqplib": "^2.12.1",
     "doctrine/dbal": "^2.12",
diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json
index 9b8ed2dbb..c885c79ec 100644
--- a/pkg/amqp-bunny/composer.json
+++ b/pkg/amqp-bunny/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "queue-interop/amqp-interop": "^0.8",
+        "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
         "bunny/bunny": "^0.4",
         "enqueue/amqp-tools": "^0.10"
diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json
index 758f1ab64..91c572a25 100644
--- a/pkg/amqp-ext/composer.json
+++ b/pkg/amqp-ext/composer.json
@@ -8,7 +8,7 @@
     "require": {
         "php": "^7.3|^8.0",
         "ext-amqp": "^1.9.3",
-        "queue-interop/amqp-interop": "^0.8",
+        "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/amqp-tools": "^0.10"
     },
diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json
index caa903108..3aaaa5bf5 100644
--- a/pkg/amqp-lib/composer.json
+++ b/pkg/amqp-lib/composer.json
@@ -8,7 +8,7 @@
     "require": {
         "php": "^7.3|^8.0",
         "php-amqplib/php-amqplib": "^2.12.1",
-        "queue-interop/amqp-interop": "^0.8",
+        "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/amqp-tools": "^0.10"
     },
diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json
index cdb2321fd..ccc282006 100644
--- a/pkg/amqp-tools/composer.json
+++ b/pkg/amqp-tools/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "queue-interop/amqp-interop": "^0.8",
+        "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/dsn": "^0.10"
     },
diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json
index d643b8a30..0d8ff66c2 100644
--- a/pkg/enqueue-bundle/composer.json
+++ b/pkg/enqueue-bundle/composer.json
@@ -8,7 +8,7 @@
     "require": {
         "php": "^7.3|^8.0",
         "symfony/framework-bundle": "^4.3|^5",
-        "queue-interop/amqp-interop": "^0.8",
+        "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/enqueue": "^0.10",
         "enqueue/null": "^0.10"
diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json
index 09822cf97..8ff51a47a 100644
--- a/pkg/enqueue/composer.json
+++ b/pkg/enqueue/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "queue-interop/amqp-interop": "^0.8",
+        "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/null": "^0.10",
         "enqueue/dsn": "^0.10",
diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json
index 72c5535a8..82c5367fe 100644
--- a/pkg/rdkafka/composer.json
+++ b/pkg/rdkafka/composer.json
@@ -8,7 +8,7 @@
     "require": {
         "php": "^7.3|^8.0",
         "ext-rdkafka": "^4.0|^5.0",
-        "queue-interop/queue-interop": "^0.8"
+        "queue-interop/queue-interop": "^0.8.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json
index 6b277c6ad..02e8a93f7 100644
--- a/pkg/simple-client/composer.json
+++ b/pkg/simple-client/composer.json
@@ -8,7 +8,7 @@
     "require": {
         "php": "^7.3|^8.0",
         "enqueue/enqueue": "^0.10",
-        "queue-interop/amqp-interop": "^0.8",
+        "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
         "symfony/config": "^4.3|^5"
     },

From a4b56578b8212772853b9eca568fa9b89b9735fa Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 23:23:46 +0200
Subject: [PATCH 22/27] Fix hanging wamp tests with lowest deps

---
 composer.json          |  9 +++++++--
 pkg/wamp/composer.json | 13 +++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 2fb2d97d5..6766d0dd4 100644
--- a/composer.json
+++ b/composer.json
@@ -42,13 +42,18 @@
     "php-http/client-common": "^2.2.1",
     "richardfullmer/rabbitmq-management-api": "^2.1.1",
     "predis/predis": "^1.1",
-    "thruway/client": "^0.5.0",
+    "thruway/client": "^0.5.4",
     "thruway/pawl-transport": "^0.5.0",
     "influxdb/influxdb-php": "^1.14",
     "datadog/php-datadogstatsd": "^1.3",
     "guzzlehttp/guzzle": "^7.0.1",
     "php-http/discovery": "^1.13",
-    "voryx/thruway-common": "^1.0.1"
+    "voryx/thruway-common": "^1.0.1",
+    "react/event-loop": "^1.0",
+    "react/stream": "^1.0",
+    "react/cache": "^1.0",
+    "react/dns": "^1.0",
+    "react/socket": "^1.0"
   },
   "require-dev": {
     "ext-pcntl": "*",
diff --git a/pkg/wamp/composer.json b/pkg/wamp/composer.json
index 3b93d281f..97072bb72 100644
--- a/pkg/wamp/composer.json
+++ b/pkg/wamp/composer.json
@@ -7,11 +7,16 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "queue-interop/queue-interop": "^0.8",
-        "enqueue/dsn": "^0.10",
-        "thruway/client": "^0.5.0",
+        "queue-interop/queue-interop": "^0.8.1",
+        "enqueue/dsn": "^0.10.8",
+        "thruway/client": "^0.5.4",
         "thruway/pawl-transport": "^0.5.0",
-        "voryx/thruway-common": "^1.0.1"
+        "voryx/thruway-common": "^1.0.1",
+        "react/event-loop": "^1.0",
+        "react/stream": "^1.0",
+        "react/cache": "^1.0",
+        "react/dns": "^1.0",
+        "react/socket": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

From 126cf1516d677828aaf6ab7c26d379c40e25b387 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Wed, 17 Feb 2021 23:30:21 +0200
Subject: [PATCH 23/27] Fix bunny on php 8

---
 composer.json                | 2 +-
 pkg/amqp-bunny/composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 6766d0dd4..7c70e513e 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
 
     "queue-interop/amqp-interop": "^0.8.2",
     "queue-interop/queue-interop": "^0.8.1",
-    "bunny/bunny": "^0.2.4|^0.3|^0.4",
+    "bunny/bunny": "^0.4|^0.5",
     "php-amqplib/php-amqplib": "^2.12.1",
     "doctrine/dbal": "^2.12",
     "ramsey/uuid": "^3.5|^4",
diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json
index c885c79ec..6efe7ee84 100644
--- a/pkg/amqp-bunny/composer.json
+++ b/pkg/amqp-bunny/composer.json
@@ -9,7 +9,7 @@
         "php": "^7.3|^8.0",
         "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
-        "bunny/bunny": "^0.4",
+        "bunny/bunny": "^0.4|^0.5",
         "enqueue/amqp-tools": "^0.10"
     },
     "require-dev": {

From 956b73a5cae3a2997fa171fbcfaecd9497248e1c Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 18 Feb 2021 11:38:52 +0200
Subject: [PATCH 24/27] Fix hanging wamp tests

---
 composer.json          | 9 +++------
 pkg/wamp/composer.json | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 7c70e513e..53feff10f 100644
--- a/composer.json
+++ b/composer.json
@@ -42,18 +42,15 @@
     "php-http/client-common": "^2.2.1",
     "richardfullmer/rabbitmq-management-api": "^2.1.1",
     "predis/predis": "^1.1",
-    "thruway/client": "^0.5.4",
-    "thruway/pawl-transport": "^0.5.0",
+    "thruway/client": "^0.5",
+    "thruway/pawl-transport": "^0.5.1",
     "influxdb/influxdb-php": "^1.14",
     "datadog/php-datadogstatsd": "^1.3",
     "guzzlehttp/guzzle": "^7.0.1",
     "php-http/discovery": "^1.13",
     "voryx/thruway-common": "^1.0.1",
-    "react/event-loop": "^1.0",
-    "react/stream": "^1.0",
-    "react/cache": "^1.0",
     "react/dns": "^1.0",
-    "react/socket": "^1.0"
+    "react/event-loop": "^1.0"
   },
   "require-dev": {
     "ext-pcntl": "*",
diff --git a/pkg/wamp/composer.json b/pkg/wamp/composer.json
index 97072bb72..6dd4a6aa0 100644
--- a/pkg/wamp/composer.json
+++ b/pkg/wamp/composer.json
@@ -9,14 +9,11 @@
         "php": "^7.3|^8.0",
         "queue-interop/queue-interop": "^0.8.1",
         "enqueue/dsn": "^0.10.8",
-        "thruway/client": "^0.5.4",
-        "thruway/pawl-transport": "^0.5.0",
+        "thruway/client": "^0.5",
+        "thruway/pawl-transport": "^0.5.1",
         "voryx/thruway-common": "^1.0.1",
-        "react/event-loop": "^1.0",
-        "react/stream": "^1.0",
-        "react/cache": "^1.0",
         "react/dns": "^1.0",
-        "react/socket": "^1.0"
+        "react/event-loop": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

From 594e5161e4b03aa4e25343c550714f5819083ccb Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 18 Feb 2021 12:12:33 +0200
Subject: [PATCH 25/27] Drop EOL Symfony versions

---
 .github/workflows/ci.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee5f93d7d..e8b107bd9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,15 +65,11 @@ jobs:
       fail-fast: false
       matrix:
         php: ['7.3', '7.4', '8.0']
-        symfony_version: ['4.3.*', '4.4.*', '5.0.*', '5.2.*']
+        symfony_version: ['4.4.*', '5.2.*']
         dependencies: ['--prefer-lowest', '--prefer-dist']
         exclude:
-          - php: '8.0'
-            symfony_version: '4.3.*'
           - php: '8.0'
             symfony_version: '4.4.*'
-          - php: '8.0'
-            symfony_version: '5.0.*'
 
     name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
 
@@ -113,14 +109,12 @@ jobs:
       fail-fast: false
       matrix:
         php: ['7.3', '8.0'] # same as in the container
-        symfony_version: ['4.3.*', '5.0.*', '5.2.*']
+        symfony_version: ['4.4.*', '5.2.*']
         dependencies: ['--prefer-lowest', '--prefer-dist']
         rdkafka_action: ['exclude-group', 'group']
         exclude:
           - php: '8.0'
-            symfony_version: '4.3.*'
-          - php: '8.0'
-            symfony_version: '5.0.*'
+            symfony_version: '4.4.*'
 
     name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}, deps=${{ matrix.dependencies }}
 

From 47b4032642da06a872491ce170a6b906ebf19239 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 18 Feb 2021 12:56:56 +0200
Subject: [PATCH 26/27] Fix cache on one of the non-test steps

---
 .github/workflows/ci.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8b107bd9..fe696eda4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,6 +43,18 @@ jobs:
           PATTERNS: |
             pkg/**/*.php
 
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: composer-cs-check-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            composer-cs-check-
+
       - uses: shivammathur/setup-php@v2
         with:
           php-version: '7.4'
@@ -52,7 +64,7 @@ jobs:
 
       - run: php ./bin/fix-symfony-version.php "5.2.*"
 
-      - uses: "ramsey/composer-install@v1"
+      - run: composer update --no-progress
 
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 

From 1160afeae288afd3de9962fb63e90c281ef8ff90 Mon Sep 17 00:00:00 2001
From: Andrew M-Y <andrejs@gmail.com>
Date: Thu, 18 Feb 2021 13:16:03 +0200
Subject: [PATCH 27/27] Retrigger CI