Merge branch 'master' of github.com:BitBagCommerce/SyliusCmsPlugin

BitBagCommerce · Apr 26, 2020 · d7c6ddd · d7c6ddd
2 parents 63d5921 + 4ff97ba
commit d7c6ddd
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,35 @@ dist: trusty
 
 sudo: false
 
-php:
-    - 7.2
-    - 7.3
+matrix:
+    include:
+        # Sylius 1.4
+        -
+            php: 7.2
+            env:
+                - DEPENDENCY_VERSIONS="sylius/sylius:1.4.*"
+        -
+            php: 7.3
+            env:
+                - DEPENDENCY_VERSIONS="sylius/sylius:1.4.*"
+        # Sylius 1.5
+        -
+            php: 7.2
+            env:
+                - DEPENDENCY_VERSIONS="sylius/sylius:1.5.*"
+        -
+            php: 7.3
+            env:
+                - DEPENDENCY_VERSIONS="sylius/sylius:1.5.*"
+        # Sylius 1.6
+        -
+            php: 7.2
+            env:
+                - DEPENDENCY_VERSIONS="sylius/sylius:1.6.*"
+        -
+            php: 7.3
+            env:
+                - DEPENDENCY_VERSIONS="sylius/sylius:1.6.*"
 
 cache:
     yarn: true
@@ -27,7 +53,8 @@ before_install:
     - mkdir -p tests/Application/public/media/image
 
 install:
-    - composer install --no-interaction --prefer-dist
+    - composer require ${DEPENDENCY_VERSIONS} --no-update
+    - composer update --no-interaction --prefer-dist
     - (cd tests/Application && yarn install)
 
 before_script:

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     "require": {
         "php": "^7.2",
         "league/csv": "^9.1",
-        "friendsofsymfony/ckeditor-bundle": "^1.1",
+        "friendsofsymfony/ckeditor-bundle": "^1.1|^2.0",
         "stefandoorn/sitemap-plugin": "^1.0",
         "sylius/sylius": "^1.4"
     },

diff --git a/tests/Application/config/packages/twig.yaml b/tests/Application/config/packages/twig.yaml
@@ -2,3 +2,5 @@ twig:
     paths: ['%kernel.project_dir%/templates']
     debug: '%kernel.debug%'
     strict_variables: '%kernel.debug%'
+    form_themes:
+        - '@FOSCKEditor/Form/ckeditor_widget.html.twig'