Remove conflict for Api-Platform with Sylius 1.9

Sylius · Apr 13, 2021 · e961e2b · e961e2b
1 parent 11cfe54
commit e961e2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -103,6 +103,11 @@ jobs:
                     composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10"
                     composer config extra.symfony.require "${{ matrix.symfony }}"
 
+            -
+                name: Add Api-Platform conflict
+                if: matrix.sylius == ~1.8.0
+                run: composer require "api-platform/core:~2.5" --no-update --no-scripts --no-interaction
+
             -
                 name: Restrict Sylius version
                 if: matrix.sylius != ''

diff --git a/composer.json b/composer.json
@@ -65,8 +65,7 @@
         }
     },
     "conflict": {
-        "symplify/package-builder": "8.3.25",
-        "api-platform/core": "^2.6"
+        "symplify/package-builder": "8.3.25"
     },
     "scripts": {
         "analyse": [