Merge pull request ongr-archive#19 from tfe2012/up_symfony_to_2_6_ver…

…sion up symfony version to 2.6
mindaugasrukas · Dec 30, 2014 · 77f1bdd · 77f1bdd
2 parents a099bf5 + aed0707
commit 77f1bdd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,10 @@ php:
   - 5.4
   - 5.5
   - 5.6
+env:
+  - SYMFONY="2.6.*"
+install:
+  - composer require --no-update symfony/symfony:${SYMFONY}
 services:
   - elasticsearch
 before_script:

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.4",
-        "symfony/symfony": "~2.3",
+        "symfony/symfony": "~2.6",
         "ongr/elasticsearch-bundle": "~0.1",
         "ongr/router-bundle": "~0.1"
     },