Merge pull request #608 from roderik/master

[Composer] Update some dependencies
Kunstmaan · Aug 5, 2015 · 49e7db6 · 49e7db6
2 parents 54d5923 + 50fd89e
commit 49e7db6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,17 +13,17 @@ php:
   - 7.0
 
 env:
-  - SYMFONY_VERSION="2.6.*"
+  - SYMFONY_VERSION="2.7.*"
 
 matrix:
   fast_finish: false
   allow_failures:
     - php: 7.0
     - php: 5.6
-      env: SYMFONY_VERSION="2.7.*"
+      env: SYMFONY_VERSION="2.8.*"
   include:
     - php: 5.6
-      env: SYMFONY_VERSION="2.5.*"
+      env: SYMFONY_VERSION="2.8.*"
 
 before_script:
     - composer selfupdate

diff --git a/composer.json b/composer.json
@@ -19,32 +19,33 @@
         "php": ">=5.4.0",
         "symfony/symfony": "~2.5,<2.8.0",
         "doctrine/orm": "~2.2,>=2.2.3",
-        "doctrine/doctrine-bundle": "~1.2",
-        "twig/extensions": "~1.0",
+        "doctrine/doctrine-bundle": "~1.4",
         "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
-        "sensio/distribution-bundle": ">=2.3.0",
-        "sensio/framework-extra-bundle": ">=2.3.0",
+        "sensio/distribution-bundle": "~4.0",
+        "sensio/framework-extra-bundle": "~3.0,>=3.0.2",
         "incenteev/composer-parameter-handler": "~2.0",
 
         "friendsofsymfony/user-bundle": "2.0.*@dev",
         "knplabs/knp-menu-bundle": "~2.0",
-        "guzzle/guzzle": "3.8.*",
-        "white-october/pagerfanta-bundle": "1.0.*",
-        "phpoffice/phpexcel": "1.8.*",
-        "kunstmaan/google-api-custom": "~1.0.0",
-        "ddeboer/data-import-bundle": "0.1.*",
-        "gedmo/doctrine-extensions": "2.3.*",
-        "lunetics/locale-bundle": "*",
-        "doctrine/doctrine-fixtures-bundle": "~2.2.0",
-        "stof/doctrine-extensions-bundle": "1.1.*@dev",
+        "guzzle/guzzle": "~3.9",
+        "white-october/pagerfanta-bundle": "~1.0",
+        "phpoffice/phpexcel": "~1.8",
+        "kunstmaan/google-api-custom": "~1.0",
+        "ddeboer/data-import-bundle": "~0.1",
+        "gedmo/doctrine-extensions": "~2.3",
+        "lunetics/locale-bundle": "~2.4",
+        "doctrine/doctrine-fixtures-bundle": "~2.2",
+        "stof/doctrine-extensions-bundle": "~1.1",
         "liip/imagine-bundle": "v0.20.2",
-        "knplabs/knp-gaufrette-bundle": "0.1.*",
-        "symfony-cmf/routing-bundle": "~1.1.1",
+        "knplabs/knp-gaufrette-bundle": "~0.1",
+        "symfony-cmf/routing-bundle": "~1.3",
         "ruflin/elastica": "~1.0",
-        "fpn/doctrine-extensions-taggable": "0.9.0",
-	"sensio/generator-bundle": ">=2.5.0"
+        "fpn/doctrine-extensions-taggable": "~0.9",
+	    "sensio/generator-bundle": ">=2.5.0",
+        "twig/extensions": "~1.0",
+        "egulias/email-validator": "~1.2"
     },
     "require-dev": {
         "behat/behat": "~2.5.0",
@@ -56,7 +57,7 @@
         "behat/mink-goutte-driver": "*",
         "behat/mink-sahi-driver": "*",
         "phpunit/phpunit": "~4.4",
-        "fzaninotto/faker": "~1.4.0",
+        "fzaninotto/faker": "~1.5",
         "nelmio/alice": "~1.6"
     },
     "replace": {