Merge pull request #5 from Locastic/sylius-version-upgrade

RDY: Sylius version upgrade

Author: antonioperic

.gitignore

@@ -7,4 +7,20 @@
 /etc/build/*
 !/etc/build/.gitkeep
 
-behat.yml
+tests/Application/node_modules/
+
+tests/Application/var/
+!tests/Application/var/.gitkeep
+
+tests/Application/web/*
+!tests/Application/web/favicon.ico
+!tests/Application/web/app.php
+!tests/Application/web/app_dev.php
+!tests/Application/web/app_test.php
+
+/tests/Application/yarn.lock
+
+/composer.lock
+
+/etc/build/*
+!/etc/build/.gitkeep

.travis.yml

@@ -27,23 +27,15 @@ before_install:
 install:
     - composer install --no-interaction --prefer-dist
     - (cd tests/Application && yarn install)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle && npm i gulp)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-concat)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-if)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-livereload)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-order)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-sass)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-sourcemaps)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-uglify)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev gulp-uglifycss)
-    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle && npm i --save-dev yargs)
 
 before_script:
     - (cd tests/Application && chmod +x bin/console)
     - (cd tests/Application && bin/console doctrine:database:create --env=test -vvv)
     - (cd tests/Application && bin/console doctrine:schema:create --env=test -vvv)
     - (cd tests/Application && bin/console assets:install web --env=test -vvv)
-    - (cd tests/Application && yarn run gulp)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle && npm install gulp)
+    - (cd /home/travis/build/Locastic/SyliusComparerPlugin/tests/Application && yarn build)
+
 
     # Configure display
     - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1680x1050x16

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": "^7.1",
 
-        "sylius/sylius": "1.1.*",
+        "sylius/sylius": "1.2.*",
         "sensio/generator-bundle": "^3.1"
     },
     "require-dev": {
@@ -21,8 +21,8 @@
         "behat/mink-browserkit-driver": "^1.3",
         "behat/mink-extension": "^2.2",
         "behat/mink-selenium2-driver": "^1.3",
-        "friends-of-behat/context-service-extension": "^1.0",
-        "friends-of-behat/cross-container-extension": "^1.0",
+        "friends-of-behat/context-service-extension": "^1.2",
+        "friends-of-behat/cross-container-extension": "^1.1",
         "friends-of-behat/service-container-extension": "^1.0",
         "friends-of-behat/symfony-extension": "^1.0",
         "friends-of-behat/variadic-extension": "^1.0",
@@ -31,8 +31,8 @@
         "phpstan/phpstan-shim": "^0.9.2",
         "phpunit/phpunit": "^6.5",
         "se/selenium-server-standalone": "^2.52",
-        "sylius-labs/coding-standard": "^1.0",
-        "symplify/easy-coding-standard": "^2.4"
+        "sylius-labs/coding-standard": "^2.0",
+        "symplify/easy-coding-standard": "^4.2"
     },
     "prefer-stable": true,
     "autoload": {