Skip to content

Commit 767cf6f

Browse files
committed
Merge pull request #11 from GrahamCampbell/stuff
Composer And Travis Updates
2 parents aa24311 + ad245a2 commit 767cf6f

File tree

4 files changed

+493
-97
lines changed

4 files changed

+493
-97
lines changed

.travis.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ php:
44
- 5.3
55
- 5.4
66
- 5.5
7+
- 5.6
8+
- hhvm
9+
- hhvm-nightly
10+
11+
matrix:
12+
allow_failures:
13+
- php: hhvm
14+
- php: hhvm-nightly
715

816
script:
917
- vendor/bin/phpunit
@@ -13,9 +21,9 @@ before_script:
1321
- sudo apt-get -qq install graphviz > /dev/null
1422
- phpenv rehash > /dev/null
1523
- composer selfupdate --quiet
16-
- composer install --dev --prefer-source
24+
- composer install --no-interaction --prefer-source --dev
1725
- vendor/bin/phpunit
18-
- composer update --dev --prefer-source
26+
- composer update --no-interaction --prefer-source --dev
1927

2028
notifications:
2129
irc: "irc.freenode.org#phpdocumentor"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"php": ">=5.3.3"
1010
},
1111
"require-dev": {
12-
"phpunit/phpunit": "~3.7"
12+
"phpunit/phpunit": "~4.0"
1313
},
1414
"autoload": {
1515
"psr-0": {"phpDocumentor": ["src/", "tests/unit"]}

0 commit comments

Comments
 (0)