Merge pull request #15 from mybuilder/symfony-26

Add Symfony 2.6 support
mybuilder · May 1, 2015 · 45235d7 · 45235d7
2 parents f966b9c + 891e98e
commit 45235d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,13 +4,15 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
   - hhvm
 
 env:
   - SYMFONY_VERSION=2.2.*
   - SYMFONY_VERSION=2.3.*
   - SYMFONY_VERSION=2.4.*
   - SYMFONY_VERSION=2.5.*
+  - SYMFONY_VERSION=2.6.*
 
 before_script:
   - composer require --prefer-source --dev symfony/process:${SYMFONY_VERSION}

diff --git a/composer.json b/composer.json
@@ -18,14 +18,14 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "symfony/process": ">=2.2,<2.6"
+        "symfony/process": ">=2.2,<2.7"
     },
     "suggest": {
         "symfony/filesystem": "Allows using Symfony Filesystem"
     },
     "require-dev": {
-        "phpunit/phpunit": "~3.7",
-        "mockery/mockery": "~0.8"
+        "phpunit/phpunit": "4.6.*",
+        "mockery/mockery": "~0.9"
     },
     "autoload": {
         "psr-4": { "MyBuilder\\Cronos\\": "src" }