From 193a9bb1fee3981b49d429c5bae7e30737169555 Mon Sep 17 00:00:00 2001 From: Piotr Balcerzak Date: Wed, 28 Sep 2022 08:27:02 +0200 Subject: [PATCH 1/2] fix build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 815d6bded..9dd8b99cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: php: 8.0 - sylius: ~1.10.0 - symfony: 4.4 + symfony: ^4.4 - sylius: ~1.11.0 php: 7.4 From d2ed6307fd48f9d3671ed7e5f283398b50cd8a84 Mon Sep 17 00:00:00 2001 From: Piotr Balcerzak Date: Wed, 28 Sep 2022 09:16:38 +0200 Subject: [PATCH 2/2] Removed doctrine conflicts from composer.json --- composer.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/composer.json b/composer.json index 40a4c7edf..1b1711c71 100755 --- a/composer.json +++ b/composer.json @@ -51,8 +51,6 @@ "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "conflict": { - "doctrine/orm": "^2.10", - "doctrine/dbal": "^3.0", "symfony/symfony": "4.1.8", "symfony/browser-kit": "4.1.8", "symfony/dom-crawler": "4.1.8",