Skip to content

Commit 1a1962f

Browse files
authored
Merge pull request #18 from localheinz/fix/phpunit
Fix: Use one composer.json only
2 parents a7dd2bb + 4abb6e6 commit 1a1962f

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ matrix:
1515
allow_failures:
1616
- php: master
1717

18-
before_script:
19-
- cd tests
20-
- composer install -n
18+
install:
19+
- composer install --prefer-dist
2120

22-
script: phpunit --coverage-text --configuration phpunit.xml.dist
21+
script:
22+
- vendor/bin/phpunit --coverage-text --configuration tests/phpunit.xml.dist
2323

2424
cache:
2525
directories:

composer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
"require": {
2121
"php": ">=5.4.0"
2222
},
23+
"require-dev": {
24+
"EHER/PHPUnit": ">=1.6",
25+
"mockery/mockery": ">=0.7.2",
26+
"suin/xoopsunit": ">=1.2"
27+
},
2328
"autoload": {
2429
"psr-0": {
2530
"Suin\\RSSWriter": "src"

tests/composer.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)