Merge branch '1.0' into 1.1

* 1.0: Do not allow PHP 7.2 builds to fail Allow to install Payum 1.5.* and PayumBundle 2.3.* [Translations] Updated translations from Crowdin
alexrowesoap · Jan 10, 2018 · 68da29b · 68da29b
2 parents 16130b6 + 5f7e14c
commit 68da29b
Show file tree

Hide file tree

Showing 4 changed files with 478 additions and 149 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -56,7 +56,6 @@ matrix:
                     packages:
                         - parallel
     allow_failures:
-        - php: 7.2
         - env:
             - SYLIUS_SUITE="application"
             - SYMFONY_VERSION="4.0.*"

diff --git a/composer.json b/composer.json
@@ -40,7 +40,6 @@
         "jms/serializer-bundle": "^2.0",
         "knplabs/knp-gaufrette-bundle": "^0.3",
         "knplabs/knp-menu-bundle": "^2.1",
-        "league/uri": "^4.2.2",
         "liip/imagine-bundle": "^1.9.1",
         "ocramius/proxy-manager": "^2.1",
         "payum/payum": "^1.4",