Skip to content

Commit a8eb47c

Browse files
authored
Merge pull request #192 from Lullabot/185-fix-double-validator-generated.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.
2 parents ea60f9c + b3ba970 commit a8eb47c

File tree

3 files changed

+2163
-7467
lines changed

3 files changed

+2163
-7467
lines changed

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
language: php
2+
dist: trusty
23

34
php:
4-
- '5.5'
5-
- '5.6'
6-
- '7.0'
5+
- 5.5
6+
- 5.6
7+
- 7.0
8+
- 7.1
79
- hhvm
810
- nightly
911

@@ -14,5 +16,7 @@ script:
1416
- vendor/bin/phpunit tests
1517

1618
matrix:
19+
fast_finish: true
1720
allow_failures:
21+
- php: hhvm
1822
- php: nightly

0 commit comments

Comments
 (0)