Skip to content

Commit

Permalink
Merge pull request #192 from Lullabot/185-fix-double-validator-genera…
Browse files Browse the repository at this point in the history
…ted.php

Fix Composer ambiguous class resolution warnings by removing duplicate validator-generated.php

Updated Travis CI configuration to use the updated trusty distro, run tests on PHP 7.1, and allow failures on HHVM.
  • Loading branch information
davereid committed Aug 3, 2017
2 parents ea60f9c + b3ba970 commit a8eb47c
Show file tree
Hide file tree
Showing 3 changed files with 2,163 additions and 7,467 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
language: php
dist: trusty

php:
- '5.5'
- '5.6'
- '7.0'
- 5.5
- 5.6
- 7.0
- 7.1
- hhvm
- nightly

Expand All @@ -14,5 +16,7 @@ script:
- vendor/bin/phpunit tests

matrix:
fast_finish: true
allow_failures:
- php: hhvm
- php: nightly
Loading

0 comments on commit a8eb47c

Please sign in to comment.