summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsmir Mustafic <[email protected]>2016-01-14 20:04:32 +0100
committerAsmir Mustafic <[email protected]>2016-01-14 20:04:32 +0100
commit97f171b03414bea826fabf4ae8f9191f0320316f (patch)
treeb0763a592b4e7d5264b19e11659815492256b302
parentd60382ea883f886ffdb6605cb2b65146b50e70c1 (diff)
parent8d7e15ba1f56dac53c77a65755e1d8f9911b8d6f (diff)
Merge pull request #93 from ericdowell/patch-1
Update composer.json
-rw-r--r--.travis.yml3
-rw-r--r--composer.json2
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index d6ad971..2f845a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ php:
- 5.4
- 5.5
- 5.6
+ - 7.0
- hhvm
- - nightly
notifications:
irc: "irc.freenode.net#masterminds"
@@ -28,4 +28,3 @@ script:
after_script:
- bash -c 'if [ "$TRAVIS_PHP_VERSION" == "5.6" ] ; then wget https://scrutinizer-ci.com/ocular.phar; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" == "5.6" ] ; then php ocular.phar code-coverage:upload --format=php-clover coverage.xml; fi;'
-
diff --git a/composer.json b/composer.json
index 9101239..3024184 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
"php" : ">=5.3.0"
},
"require-dev": {
- "satooshi/php-coveralls": "0.6.*",
+ "satooshi/php-coveralls": "1.0.*",
"phpunit/phpunit" : "4.*",
"sami/sami": "~2.0"
},