Skip to content

Commit 0604d62

Browse files
committed
Merge pull request #38 from GrahamCampbell/stuff
Composer And Travis Updates
2 parents 38743b6 + a66d783 commit 0604d62

File tree

4 files changed

+468
-80
lines changed

4 files changed

+468
-80
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
.idea
2-
vendor
2+
vendor

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ php:
77
- 5.6
88
- hhvm
99
- hhvm-nightly
10-
10+
1111
matrix:
1212
allow_failures:
1313
- php: hhvm
@@ -20,9 +20,9 @@ before_script:
2020
- sudo apt-get -qq update > /dev/null
2121
- phpenv rehash > /dev/null
2222
- composer selfupdate --quiet
23-
- composer install --dev --prefer-source
23+
- composer install --no-interaction --prefer-source --dev
2424
- vendor/bin/phpunit
25-
- composer update --dev --prefer-source
25+
- composer update --no-interaction --prefer-source --dev
2626

2727
notifications:
2828
irc: "irc.freenode.org#phpdocumentor"

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"psr-0": {"phpDocumentor": ["src/"]}
1313
},
1414
"require-dev": {
15-
"phpunit/phpunit": "3.7.*@stable"
15+
"phpunit/phpunit": "~4.0"
1616
},
1717
"suggest": {
18-
"dflydev/markdown": "1.0.*",
19-
"erusev/parsedown": "~0.7"
18+
"dflydev/markdown": "~1.0",
19+
"erusev/parsedown": "~1.0"
2020
},
2121
"extra": {
2222
"branch-alias": {

0 commit comments

Comments
 (0)