Merge pull request Sylius#58 from pamil/update-1.3.1

Update to Sylius 1.3.1
ezecosystem · Oct 23, 2018 · 06a288e · 06a288e
2 parents 4323f22 + b27387b
commit 06a288e
Show file tree

Hide file tree

Showing 6 changed files with 5,784 additions and 2,646 deletions.
diff --git a/.babelrc b/.babelrc
@@ -10,11 +10,6 @@
   "plugins": [
     ["transform-object-rest-spread", {
       "useBuiltIns": true
-    }],
-    ["transform-runtime", {
-      "helpers": true,
-      "polyfill": true,
-      "regenerator": true
     }]
   ]
 }
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,6 +1,13 @@
 module.exports = {
   extends: 'airbnb-base',
+  env: {
+    node: true,
+  },
   rules: {
+    'object-shorthand': ['error', 'always', {
+        avoidQuotes: true,
+        avoidExplicitReturnArrows: true,
+    }],
     'function-paren-newline': ['error', 'consistent'],
     'max-len': ['warn', 120, 2, {
       ignoreUrls: true,

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -14,6 +14,9 @@ default:
                 - "vendor/sylius/sylius/features"
                 - "features"
 
+        FriendsOfBehat\SymfonyExtension:
+            env_file: ~
+
         Behat\MinkExtension:
             files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
 
@@ -41,6 +44,9 @@ cached:
             imports:
                 - "vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml"
 
+        FriendsOfBehat\SymfonyExtension:
+            env_file: ~
+
         Behat\MinkExtension:
             javascript_session: chromium
             files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
diff --git a/composer.json b/composer.json
@@ -21,7 +21,9 @@
     ],
     "require": {
         "php": "^7.2",
-        "sylius/sylius": "1.3.*@dev"
+        "sylius/sylius": "^1.3",
+        "sylius-labs/sensio-distribution-bundle": "^6.0",
+        "incenteev/composer-parameter-handler": "^2.1"
     },
     "require-dev": {
         "behat/behat": "^3.2",
@@ -37,15 +39,19 @@
         "friends-of-behat/performance-extension": "^1.0",
         "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/symfony-extension": "^1.2",
         "friends-of-behat/variadic-extension": "^1.0",
         "lakion/api-test-case": "^1.0",
         "lakion/mink-debug-extension": "^1.2.3",
         "phpspec/phpspec": "^3.2",
         "phpunit/phpunit": "^5.6",
         "se/selenium-server-standalone": "^2.52",
         "sensio/generator-bundle": "^3.1",
-        "stripe/stripe-php": "^4.1"
+        "stripe/stripe-php": "^4.1",
+        "symfony/debug-bundle": "^3.4|^4.1",
+        "symfony/web-profiler-bundle": "^3.4|^4.1",
+        "symfony/web-server-bundle": "^3.4|^4.1",
+        "friends-of-behat/page-object-extension": "^0.2.0"
     },
     "prefer-stable": true,
     "scripts": {