Skip to content

Commit

Permalink
Merge pull request #226 from Roave/require-php-7
Browse files Browse the repository at this point in the history
Require minimum of PHP 7, enabling tests on PHP 7.1
  • Loading branch information
Ocramius authored Dec 24, 2016
2 parents e0c5f9c + 1a872f4 commit 4a8b464
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 deletions.
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: php

php:
- 5.6
- 7.0
- hhvm
- 7.1

env:
matrix:
Expand All @@ -17,11 +16,6 @@ script:
- vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml --colors
- test/demo/check-demo.sh
- vendor/bin/phpunit test/compat
- vendor/bin/phpunit test/core || true

after_script:
- if [ $TRAVIS_PHP_VERSION = '5.6' ]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi

matrix:
allow_failures:
- php: hhvm
- if [ $TRAVIS_PHP_VERSION = '7.0' ]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
"description": "Better Reflection - an improved code reflection API",
"license": "MIT",
"require": {
"php": "^5.6|^7.0",
"nikic/php-parser": "^3.0",
"phpdocumentor/reflection-docblock": "^3.0",
"phpdocumentor/type-resolver": "^0.2",
"zendframework/zend-code": "^3.0",
"php": "7.0.*|7.1.*",
"nikic/php-parser": "^3.0.2",
"phpdocumentor/reflection-docblock": "^3.1.1",
"phpdocumentor/type-resolver": "^0.2.1",
"zendframework/zend-code": "^3.1",
"jeremeamia/superclosure": "^2.3"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^1.12",
"phpunit/phpunit": "^5.4"
"friendsofphp/php-cs-fixer": "^1.13.1",
"phpunit/phpunit": "^5.7.4"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 4a8b464

Please sign in to comment.