Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require minimum of PHP 7, enabling tests on PHP 7.1 #226

Merged
merged 4 commits into from
Dec 24, 2016
Merged

Require minimum of PHP 7, enabling tests on PHP 7.1 #226

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
311c7c8
Require minimum of PHP 7, enabling tests on PHP 7.1
asgrim Nov 30, 2016
b311582
#226 `^7.0|^7.1` is redundant, and can be replaced by `^7.0`
Ocramius Dec 24, 2016
0b0bf2d
#226 bumping all internal dependencies
Ocramius Dec 24, 2016
1a872f4
#226 explicitly locking onto PHP `7.0.*|7.1.*` since PHP isn't really…
Ocramius Dec 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .travis.yml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Better Reflection - an improved code reflection API",
"license": "MIT",
"require": {
"php": "^5.6|^7.0",
"php": "^7.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hrmm, I know it's not technically needed, but I think it helps; especially when php itself isn't actually semver. In fact, perhaps better to be 7.0.*|7.1.* heh?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@asgrim indeed, better choice. Updating now.

"nikic/php-parser": "^3.0",
"phpdocumentor/reflection-docblock": "^3.0",
"phpdocumentor/type-resolver": "^0.2",
Expand Down