Changes between 1.1 and 1.2

.babelrc

@@ -0,0 +1,20 @@
+{
+  "presets": [
+    ["env", {
+      "targets": {
+        "node": "6"
+      },
+      "useBuiltIns": true
+    }]
+  ],
+  "plugins": [
+    ["transform-object-rest-spread", {
+      "useBuiltIns": true
+    }],
+    ["transform-runtime", {
+      "helpers": true,
+      "polyfill": true,
+      "regenerator": true
+    }]
+  ]
+}

.eslintrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  extends: 'airbnb-base',
+  rules: {
+    'function-paren-newline': ['error', 'consistent'],
+    'max-len': ['warn', 120, 2, {
+      ignoreUrls: true,
+      ignoreComments: false,
+      ignoreRegExpLiterals: true,
+      ignoreStrings: true,
+      ignoreTemplateLiterals: true,
+    }],
+  },
+};

.travis.yml

@@ -18,6 +18,9 @@ env:
     global:
         - SYLIUS_CACHE_DIR=$HOME/.sylius-cache
         - SYLIUS_BUILD_DIR=etc/build
+    matrix:
+        - SYMFONY_VERSION="3.4.*"
+        - SYMFONY_VERSION="4.1.*"
 
 services:
     - memcached
@@ -29,16 +32,16 @@ before_install:
     - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
 install:
-    - composer install --no-interaction --prefer-dist
+    - composer require "symfony/symfony:${SYMFONY_VERSION}" --no-interaction --prefer-dist
     - yarn install
 
 before_script:
     - bin/console doctrine:database:create --env=test_cached -vvv # Have to be run with debug = true, to omit generating proxies before setting up the database
     - bin/console cache:warmup --env=test_cached --no-debug -vvv
     - bin/console doctrine:migrations:migrate --no-interaction --env=test_cached --no-debug -vvv
 
-    - bin/console assets:install --env=test_cached --no-debug -vvv
-    - yarn run gulp
+    - bin/console assets:install web --env=test_cached --no-debug -vvv
+    - 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
@@ -67,7 +70,7 @@ before_script:
     - java -Dwebdriver.chrome.driver=$SYLIUS_CACHE_DIR/chromedriver -jar $SYLIUS_CACHE_DIR/selenium.jar > /dev/null 2>&1 &
 
     # Run webserver
-    - bin/console server:run 127.0.0.1:8080 --env=test_cached --router=app/config/router_test_cached.php --no-debug --quiet > /dev/null 2>&1 &
+    - bin/console server:run 127.0.0.1:8080 --env=test_cached --docroot=web --router=app/config/router_test_cached.php --no-debug --quiet > /dev/null 2>&1 &
 
 script:
     - composer validate --strict

README.md

@@ -29,7 +29,7 @@ $ wget http://getcomposer.org/composer.phar
 $ php composer.phar create-project sylius/sylius-standard project
 $ cd project
 $ yarn install
-$ yarn run gulp
+$ yarn build
 $ php bin/console sylius:install
 $ php bin/console server:start
 $ open http://localhost:8000/

app/config/config.yml

@@ -63,3 +63,10 @@ fos_rest:
         rules:
             - { path: '^/api', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
             - { path: '^/', stop: true }
+
+liip_imagine:
+    resolvers:
+        default:
+            web_path:
+                web_root: "%kernel.project_dir%/web"
+                cache_prefix: "media/cache"

app/config/routing.yml

@@ -25,4 +25,4 @@ sylius_shop_default_locale:
         _controller: sylius.controller.shop.locale_switch:switchAction
 
 _liip_imagine:
-    resource: '@LiipImagineBundle/Resources/config/routing.xml'
+    resource: '@LiipImagineBundle/Resources/config/routing.yaml'

composer.json

@@ -21,28 +21,28 @@
     ],
     "require": {
         "php": "^7.1",
-
-        "sylius/sylius": "1.1.*"
+
+        "sylius/sylius": "1.2.*",
+        "symfony/symfony": "^3.4|^4.1"
     },
     "require-dev": {
         "behat/behat": "^3.4",
-        "behat/mink": "^1.7",
+        "behat/mink": "^1.7@dev",
         "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/suite-settings-extension": "^1.0",
-        "friends-of-behat/symfony-extension": "^1.0",
-        "friends-of-behat/variadic-extension": "^1.0",
+        "friends-of-behat/symfony-extension": "^1.2.1",
+        "friends-of-behat/variadic-extension": "^1.1",
         "lakion/api-test-case": "^3.0",
         "lakion/mink-debug-extension": "^1.2.3",
-        "phpspec/phpspec": "^3.4",
+        "phpspec/phpspec": "^4.0",
         "phpunit/phpunit": "^6.5",
-        "sensio/generator-bundle": "^3.1",
         "stripe/stripe-php": "^4.1",
-        "sylius-labs/coding-standard": "^1.0"
+        "sylius-labs/coding-standard": "^2.0"
     },
     "prefer-stable": true,
     "scripts": {
@@ -85,7 +85,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }