Merge branch '1.1'

* 1.1: Require Symfony ^3.4 Remove PHP <= 7.1 Polyfills Fixes history issue when adding to cart
ezecosystem · Dec 27, 2017 · 5e132cd · 5e132cd
2 parents d8d5729 + 7929824
commit 5e132cd
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 169 deletions.
diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
         "symfony/polyfill-intl-icu": "^1.3",
         "symfony/polyfill-mbstring": "^1.3",
         "symfony/swiftmailer-bundle": "^3.0",
-        "symfony/symfony": "^3.3.13",
+        "symfony/symfony": "^3.4",
         "twig/extensions": "^1.4",
         "twig/twig": "^2.0",
         "webmozart/assert": "^1.1",
@@ -136,7 +136,11 @@
         "sylius/theme-bundle": "self.version",
         "sylius/ui-bundle": "self.version",
         "sylius/user": "self.version",
-        "sylius/user-bundle": "self.version"
+        "sylius/user-bundle": "self.version",
+
+        "symfony/polyfill-php71": "*",
+        "symfony/polyfill-php70": "*",
+        "symfony/polyfill-php56": "*"
     },
     "suggest": {
         "ext-iconv": "For better performance than using Symfony Polyfill Component",