Merge pull request #452 from pbalcerzak/OPSRC-688/build_fix

Opsrc-688/build fix
BitBagCommerce · Sep 30, 2022 · 6858520 · 6858520
2 parents ad4b328 + d2ed630
commit 6858520
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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

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