Skip to content

Commit

Permalink
Merge 41370af into 37b7882
Browse files Browse the repository at this point in the history
  • Loading branch information
doctrinebot committed Aug 3, 2020
2 parents 37b7882 + 41370af commit 7bb0cc8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
13 changes: 9 additions & 4 deletions .travis.yml
@@ -1,5 +1,5 @@
dist: trusty
sudo: false
dist: xenial

language: php

cache:
Expand All @@ -10,7 +10,7 @@ php:
- 7.1
- 7.2
- 7.3
- 7.4snapshot
- 7.4

before_install:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
Expand All @@ -23,9 +23,14 @@ script: ./vendor/bin/phpunit

jobs:
allow_failures:
- php: 7.4snapshot
- php: nightly

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

- stage: Coverage
before_script:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -20,7 +20,7 @@
{"name": "Marco Pivetta", "email": "ocramius@gmail.com"}
],
"require": {
"php": "^7.1"
"php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
Expand Down
7 changes: 4 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7bb0cc8

Please sign in to comment.