upgraded composer dependencies, added new versions of PHP to Travis m…

…atrix
thunderer · Jan 28, 2016 · c8e193f · c8e193f
1 parent 6c27617
commit c8e193f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,11 +4,20 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - 7.0
   - hhvm
+  - nightly
+
+sudo: false
 
 before_script:
   - COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
 
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --format=php-clover coverage.xml
+
+matrix:
+  allow_failures:
+    - php: nightly
diff --git a/composer.json b/composer.json
@@ -9,10 +9,10 @@
         }
     ],
     "require": {
-        "symfony/yaml": "~2.3"
+        "symfony/yaml": "^2.3|^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.1"
+        "phpunit/phpunit": "^4.1|^5.0"
     },
     "autoload": {
         "psr-4": {