Merge pull request Sylius#24 from pamil/checkout-fixes

Make checkout great again
ezecosystem · Nov 14, 2017 · dcca989 · dcca989
2 parents 82ff980 + 6d24163
commit dcca989
Show file tree

Hide file tree

Showing 5 changed files with 2,989 additions and 400 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -66,10 +66,6 @@ fos_rest:
             - { path: '^/api', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
             - { path: '^/', stop: true }
 
-sylius_shop:
-    checkout_resolver:
-        pattern: "%sylius.security.shop_regex%/checkout/"
-
 nelmio_cors:
     defaults:
         allow_credentials: false

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "require": {
         "php": "^7.0",
 
-        "sylius/sylius": "^1.1@dev",
+        "sylius/sylius": "^1.0",
         "sylius/shop-api-plugin": "^1.0@beta",
         "snc/redis-bundle": "^2.0",
         "predis/predis": "^1.0",
@@ -89,9 +89,6 @@
         "incenteev-parameters": {
             "file": "app/config/parameters.yml",
             "dist-file": "vendor/sylius/sylius/app/config/parameters.yml.dist"
-        },
-        "branch-alias": {
-            "dev-master": "1.1-dev"
         }
     }
 }