From 3f82f63f47cdf06d932b3cc7731613cf3183815b Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 10:23:06 +0200 Subject: [PATCH 01/44] Add PHP 8 to the build matrix for unit tests This reverts commit d38fc1d2f58fbbec9721f12f910431c55b87d619. --- .github/workflows/ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed066369b..309570124 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,6 +120,23 @@ jobs: 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 }} From 518742c1e192439cf2ac58654d0bfd3537245145 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 10:26:59 +0200 Subject: [PATCH 02/44] Allow php8 in all composer.json files --- composer.json | 2 +- 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/async-event-dispatcher/composer.json | 2 +- pkg/dbal/composer.json | 2 +- pkg/enqueue-bundle/composer.json | 2 +- pkg/enqueue/composer.json | 2 +- pkg/fs/composer.json | 2 +- pkg/gearman/composer.json | 2 +- pkg/gps/composer.json | 2 +- pkg/job-queue/composer.json | 2 +- pkg/mongodb/composer.json | 2 +- pkg/monitoring/composer.json | 2 +- pkg/null/composer.json | 2 +- pkg/pheanstalk/composer.json | 2 +- pkg/rdkafka/composer.json | 2 +- pkg/redis/composer.json | 2 +- pkg/simple-client/composer.json | 2 +- 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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index b1ba9ff8b..4348077a4 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon" }, "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "ext-amqp": "^1.9.3", "ext-gearman": "^2.0", diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json index 01d6a8c4a..9e7d83bb4 100644 --- a/pkg/amqp-bunny/composer.json +++ b/pkg/amqp-bunny/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", "bunny/bunny": "^0.4", diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json index 203908160..18b1f72cb 100644 --- a/pkg/amqp-ext/composer.json +++ b/pkg/amqp-ext/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "ext-amqp": "^1.9.3", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json index 2d9d2515f..71867a911 100644 --- a/pkg/amqp-lib/composer.json +++ b/pkg/amqp-lib/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "php-amqplib/php-amqplib": "^2.10", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json index 52c582954..cdb2321fd 100644 --- a/pkg/amqp-tools/composer.json +++ b/pkg/amqp-tools/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10" diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json index d4a72125b..d5adc5f7b 100644 --- a/pkg/async-event-dispatcher/composer.json +++ b/pkg/async-event-dispatcher/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/queue-interop": "^0.8", "symfony/event-dispatcher": "^4.3|^5" diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json index dfeba65f3..bb60783ea 100644 --- a/pkg/dbal/composer.json +++ b/pkg/dbal/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "doctrine/dbal": "^2.6", "ramsey/uuid": "^3|^4" diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index 43a73fa34..4773dcbed 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "symfony/framework-bundle": "^4.3|^5", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json index e8c3f3ade..3c525f510 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.3", + "php": "^7.3|^8.0", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", "enqueue/null": "^0.10", diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json index 40cfe59c3..e2b8119f1 100644 --- a/pkg/fs/composer.json +++ b/pkg/fs/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "symfony/filesystem": "^4.3|^5", diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json index 92dd3bc09..b88fa542e 100644 --- a/pkg/gearman/composer.json +++ b/pkg/gearman/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "ext-gearman": "^2.0", "queue-interop/queue-interop": "^0.8" }, diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json index 116a5dbf8..1d2ed5fd3 100644 --- a/pkg/gps/composer.json +++ b/pkg/gps/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "google/cloud-pubsub": "^1.0", "enqueue/dsn": "^0.10" diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index cbe720e28..d8903f99e 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.3", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "enqueue/null": "^0.10", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/mongodb/composer.json b/pkg/mongodb/composer.json index d84c6e68f..a894816f7 100644 --- a/pkg/mongodb/composer.json +++ b/pkg/mongodb/composer.json @@ -10,7 +10,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "mongodb/mongodb": "^1.2", "ext-mongodb": "^1.5" diff --git a/pkg/monitoring/composer.json b/pkg/monitoring/composer.json index 92d31ec96..9942ec910 100644 --- a/pkg/monitoring/composer.json +++ b/pkg/monitoring/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "enqueue/dsn": "^0.10" }, diff --git a/pkg/null/composer.json b/pkg/null/composer.json index 5c43f40bc..bd00fb0b0 100644 --- a/pkg/null/composer.json +++ b/pkg/null/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8" }, "require-dev": { diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json index 40a32fb3c..0274089a5 100644 --- a/pkg/pheanstalk/composer.json +++ b/pkg/pheanstalk/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "pda/pheanstalk": "^3", "queue-interop/queue-interop": "^0.8" }, diff --git a/pkg/rdkafka/composer.json b/pkg/rdkafka/composer.json index 8db8e9cc3..7128a525f 100644 --- a/pkg/rdkafka/composer.json +++ b/pkg/rdkafka/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "ext-rdkafka": "^3.0.3|^4.0|^5.0", "queue-interop/queue-interop": "^0.8" }, diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json index ace7230e5..2bd867650 100644 --- a/pkg/redis/composer.json +++ b/pkg/redis/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "ramsey/uuid": "^3|^4" diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json index e06d880af..6b277c6ad 100644 --- a/pkg/simple-client/composer.json +++ b/pkg/simple-client/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/sns/composer.json b/pkg/sns/composer.json index cde4dab79..25fd1a345 100644 --- a/pkg/sns/composer.json +++ b/pkg/sns/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "aws/aws-sdk-php": "~3.26" diff --git a/pkg/snsqs/composer.json b/pkg/snsqs/composer.json index ddf8d80cf..ec52b67bc 100644 --- a/pkg/snsqs/composer.json +++ b/pkg/snsqs/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "enqueue/sns": "^0.10", diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json index 1ca52ab41..96dc89252 100644 --- a/pkg/sqs/composer.json +++ b/pkg/sqs/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "aws/aws-sdk-php": "~3.26" diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 0509d34b0..0236070b1 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.3", + "php": "^7.3|^8.0", "enqueue/dsn": "^0.10", "stomp-php/stomp-php": "^4", "queue-interop/queue-interop": "^0.8", diff --git a/pkg/wamp/composer.json b/pkg/wamp/composer.json index f868b00eb..1ad6b5110 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.3", + "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10", "thruway/client": "^0.5.0", From f63631bc4ff2dd67aa757f8069189d1a10997b0b Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 10:30:57 +0200 Subject: [PATCH 03/44] Update doctrine/dbal to 2.12 --- composer.json | 2 +- pkg/dbal/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 4348077a4..ed2d9fe6f 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "queue-interop/queue-interop": "^0.7|^0.8", "bunny/bunny": "^0.2.4|^0.3|^0.4", "php-amqplib/php-amqplib": "^2.7", - "doctrine/dbal": "^2.6,<2.10", + "doctrine/dbal": "^2.12", "ramsey/uuid": "^2|^3.5|^4.0", "psr/log": "^1", "psr/container": "^1", diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json index bb60783ea..fc9c4a595 100644 --- a/pkg/dbal/composer.json +++ b/pkg/dbal/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^7.3|^8.0", "queue-interop/queue-interop": "^0.8", - "doctrine/dbal": "^2.6", + "doctrine/dbal": "^2.12", "ramsey/uuid": "^3|^4" }, "require-dev": { diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index d8903f99e..980e57619 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -11,7 +11,7 @@ "enqueue/null": "^0.10", "queue-interop/queue-interop": "^0.8", "doctrine/orm": "~2.4", - "doctrine/dbal": "<2.10" + "doctrine/dbal": "^2.12" }, "require-dev": { "phpunit/phpunit": "^9.5", From c464121b70b2cff71343fb076ee1013bb8a4f735 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 10:34:21 +0200 Subject: [PATCH 04/44] Update php-http/client-common to 2.2.1 --- composer.json | 2 +- pkg/stomp/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ed2d9fe6f..f11d28a7b 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "aws/aws-sdk-php": "^3.26", "stomp-php/stomp-php": "^4", "php-http/guzzle6-adapter": "^1.1", - "php-http/client-common": "^1.7@dev", + "php-http/client-common": "^2.2.1", "richardfullmer/rabbitmq-management-api": "^2.0", "predis/predis": "^1.1", "thruway/client": "^0.5.0", diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 0236070b1..3cc47fbb2 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -11,7 +11,7 @@ "stomp-php/stomp-php": "^4", "queue-interop/queue-interop": "^0.8", "php-http/guzzle6-adapter": "^1.1", - "php-http/client-common": "^1.7@dev", + "php-http/client-common": "^2.2.1", "richardfullmer/rabbitmq-management-api": "^2.0" }, "require-dev": { From aafad21dbd41eac104d37db4d924606206a3c3ac Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 10:57:11 +0200 Subject: [PATCH 05/44] Try a fork of richardfullmer/rabbitmq-management-api --- composer.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f11d28a7b..1331e0deb 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,12 @@ "cs-lint": "bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff", "phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon" }, + "repositories": [ + { + "type": "git", + "url": "https://github.com/andrewmy/rabbitmq-management-api.git" + } + ], "require": { "php": "^7.3|^8.0", @@ -33,7 +39,7 @@ "stomp-php/stomp-php": "^4", "php-http/guzzle6-adapter": "^1.1", "php-http/client-common": "^2.2.1", - "richardfullmer/rabbitmq-management-api": "^2.0", + "richardfullmer/rabbitmq-management-api": "dev-http-client-2 as 2.1.0", "predis/predis": "^1.1", "thruway/client": "^0.5.0", "thruway/pawl-transport": "^0.5.0", From d1cec9457f78313bf78e8f9652c8e5e6395701a9 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 10:59:33 +0200 Subject: [PATCH 06/44] Derp --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1331e0deb..f40334da2 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "repositories": [ { "type": "git", - "url": "https://github.com/andrewmy/rabbitmq-management-api.git" + "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git" } ], "require": { From 46501f627d4e5c3c51c2fd33e081066bfd44bc82 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 11:03:19 +0200 Subject: [PATCH 07/44] Replace guzzle6 with 7 --- composer.json | 2 +- pkg/stomp/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f40334da2..e1c43af85 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "pda/pheanstalk": "^3", "aws/aws-sdk-php": "^3.26", "stomp-php/stomp-php": "^4", - "php-http/guzzle6-adapter": "^1.1", + "php-http/guzzle7-adapter": "^0.1.1", "php-http/client-common": "^2.2.1", "richardfullmer/rabbitmq-management-api": "dev-http-client-2 as 2.1.0", "predis/predis": "^1.1", diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 3cc47fbb2..614ac2601 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -10,7 +10,7 @@ "enqueue/dsn": "^0.10", "stomp-php/stomp-php": "^4", "queue-interop/queue-interop": "^0.8", - "php-http/guzzle6-adapter": "^1.1", + "php-http/guzzle7-adapter": "^0.1.1", "php-http/client-common": "^2.2.1", "richardfullmer/rabbitmq-management-api": "^2.0" }, From dd3ffe034e79ed126c434ec536d124e7b458573f Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 11:20:58 +0200 Subject: [PATCH 08/44] Remove referencing non-existent property --- pkg/job-queue/Test/DbalPersistedConnection.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkg/job-queue/Test/DbalPersistedConnection.php b/pkg/job-queue/Test/DbalPersistedConnection.php index 51160c03b..add0f3ddc 100644 --- a/pkg/job-queue/Test/DbalPersistedConnection.php +++ b/pkg/job-queue/Test/DbalPersistedConnection.php @@ -33,7 +33,6 @@ public function connect() if ($this->hasPersistedConnection()) { $this->_conn = $this->getPersistedConnection(); - $this->setConnected(true); } else { parent::connect(); $this->persistConnection($this->_conn); @@ -66,22 +65,6 @@ public function rollBack() $this->wrapTransactionNestingLevel('rollBack'); } - /** - * @param bool $connected - */ - protected function setConnected($connected) - { - $rc = new \ReflectionClass(Connection::class); - $rp = $rc->hasProperty('isConnected') ? - $rc->getProperty('isConnected') : - $rc->getProperty('_isConnected') - ; - - $rp->setAccessible(true); - $rp->setValue($this, $connected); - $rp->setAccessible(false); - } - /** * @return int */ From fc9d4926f1969147941c820ca4544dbf68613993 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 11:33:54 +0200 Subject: [PATCH 09/44] Try a fork of doctrine/mongodb-odm-bundle --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e1c43af85..cf0ccf8e8 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,10 @@ { "type": "git", "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git" + }, + { + "type": "git", + "url": "https://github.com/rimvislt/DoctrineMongoDBBundle.git" } ], "require": { @@ -64,7 +68,7 @@ "symfony/yaml": "^4.3|^5", "empi89/php-amqp-stubs": "*@dev", "doctrine/doctrine-bundle": "~1.2|^2", - "doctrine/mongodb-odm-bundle": "^3.5|^4", + "doctrine/mongodb-odm-bundle": "4.3.x-dev as 4.3.0", "alcaeus/mongo-php-adapter": "^1.0", "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0", "friendsofphp/php-cs-fixer": "^2", From 03c31d1eac5a097542012135ab211f339fbd4fff Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 11:36:57 +0200 Subject: [PATCH 10/44] Try allowing an older version of odm bundle too --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cf0ccf8e8..bcf7bdc6f 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "symfony/yaml": "^4.3|^5", "empi89/php-amqp-stubs": "*@dev", "doctrine/doctrine-bundle": "~1.2|^2", - "doctrine/mongodb-odm-bundle": "4.3.x-dev as 4.3.0", + "doctrine/mongodb-odm-bundle": "^3.5|4.3.x-dev as 4.3.0", "alcaeus/mongo-php-adapter": "^1.0", "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0", "friendsofphp/php-cs-fixer": "^2", From 7c805fd9ffbbbd09c29fcc433b0f852934c8a006 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 11:39:39 +0200 Subject: [PATCH 11/44] Nope --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bcf7bdc6f..cf0ccf8e8 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "symfony/yaml": "^4.3|^5", "empi89/php-amqp-stubs": "*@dev", "doctrine/doctrine-bundle": "~1.2|^2", - "doctrine/mongodb-odm-bundle": "^3.5|4.3.x-dev as 4.3.0", + "doctrine/mongodb-odm-bundle": "4.3.x-dev as 4.3.0", "alcaeus/mongo-php-adapter": "^1.0", "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0", "friendsofphp/php-cs-fixer": "^2", From b23e7330ebf027bffda24ad844bda4f4a62d4260 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 11:43:51 +0200 Subject: [PATCH 12/44] Run stan and cs-fixer with sf 5.2; add php 7.4 + sf 5.2 unit test job --- .github/workflows/ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 309570124..cce40d8fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,10 +23,9 @@ jobs: extensions: mongodb, redis, :xdebug ini-values: memory_limit=2048M - - run: php ./bin/fix-symfony-version.php "4.3.*" + - run: php ./bin/fix-symfony-version.php "5.2.*" - uses: "ramsey/composer-install@v1" - - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php - run: docker run --workdir="/mqdev" -v "`pwd`:/mqdev" --rm enqueue/dev:latest php -d memory_limit=1024M bin/phpstan analyse -l 1 -c phpstan.neon --error-format=github -- ${{ env.GIT_DIFF_FILTERED }} @@ -50,10 +49,9 @@ jobs: extensions: mongodb, redis, :xdebug ini-values: memory_limit=2048M - - run: php ./bin/fix-symfony-version.php "4.3.*" + - run: php ./bin/fix-symfony-version.php "5.2.*" - uses: "ramsey/composer-install@v1" - - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php - run: ./bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff -v --path-mode=intersection -- ${{ env.GIT_DIFF_FILTERED }} @@ -102,6 +100,12 @@ jobs: 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 From 928f0e8a3488d854dc4855bc5ec837f1ae9e8b89 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 11:53:46 +0200 Subject: [PATCH 13/44] Fix exception message variations between versions --- .../Tests/Unit/DependencyInjection/ConfigurationTest.php | 6 +++++- .../Tests/Symfony/ContainerProcessorRegistryTest.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php index d641227ef..c9356f1ec 100644 --- a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php @@ -113,7 +113,11 @@ public function testThrowIfClientDriverOptionsIsNotArray() $processor = new Processor(); $this->expectException(InvalidTypeException::class); - $this->expectExceptionMessage('Invalid type for path "enqueue.default.client.driver_options". Expected array, but got string'); + // Exception messages vary slightly between versions + $this->expectExceptionMessageMatches( + '/Invalid type for path "enqueue\.default\.client\.driver_options"\. Expected "?array"?, but got "?string"?/' + ); + $processor->processConfiguration($configuration, [[ 'default' => [ 'transport' => 'null:', diff --git a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php index bf6e3cd01..d1c4186c5 100644 --- a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php +++ b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php @@ -69,7 +69,11 @@ public function testThrowErrorIfServiceDoesNotImplementProcessorReturnType() $registry = new ContainerProcessorRegistry($containerMock); $this->expectException(\TypeError::class); - $this->expectExceptionMessage('Return value of Enqueue\Symfony\ContainerProcessorRegistry::get() must implement interface Interop\Queue\Processor, instance of stdClass returned'); + // Exception messages vary slightly between versions + $this->expectExceptionMessageMatches( + '/Return value of Enqueue\\Symfony\\ContainerProcessorRegistry::get\(\) .+ Interop\\Queue\\Processor, .?stdClass returned/' + ); + $registry->get('processor-name'); } From 163a6f05698d6992aa061269e81cd80e32a75f3b Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 11:55:58 +0200 Subject: [PATCH 14/44] Derp --- pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php index d1c4186c5..9b90d3390 100644 --- a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php +++ b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php @@ -71,7 +71,7 @@ public function testThrowErrorIfServiceDoesNotImplementProcessorReturnType() $this->expectException(\TypeError::class); // Exception messages vary slightly between versions $this->expectExceptionMessageMatches( - '/Return value of Enqueue\\Symfony\\ContainerProcessorRegistry::get\(\) .+ Interop\\Queue\\Processor, .?stdClass returned/' + '/Return value of Enqueue\\Symfony\\ContainerProcessorRegistry::get\(\) .+ Interop\\Queue\\Processor, .*stdClass returned/' ); $registry->get('processor-name'); From 5ac76b29206a541effff8866a90bceaabc6ceb4d Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 12:02:46 +0200 Subject: [PATCH 15/44] Derp --- pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php index 9b90d3390..2169e271f 100644 --- a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php +++ b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php @@ -71,7 +71,7 @@ public function testThrowErrorIfServiceDoesNotImplementProcessorReturnType() $this->expectException(\TypeError::class); // Exception messages vary slightly between versions $this->expectExceptionMessageMatches( - '/Return value of Enqueue\\Symfony\\ContainerProcessorRegistry::get\(\) .+ Interop\\Queue\\Processor, .*stdClass returned/' + '/Enqueue\\Symfony\\ContainerProcessorRegistry::get\(\) .+ Interop\\Queue\\Processor, .*stdClass returned/' ); $registry->get('processor-name'); From 35a84edddb01c4d02faa8fff08497e4b833f9738 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 12:09:46 +0200 Subject: [PATCH 16/44] =?UTF-8?q?=F0=9F=A4=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php index 2169e271f..bf7957178 100644 --- a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php +++ b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php @@ -71,7 +71,7 @@ public function testThrowErrorIfServiceDoesNotImplementProcessorReturnType() $this->expectException(\TypeError::class); // Exception messages vary slightly between versions $this->expectExceptionMessageMatches( - '/Enqueue\\Symfony\\ContainerProcessorRegistry::get\(\) .+ Interop\\Queue\\Processor, .*stdClass returned/' + '/Enqueue\\Symfony\\ContainerProcessorRegistry\:\:get\(\).+ Interop\\Queue\\Processor, .*stdClass returned/' ); $registry->get('processor-name'); From ab8f784134cd10970b178bb012c7a44c1a746357 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 12:14:59 +0200 Subject: [PATCH 17/44] Ok got the regex --- pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php index bf7957178..e0dcf2e09 100644 --- a/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php +++ b/pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php @@ -71,7 +71,7 @@ public function testThrowErrorIfServiceDoesNotImplementProcessorReturnType() $this->expectException(\TypeError::class); // Exception messages vary slightly between versions $this->expectExceptionMessageMatches( - '/Enqueue\\Symfony\\ContainerProcessorRegistry\:\:get\(\).+ Interop\\Queue\\Processor, .*stdClass returned/' + '/Enqueue\\\\Symfony\\\\ContainerProcessorRegistry::get\(\).+ Interop\\\\Queue\\\\Processor,.*stdClass returned/' ); $registry->get('processor-name'); From c73d4756bb892271b0cf05631ee063bff23c31d5 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 13:51:12 +0200 Subject: [PATCH 18/44] Try building php 8 container --- .github/workflows/ci.yml | 2 ++ docker-compose.yml | 7 ++++++- docker/Dockerfile | 15 +++++++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cce40d8fc..cda54921d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -161,6 +161,8 @@ 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 diff --git a/docker-compose.yml b/docker-compose.yml index f782de48e..40714364a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,12 @@ version: '2' services: dev: - image: enqueue/dev:latest + # when image publishing gets sorted: + # image: enqueue/dev:${PHP_VERSION} + build: + context: docker + args: + - PHP_VERSION=${PHP_VERSION:7.3} depends_on: - rabbitmq - mysql diff --git a/docker/Dockerfile b/docker/Dockerfile index 86f460f8e..831dd0cd2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,24 +1,27 @@ -FROM formapro/nginx-php-fpm:7.3-latest-all-exts +ARG PHP_VERSION=7.3 +FROM formapro/nginx-php-fpm:${PHP_VERSION}-latest-all-exts + +ARG PHP_VERSION ## libs RUN set -x && \ apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php7.3-dev php7.3-redis php7.3-pgsql git python php-amqp + apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php-dev php${PHP_VERSION}-redis php${PHP_VERSION}-pgsql git python php-amqp ## librdkafka RUN set -x && \ apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php7.3-dev make && \ + apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php${PHP_VERSION}-dev make && \ mkdir -p $HOME/librdkafka && \ cd $HOME/librdkafka && \ git clone https://github.com/edenhill/librdkafka.git . && \ git checkout v1.0.0 && \ ./configure && make && make install && \ pecl install rdkafka && \ - echo "extension=rdkafka.so" > /etc/php/7.3/cli/conf.d/10-rdkafka.ini && \ - echo "extension=rdkafka.so" > /etc/php/7.3/fpm/conf.d/10-rdkafka.ini + echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-rdkafka.ini && \ + echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-rdkafka.ini -COPY ./php/cli.ini /etc/php/7.3/cli/conf.d/1-dev_cli.ini +COPY ./php/cli.ini /etc/php/${PHP_VERSION}/cli/conf.d/1-dev_cli.ini COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh RUN chmod u+x /usr/local/bin/entrypoint.sh From 86411e437c2eee36fafd199aa7595efe0cb34b98 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 13:57:16 +0200 Subject: [PATCH 19/44] Fix the default version parameter --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 40714364a..2bf4d96c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: build: context: docker args: - - PHP_VERSION=${PHP_VERSION:7.3} + PHP_VERSION: ${PHP_VERSION:-7.3} depends_on: - rabbitmq - mysql From 2de3638d131771853ba7953f91fb1d6141318f73 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 14:05:30 +0200 Subject: [PATCH 20/44] Pull silently --- bin/dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dev b/bin/dev index e5f40ffbd..a50b7ad66 100755 --- a/bin/dev +++ b/bin/dev @@ -6,7 +6,7 @@ set -e while getopts "bustefdp" OPTION; do case $OPTION in b) - docker-compose pull && docker-compose build + docker-compose pull -q && docker-compose build ;; u) docker-compose up From c90b6b896b5876b4f5e689654c3d8b53d2b23cd3 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 14:20:04 +0200 Subject: [PATCH 21/44] Stringify the php version arg --- .github/workflows/ci.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cda54921d..68e29dd95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -162,7 +162,7 @@ jobs: - run: bin/dev -b env: - PHP_VERSION: ${{ matrix.php }} + PHP_VERSION: "${{ matrix.php }}" if: matrix.prepare_container - run: bin/phpunit --exclude-group=functional diff --git a/docker-compose.yml b/docker-compose.yml index 2bf4d96c7..ae4256c42 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: build: context: docker args: - PHP_VERSION: ${PHP_VERSION:-7.3} + PHP_VERSION: "${PHP_VERSION:-7.3}" depends_on: - rabbitmq - mysql From 44f28413f8138ba3c7df1b0062c1ebacac6660c8 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 14:54:56 +0200 Subject: [PATCH 22/44] Now it started installing 8 and 7 libs together --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 831dd0cd2..e7b4ac7d6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,12 +6,12 @@ ARG PHP_VERSION ## libs RUN set -x && \ apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php-dev php${PHP_VERSION}-redis php${PHP_VERSION}-pgsql git python php-amqp + apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php${PHP_VERSION}-dev php${PHP_VERSION}-redis php${PHP_VERSION}-pgsql git python php${PHP_VERSION}-amqp ## librdkafka RUN set -x && \ apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php${PHP_VERSION}-dev make && \ + apt-get install -y --no-install-recommends --no-install-suggests g++ php${PHP_VERSION}-pear php${PHP_VERSION}-dev make && \ mkdir -p $HOME/librdkafka && \ cd $HOME/librdkafka && \ git clone https://github.com/edenhill/librdkafka.git . && \ From 06df4e0e551b120e1dc28f8b2349e81e80145250 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 15:01:52 +0200 Subject: [PATCH 23/44] Pear is not versioned --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e7b4ac7d6..17b7cce0e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,7 +11,7 @@ RUN set -x && \ ## librdkafka RUN set -x && \ apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests g++ php${PHP_VERSION}-pear php${PHP_VERSION}-dev make && \ + apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php${PHP_VERSION}-dev make && \ mkdir -p $HOME/librdkafka && \ cd $HOME/librdkafka && \ git clone https://github.com/edenhill/librdkafka.git . && \ From 8049c47749dbfa8b7ffefe85b07e07fd24eb8e64 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 15:34:24 +0200 Subject: [PATCH 24/44] Update the docker hub namespace --- docker/Dockerfile | 2 +- docker/thruway/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 17b7cce0e..2d7f72402 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION=7.3 -FROM formapro/nginx-php-fpm:${PHP_VERSION}-latest-all-exts +FROM makasim/nginx-php-fpm:${PHP_VERSION}-latest-all-exts ARG PHP_VERSION diff --git a/docker/thruway/Dockerfile b/docker/thruway/Dockerfile index c9e795478..3bca735b2 100644 --- a/docker/thruway/Dockerfile +++ b/docker/thruway/Dockerfile @@ -1,4 +1,4 @@ -FROM formapro/nginx-php-fpm:latest-all-exts +FROM makasim/nginx-php-fpm:latest-all-exts RUN mkdir -p /thruway WORKDIR /thruway From 19427650f71c88a5acbfd78a10d0aa1119efde27 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 15:44:04 +0200 Subject: [PATCH 25/44] Stringify the php version arg --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68e29dd95..306172b5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,19 +124,19 @@ jobs: functional_tests: false rdkafka_tests: true prepare_container: true - - php: 8.0 + - php: "8.0" symfony_version: 5.2.* unit_tests: true functional_tests: false rdkafka_tests: false prepare_container: false - - php: 8.0 + - php: "8.0" symfony_version: 5.2.* unit_tests: false functional_tests: true rdkafka_tests: false prepare_container: true - - php: 8.0 + - php: "8.0" symfony_version: 5.2.* unit_tests: false rdkafka_tests: true From 4423c45237c79ded983ea82d20b4273f79074268 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Mon, 25 Jan 2021 22:02:59 +0200 Subject: [PATCH 26/44] CI: better composer install step --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 306172b5e..9e9887e2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,7 @@ jobs: - run: php ./bin/fix-symfony-version.php "5.2.*" - uses: "ramsey/composer-install@v1" + - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php - run: docker run --workdir="/mqdev" -v "`pwd`:/mqdev" --rm enqueue/dev:latest php -d memory_limit=1024M bin/phpstan analyse -l 1 -c phpstan.neon --error-format=github -- ${{ env.GIT_DIFF_FILTERED }} @@ -52,6 +53,7 @@ jobs: - run: php ./bin/fix-symfony-version.php "5.2.*" - uses: "ramsey/composer-install@v1" + - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php - run: ./bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff -v --path-mode=intersection -- ${{ env.GIT_DIFF_FILTERED }} From 023ff010c5e5bd2b483a51dd707982f8951fa5e2 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 26 Jan 2021 22:01:50 +0200 Subject: [PATCH 27/44] Try a fork of stomp-php/stomp-php --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cf0ccf8e8..e6f73adc8 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,10 @@ { "type": "git", "url": "https://github.com/rimvislt/DoctrineMongoDBBundle.git" + }, + { + "type": "git", + "url": "https://github.com/andrewmy/stomp-php.git" } ], "require": { @@ -40,7 +44,7 @@ "mongodb/mongodb": "^1.2", "pda/pheanstalk": "^3", "aws/aws-sdk-php": "^3.26", - "stomp-php/stomp-php": "^4", + "stomp-php/stomp-php": "dev-php-8-travis as 4.6.1", "php-http/guzzle7-adapter": "^0.1.1", "php-http/client-common": "^2.2.1", "richardfullmer/rabbitmq-management-api": "dev-http-client-2 as 2.1.0", From e0f1c2ffcaadfb326878a0dcc5a9b9625e770cb7 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 26 Jan 2021 22:36:29 +0200 Subject: [PATCH 28/44] Fix ext-gearman install --- docker/Dockerfile | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 2d7f72402..ab0cc62f7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,8 +5,26 @@ ARG PHP_VERSION ## libs RUN set -x && \ + pecl channel-update pecl.php.net && \ apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php${PHP_VERSION}-dev php${PHP_VERSION}-redis php${PHP_VERSION}-pgsql git python php${PHP_VERSION}-amqp + apt-get install -y --no-install-recommends --no-install-suggests \ + wget \ + curl \ + openssl \ + ca-certificates \ + nano \ + netcat \ + php${PHP_VERSION}-dev \ + php${PHP_VERSION}-redis \ + php${PHP_VERSION}-pgsql \ + git \ + python \ + php${PHP_VERSION}-amqp \ + libgearman-dev \ + && \ + pecl install gearman && \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-gearman.ini && \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-gearman.ini ## librdkafka RUN set -x && \ From a1eb22f50231daf486556180856554aeea9c7cf4 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 26 Jan 2021 22:45:06 +0200 Subject: [PATCH 29/44] Derp --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ab0cc62f7..93aa22654 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,6 @@ ARG PHP_VERSION ## libs RUN set -x && \ - pecl channel-update pecl.php.net && \ apt-get update && \ apt-get install -y --no-install-recommends --no-install-suggests \ wget \ @@ -22,6 +21,7 @@ RUN set -x && \ php${PHP_VERSION}-amqp \ libgearman-dev \ && \ + pecl channel-update pecl.php.net && \ pecl install gearman && \ echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-gearman.ini && \ echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-gearman.ini From 36ed6ac0ac0513e69ef3e8e252a4a74bf473a37c Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 26 Jan 2021 22:56:20 +0200 Subject: [PATCH 30/44] Move pear around --- docker/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 93aa22654..204ea3c41 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,6 +20,7 @@ RUN set -x && \ python \ php${PHP_VERSION}-amqp \ libgearman-dev \ + php-pear \ && \ pecl channel-update pecl.php.net && \ pecl install gearman && \ @@ -29,7 +30,10 @@ RUN set -x && \ ## librdkafka RUN set -x && \ apt-get update && \ - apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php${PHP_VERSION}-dev make && \ + apt-get install -y --no-install-recommends --no-install-suggests \ + g++ \ + make \ + && \ mkdir -p $HOME/librdkafka && \ cd $HOME/librdkafka && \ git clone https://github.com/edenhill/librdkafka.git . && \ From a08df5ca634d70d769215c258d23bac02cd3ae76 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 26 Jan 2021 23:08:46 +0200 Subject: [PATCH 31/44] Move make around --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 204ea3c41..914c16255 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,6 +21,7 @@ RUN set -x && \ php${PHP_VERSION}-amqp \ libgearman-dev \ php-pear \ + make \ && \ pecl channel-update pecl.php.net && \ pecl install gearman && \ @@ -32,7 +33,6 @@ RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends --no-install-suggests \ g++ \ - make \ && \ mkdir -p $HOME/librdkafka && \ cd $HOME/librdkafka && \ From a26cdf5118930af4c2f388f1e4a760ac2c0f1110 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 2 Feb 2021 02:14:06 +0200 Subject: [PATCH 32/44] =?UTF-8?q?doctrine/mongodb-odm-bundle=204.3=20relea?= =?UTF-8?q?sed=20=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index e6f73adc8..2c8a28c50 100644 --- a/composer.json +++ b/composer.json @@ -13,10 +13,6 @@ "type": "git", "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git" }, - { - "type": "git", - "url": "https://github.com/rimvislt/DoctrineMongoDBBundle.git" - }, { "type": "git", "url": "https://github.com/andrewmy/stomp-php.git" @@ -72,7 +68,7 @@ "symfony/yaml": "^4.3|^5", "empi89/php-amqp-stubs": "*@dev", "doctrine/doctrine-bundle": "~1.2|^2", - "doctrine/mongodb-odm-bundle": "4.3.x-dev as 4.3.0", + "doctrine/mongodb-odm-bundle": "^3.5|^4.3", "alcaeus/mongo-php-adapter": "^1.0", "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0", "friendsofphp/php-cs-fixer": "^2", From 54fee9ef14e193b0cd4edcab7067f472ca09d2a5 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Thu, 4 Feb 2021 00:55:55 +0200 Subject: [PATCH 33/44] =?UTF-8?q?stomp-php/stomp-php=205.0=20released=20?= =?UTF-8?q?=F0=9F=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 2c8a28c50..27b9a0d11 100644 --- a/composer.json +++ b/composer.json @@ -12,10 +12,6 @@ { "type": "git", "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git" - }, - { - "type": "git", - "url": "https://github.com/andrewmy/stomp-php.git" } ], "require": { @@ -40,7 +36,7 @@ "mongodb/mongodb": "^1.2", "pda/pheanstalk": "^3", "aws/aws-sdk-php": "^3.26", - "stomp-php/stomp-php": "dev-php-8-travis as 4.6.1", + "stomp-php/stomp-php": "^4|^5", "php-http/guzzle7-adapter": "^0.1.1", "php-http/client-common": "^2.2.1", "richardfullmer/rabbitmq-management-api": "dev-http-client-2 as 2.1.0", From 86684ff69d2baaa16692111416038c9097e3b2ac Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 9 Feb 2021 10:01:50 +0200 Subject: [PATCH 34/44] Use the proper tagged base docker image --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 914c16255..b28e7078b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION=7.3 -FROM makasim/nginx-php-fpm:${PHP_VERSION}-latest-all-exts +FROM makasim/nginx-php-fpm:${PHP_VERSION}-all-exts ARG PHP_VERSION From 073bcbad97ba9ee893ebdf0e327cbe105768445e Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 9 Feb 2021 10:17:16 +0200 Subject: [PATCH 35/44] XML extension not found? --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index b28e7078b..5ff2b6318 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,6 +19,7 @@ RUN set -x && \ git \ python \ php${PHP_VERSION}-amqp \ + php${PHP_VERSION}-xml \ libgearman-dev \ php-pear \ make \ From a98f7e75830b19d6b9c91abe4162f2e5e78d5007 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 9 Feb 2021 10:48:03 +0200 Subject: [PATCH 36/44] =?UTF-8?q?MySQL=20driver=20not=20found=20?= =?UTF-8?q?=F0=9F=A4=A6=E2=80=8D=E2=99=82=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5ff2b6318..f57663225 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,6 +20,7 @@ RUN set -x && \ python \ php${PHP_VERSION}-amqp \ php${PHP_VERSION}-xml \ + php${PHP_VERSION}-mysql \ libgearman-dev \ php-pear \ make \ From 4f8e1ca4b70558c0a5a984c6e5bfcba640321b83 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 9 Feb 2021 11:00:28 +0200 Subject: [PATCH 37/44] Gearman already installed --- docker/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f57663225..da1a9fc30 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,10 +25,7 @@ RUN set -x && \ php-pear \ make \ && \ - pecl channel-update pecl.php.net && \ - pecl install gearman && \ - echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-gearman.ini && \ - echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-gearman.ini + pecl channel-update pecl.php.net ## librdkafka RUN set -x && \ From ddf1146362cdf9d94cc908334d435b18220e4584 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 9 Feb 2021 11:13:42 +0200 Subject: [PATCH 38/44] Revert "Gearman already installed" This reverts commit 33208dae92850d6d50c61aab6ea554e6d5e9580b. --- docker/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index da1a9fc30..f57663225 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,7 +25,10 @@ RUN set -x && \ php-pear \ make \ && \ - pecl channel-update pecl.php.net + pecl channel-update pecl.php.net && \ + pecl install gearman && \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-gearman.ini && \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-gearman.ini ## librdkafka RUN set -x && \ From 480eef5f132ab4c47d75f82d37982c2188df5a72 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 9 Feb 2021 11:36:52 +0200 Subject: [PATCH 39/44] Fix gearman? --- docker/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f57663225..c9d7599c7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,9 +26,7 @@ RUN set -x && \ make \ && \ pecl channel-update pecl.php.net && \ - pecl install gearman && \ - echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-gearman.ini && \ - echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-gearman.ini + pecl install gearman ## librdkafka RUN set -x && \ From f67ec8aa21b4e32bb098d540667289aa372bbf22 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 9 Feb 2021 12:37:00 +0200 Subject: [PATCH 40/44] Fix curl, conditionally install gearman --- docker/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c9d7599c7..84933dea6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,12 +21,18 @@ RUN set -x && \ php${PHP_VERSION}-amqp \ php${PHP_VERSION}-xml \ php${PHP_VERSION}-mysql \ + php${PHP_VERSION}-curl \ libgearman-dev \ php-pear \ make \ && \ pecl channel-update pecl.php.net && \ - pecl install gearman + pecl install gearman && \ + if [ ! -f /etc/php/${PHP_VERSION}/cli/conf.d/10-gearman.ini ]; then \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-gearman.ini && \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-gearman.ini \ + ; \ + fi; ## librdkafka RUN set -x && \ From 684cc26773c5efa254c97d679562aa039629f56e Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 9 Feb 2021 12:53:01 +0200 Subject: [PATCH 41/44] Fix 7.3 gearman --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 84933dea6..2b21de82b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -28,9 +28,9 @@ RUN set -x && \ && \ pecl channel-update pecl.php.net && \ pecl install gearman && \ - if [ ! -f /etc/php/${PHP_VERSION}/cli/conf.d/10-gearman.ini ]; then \ - echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-gearman.ini && \ - echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-gearman.ini \ + if [ ! -f /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini ]; then \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini && \ + echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/20-gearman.ini \ ; \ fi; From 0257a50d0ff5c28837d0f85b5671506e7fc0bf7a Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 9 Feb 2021 14:01:28 +0200 Subject: [PATCH 42/44] Add php 8 to packages' build matrices; normalize composer reqs --- pkg/amqp-bunny/.github/workflows/ci.yml | 2 +- pkg/amqp-ext/.github/workflows/ci.yml | 2 +- pkg/amqp-lib/.github/workflows/ci.yml | 2 +- pkg/amqp-tools/.github/workflows/ci.yml | 2 +- pkg/async-command/.github/workflows/ci.yml | 2 +- pkg/async-command/composer.json | 2 +- pkg/async-event-dispatcher/.github/workflows/ci.yml | 2 +- pkg/dbal/.github/workflows/ci.yml | 2 +- pkg/dsn/.github/workflows/ci.yml | 2 +- pkg/dsn/composer.json | 4 ++-- pkg/enqueue-bundle/.github/workflows/ci.yml | 2 +- pkg/enqueue-bundle/composer.json | 2 +- pkg/enqueue/.github/workflows/ci.yml | 2 +- pkg/fs/.github/workflows/ci.yml | 2 +- pkg/gearman/.github/workflows/ci.yml | 2 +- pkg/gps/.github/workflows/ci.yml | 2 +- pkg/job-queue/.github/workflows/ci.yml | 2 +- pkg/mongodb/.github/workflows/ci.yml | 2 +- pkg/monitoring/.github/workflows/ci.yml | 2 +- pkg/null/.github/workflows/ci.yml | 2 +- pkg/pheanstalk/.github/workflows/ci.yml | 2 +- pkg/rdkafka/.github/workflows/ci.yml | 2 +- pkg/redis/.github/workflows/ci.yml | 2 +- pkg/simple-client/.github/workflows/ci.yml | 2 +- pkg/sns/.github/workflows/ci.yml | 2 +- pkg/snsqs/.github/workflows/ci.yml | 2 +- pkg/sqs/.github/workflows/ci.yml | 2 +- pkg/stomp/.github/workflows/ci.yml | 2 +- pkg/stomp/composer.json | 2 +- pkg/wamp/.github/workflows/ci.yml | 2 +- 30 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkg/amqp-bunny/.github/workflows/ci.yml b/pkg/amqp-bunny/.github/workflows/ci.yml index bd62476f1..67837ef97 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/amqp-ext/.github/workflows/ci.yml b/pkg/amqp-ext/.github/workflows/ci.yml index 24af1bbc1..fd96b2abe 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/amqp-lib/.github/workflows/ci.yml b/pkg/amqp-lib/.github/workflows/ci.yml index e60e63b9b..a168dca05 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/amqp-tools/.github/workflows/ci.yml b/pkg/amqp-tools/.github/workflows/ci.yml index bd62476f1..67837ef97 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/async-command/.github/workflows/ci.yml b/pkg/async-command/.github/workflows/ci.yml index e60e63b9b..a168dca05 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/async-command/composer.json b/pkg/async-command/composer.json index 24a24e80a..4317d1eca 100644 --- a/pkg/async-command/composer.json +++ b/pkg/async-command/composer.json @@ -6,7 +6,7 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": ">=7.1", + "php": "^7.3|^8.0", "enqueue/enqueue": "^0.10", "queue-interop/queue-interop": "^0.8", "symfony/console": "^4.3|^5", diff --git a/pkg/async-event-dispatcher/.github/workflows/ci.yml b/pkg/async-event-dispatcher/.github/workflows/ci.yml index e60e63b9b..a168dca05 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/dbal/.github/workflows/ci.yml b/pkg/dbal/.github/workflows/ci.yml index e60e63b9b..a168dca05 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/dsn/.github/workflows/ci.yml b/pkg/dsn/.github/workflows/ci.yml index 8486752a8..b23e42104 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/dsn/composer.json b/pkg/dsn/composer.json index 06ef139e9..3cdac4c2d 100644 --- a/pkg/dsn/composer.json +++ b/pkg/dsn/composer.json @@ -6,10 +6,10 @@ "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", "require": { - "php": "^7.1.3" + "php": "^7.3|^8.0" }, "require-dev": { - "phpunit/phpunit": "~7.5" + "phpunit/phpunit": "^9.5" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/enqueue-bundle/.github/workflows/ci.yml b/pkg/enqueue-bundle/.github/workflows/ci.yml index 99b7fc6bf..0185cad38 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index 4773dcbed..aded35069 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -37,7 +37,7 @@ "enqueue/async-command": "0.10.x-dev", "php-amqplib/php-amqplib": "^2.7", "doctrine/doctrine-bundle": "~1.2|^2", - "doctrine/mongodb-odm-bundle": "^3.5|^4", + "doctrine/mongodb-odm-bundle": "^3.5|^4.3", "alcaeus/mongo-php-adapter": "^1.0", "symfony/browser-kit": "^4.3|^5", "symfony/expression-language": "^4.3|^5", diff --git a/pkg/enqueue/.github/workflows/ci.yml b/pkg/enqueue/.github/workflows/ci.yml index 390f70724..b39495855 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/fs/.github/workflows/ci.yml b/pkg/fs/.github/workflows/ci.yml index e9a20ead1..2a2fabfb7 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/gearman/.github/workflows/ci.yml b/pkg/gearman/.github/workflows/ci.yml index eae3a9cfa..401aab590 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/gps/.github/workflows/ci.yml b/pkg/gps/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/job-queue/.github/workflows/ci.yml b/pkg/job-queue/.github/workflows/ci.yml index ef204f16b..2df5ff80c 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/mongodb/.github/workflows/ci.yml b/pkg/mongodb/.github/workflows/ci.yml index abee78209..7a2a6f365 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/monitoring/.github/workflows/ci.yml b/pkg/monitoring/.github/workflows/ci.yml index 1dabd6bc3..237a49da1 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/null/.github/workflows/ci.yml b/pkg/null/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/pheanstalk/.github/workflows/ci.yml b/pkg/pheanstalk/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/rdkafka/.github/workflows/ci.yml b/pkg/rdkafka/.github/workflows/ci.yml index 24af1bbc1..fd96b2abe 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/redis/.github/workflows/ci.yml b/pkg/redis/.github/workflows/ci.yml index d2311341a..5dc982ea7 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/simple-client/.github/workflows/ci.yml b/pkg/simple-client/.github/workflows/ci.yml index c9683ac90..7fcc096a9 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/sns/.github/workflows/ci.yml b/pkg/sns/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/snsqs/.github/workflows/ci.yml b/pkg/snsqs/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/sqs/.github/workflows/ci.yml b/pkg/sqs/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/stomp/.github/workflows/ci.yml b/pkg/stomp/.github/workflows/ci.yml index f2accab5f..fd2ae7f2d 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 614ac2601..84532e63b 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^7.3|^8.0", "enqueue/dsn": "^0.10", - "stomp-php/stomp-php": "^4", + "stomp-php/stomp-php": "^4.0|^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/.github/workflows/ci.yml b/pkg/wamp/.github/workflows/ci.yml index 1dabd6bc3..237a49da1 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.3', '7.4'] + php: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php }} tests From f093ee204edc5b7952aa8bc1517bb5fe181ec561 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 16 Feb 2021 23:08:20 +0200 Subject: [PATCH 43/44] Use the release from the fork --- composer.json | 2 +- pkg/stomp/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 27b9a0d11..9d899a5f4 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "stomp-php/stomp-php": "^4|^5", "php-http/guzzle7-adapter": "^0.1.1", "php-http/client-common": "^2.2.1", - "richardfullmer/rabbitmq-management-api": "dev-http-client-2 as 2.1.0", + "richardfullmer/rabbitmq-management-api": "^2.1.1", "predis/predis": "^1.1", "thruway/client": "^0.5.0", "thruway/pawl-transport": "^0.5.0", diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 84532e63b..8a4a243a4 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -12,7 +12,7 @@ "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.0" + "richardfullmer/rabbitmq-management-api": "^2.1.1" }, "require-dev": { "phpunit/phpunit": "^9.5", From 41bbfbd0ea73901826541985c5eb21068ad031f3 Mon Sep 17 00:00:00 2001 From: Andrew M-Y Date: Tue, 16 Feb 2021 23:21:02 +0200 Subject: [PATCH 44/44] Add the fork repo to the split package --- pkg/stomp/composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index 8a4a243a4..301631f43 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -5,6 +5,12 @@ "keywords": ["messaging", "queue", "stomp"], "homepage": "https://enqueue.forma-pro.com/", "license": "MIT", + "repositories": [ + { + "type": "git", + "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git" + } + ], "require": { "php": "^7.3|^8.0", "enqueue/dsn": "^0.10",