From 36c36503fcd875a263b867b1862a0e34a24f62a1 Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Tue, 29 Sep 2020 09:18:53 +0300 Subject: [PATCH 1/5] fix localstack version (one that worked) --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index fb5838c06..f782de48e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -122,7 +122,7 @@ services: - '9090:9090' localstack: - image: 'localstack/localstack:latest' + image: 'localstack/localstack:0.8.10' ports: - '4576:4576' - '4575:4575' From 1ebd1fa0c3115fbd01da0fe4033199a81d6ce78b Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Tue, 29 Sep 2020 10:09:20 +0300 Subject: [PATCH 2/5] fix doctrine orm version --- composer.json | 2 +- pkg/job-queue/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 002ae9946..fa4d4824f 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "psr/container": "^1", "makasim/temp-file": "^0.2", "google/cloud-pubsub": "^0.6.1|^1.0", - "doctrine/orm": "~2.4", + "doctrine/orm": "2.4.*|2.5.*", "mongodb/mongodb": "^1.2", "pda/pheanstalk": "^3", "aws/aws-sdk-php": "^3.26", diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index dd31c62c4..dcf4ca25d 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.4.*|2.5.*" }, "require-dev": { "phpunit/phpunit": "~7.5", From 40d3607602e4ca6d40232687c0d95d6c26dd30cd Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Tue, 29 Sep 2020 10:21:25 +0300 Subject: [PATCH 3/5] fix doctrine version --- composer.json | 2 +- pkg/job-queue/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index fa4d4824f..2672c6bc7 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "psr/container": "^1", "makasim/temp-file": "^0.2", "google/cloud-pubsub": "^0.6.1|^1.0", - "doctrine/orm": "2.4.*|2.5.*", + "doctrine/orm": ">2.4,<2.7.0", "mongodb/mongodb": "^1.2", "pda/pheanstalk": "^3", "aws/aws-sdk-php": "^3.26", diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index dcf4ca25d..88141bd09 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.*|2.5.*" + "doctrine/orm": ">2.4,<2.7.0" }, "require-dev": { "phpunit/phpunit": "~7.5", From fc50ed8cbd2fcfd10d9e187aff60a37eb72c0ccb Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Tue, 29 Sep 2020 10:34:14 +0300 Subject: [PATCH 4/5] fix doctrine version --- composer.json | 2 +- pkg/job-queue/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2672c6bc7..c9ee5e88c 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "psr/container": "^1", "makasim/temp-file": "^0.2", "google/cloud-pubsub": "^0.6.1|^1.0", - "doctrine/orm": ">2.4,<2.7.0", + "doctrine/orm": "2.7.0", "mongodb/mongodb": "^1.2", "pda/pheanstalk": "^3", "aws/aws-sdk-php": "^3.26", diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index 88141bd09..f4b82d17e 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,<2.7.0" + "doctrine/orm": "2.7.0" }, "require-dev": { "phpunit/phpunit": "~7.5", From 635d0ea2b10305c53e3cf44ebecc7aae4027288a Mon Sep 17 00:00:00 2001 From: Maksim Kotlyar Date: Tue, 29 Sep 2020 10:56:31 +0300 Subject: [PATCH 5/5] fix doctrine version --- composer.json | 4 ++-- pkg/job-queue/composer.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c9ee5e88c..3799f63b4 100644 --- a/composer.json +++ b/composer.json @@ -20,13 +20,13 @@ "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", + "doctrine/dbal": "^2.6,<2.10", "ramsey/uuid": "^2|^3.5|^4.0", "psr/log": "^1", "psr/container": "^1", "makasim/temp-file": "^0.2", "google/cloud-pubsub": "^0.6.1|^1.0", - "doctrine/orm": "2.7.0", + "doctrine/orm": "~2.4", "mongodb/mongodb": "^1.2", "pda/pheanstalk": "^3", "aws/aws-sdk-php": "^3.26", diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index f4b82d17e..08b9889c2 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -10,7 +10,8 @@ "enqueue/enqueue": "^0.10", "enqueue/null": "^0.10", "queue-interop/queue-interop": "^0.8", - "doctrine/orm": "2.7.0" + "doctrine/orm": "~2.4", + "doctrine/dbal": "<2.10" }, "require-dev": { "phpunit/phpunit": "~7.5",