Merge pull request #264 from oallain/sylius-1-10

Add Sylius 1.10 support
FriendsOfSylius · Jul 9, 2021 · b6da43e · b6da43e
2 parents cc925e1 + 96d58e2
commit b6da43e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,20 +17,23 @@ jobs:
         runs-on: ubuntu-latest
 
         name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}"
-        
+
         strategy:
             fail-fast: false
             matrix:
                 php: [7.4, 7.3]
                 symfony: [^4.4, ^5.2]
-                sylius: [~1.8.0, ~1.9.0]
+                sylius: [~1.8.0, ~1.9.0, ~1.10.0]
                 node: [10.x]
                 mysql: [5.7]
 
                 exclude:
                     -
                         sylius: ~1.8.0
                         symfony: ^5.2
+                    -
+                        sylius: ~1.10.0
+                        php: 7.3
 
         env:
             APP_ENV: test
@@ -108,6 +111,11 @@ jobs:
                 if: matrix.sylius != ''
                 run: composer require "sylius/sylius:${{ matrix.sylius }}" --no-update --no-scripts --no-interaction
 
+            -
+                name: Add Admin API Bundle for Sylius >= 1.10
+                if: matrix.sylius != '~1.8.0' && matrix.sylius != '~1.9.0'
+                run: composer require sylius/admin-api-bundle --no-update --no-scripts --no-interaction
+
             -
                 name: Install PHP dependencies
                 run: composer install --no-interaction

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.3",
-        "sylius/sylius": "~1.8.0 || ~1.9.0",
+        "sylius/sylius": "~1.8.0 || ~1.9.0 || ~1.10.0",
         "portphp/portphp": "^1.2",
         "symfony/stopwatch": "^4.4 || ^5.2",
         "queue-interop/queue-interop": "^0.6.2 || ^0.7 || ^0.8"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,11 +9,11 @@
         <testsuite name="SyliusImportExportPlugin Test Suite">
             <directory>tests</directory>
         </testsuite>
-        <server name="APP_ENV" value="test"/>
-        <env name="SHELL_VERBOSITY" value="-1" />
     </testsuites>
 
     <php>
+        <server name="APP_ENV" value="test"/>
+        <env name="SHELL_VERBOSITY" value="-1" />
         <server name="KERNEL_CLASS_PATH" value="/tests/Application/AppKernel.php" />
         <server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
     </php>