Merge pull request #2 from tfe2012/up_symfony_to_2_6_version

up symfony version to 2.6
ongr-archive · Dec 29, 2014 · 43cb1a0 · 43cb1a0
2 parents eb55105 + e790498
commit 43cb1a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,8 @@ php:
   - 5.4
   - 5.5
   - 5.6
+env:
+  - SYMFONY="2.6.*"
 before_script:
   - composer install
 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"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.1",
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,8 @@ php: @@
       - 5.4
       - 5.5
       - 5.6
+    env:
+      - SYMFONY="2.6.*"
     before_script:
       - composer install
     script:
@@ Expand Down @@