Skip to content

Commit

Permalink
Merge pull request #335 from doctrine/1.10.x-merge-up-into-master_5ec…
Browse files Browse the repository at this point in the history
…c2b6cd8eea0.40752417

Merge release 1.10.3 into master
  • Loading branch information
greg0ire committed May 26, 2020
2 parents e723cc7 + 84ce73c commit 8fc7b23
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ php:
- 7.2
- 7.3
- 7.4
- nightly

cache:
directories:
Expand All @@ -16,9 +15,7 @@ cache:
before_install:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"

install:
- if [[ $TRAVIS_PHP_VERSION = nightly ]]; then export COMPOSER_FLAGS="--ignore-platform-reqs"; fi
- travis_retry composer update --prefer-dist $COMPOSER_FLAGS
install: travis_retry composer update --prefer-dist

script:
- ./vendor/bin/phpunit
Expand All @@ -28,6 +25,11 @@ jobs:
- php: nightly

include:
- stage: Test
php: nightly
before_install:
- composer config platform.php 7.4.99

- stage: Lint
before_script:
- travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.7
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
],
"require": {
"php": "^7.1",
"php": "^7.1 || ^8.0",
"ext-tokenizer": "*",
"doctrine/lexer": "1.*"
},
Expand Down

0 comments on commit 8fc7b23

Please sign in to comment.