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.

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

Merge release 1.3.1 into master #69

Merged
merged 9 commits into from
May 30, 2020
15 changes: 14 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,25 @@ php:
- 7.3
- 7.4

env:
global:
- COMPOSER_ROOT_VERSION=1.4

before_install:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
- travis_retry composer self-update

install:
- rm composer.lock
- travis_retry composer update --prefer-dist
- composer validate --strict

script:
- ./vendor/bin/phpunit -v

jobs:
allow_failures:
- php: nightly

include:
- stage: Test
env: COVERAGE
Expand All @@ -33,6 +40,12 @@ jobs:
- travis_retry wget https://scrutinizer-ci.com/ocular.phar
- travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml

- stage: Test
php: nightly
before_install:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
- composer config platform.php 7.4.99

- stage: Code Quality
env: CODING_STANDARDS
php: 7.1
Expand Down
7 changes: 6 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@
"homepage": "http://ocramius.github.com/"
}
],
"config": {
"platform": {
"php": "7.1.27"
}
},
"require": {
"php": "^7.1"
"php": "^7.1 || ^8.0"
},
"require-dev": {
"ext-phar": "*",
Expand Down
Loading