Skip to content

Commit c3b01ef

Browse files
authored
Merge pull request MyIntervals#121 from sabberworm/fix-travis
Fix travis
2 parents 3079ac5 + 9fcd22c commit c3b01ef

File tree

5 files changed

+144
-317
lines changed

5 files changed

+144
-317
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vendor/

.travis.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
language: php
22
php:
33
- "5.4"
4-
- "5.3"
54
- "5.5"
65
- "5.6"
76
- "7.0"
7+
- "7.1"
88
- "nightly"
99
- hhvm
10-
script: phpunit .
1110
sudo: false
12-
11+
dist: trusty
12+
matrix:
13+
include:
14+
-
15+
php: "5.3"
16+
dist: precise
17+
sudo: false
18+
before_script: rm composer.lock && composer install
19+
script: ./vendor/phpunit/phpunit/phpunit

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ class Sabberworm\CSS\CSSList\Document#4 (2) {
625625
## Misc
626626

627627
* Legacy Support: The latest pre-PSR-0 version of this project can be checked with the `0.9.0` tag.
628-
* Running Tests: To run all unit tests for this project, have `phpunit` installed and run `phpunit .`.
628+
* Running Tests: To run all unit tests for this project, run `composer install` to install phpunit and use `./vendor/phpunit/phpunit/phpunit`.
629629

630630
## License
631631

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"php": ">=5.3.2"
1313
},
1414
"require-dev": {
15-
"phpunit/phpunit": "*"
15+
"phpunit/phpunit": "~4.8"
1616
},
1717
"autoload": {
1818
"psr-0": { "Sabberworm\\CSS": "lib/" }

0 commit comments

Comments
 (0)