Skip to content

Commit 7d32d1d

Browse files
committed
stick with phpunit in require-dev, for IDE use and to lessen complications with reflection-* deps
1 parent b77ec65 commit 7d32d1d

File tree

4 files changed

+1462
-6
lines changed

4 files changed

+1462
-6
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ matrix:
1212
install:
1313
- travis_retry composer install --no-interaction --prefer-dist --optimize-autoloader
1414
- travis_retry wget https://phar.io/releases/phive.phar
15-
- travis_retry php phive.phar --no-progress install --trust-gpg-keys 4AA394086372C20A phpunit
1615

1716
script:
18-
- ./tools/phpunit --no-coverage
17+
- ./vendor/bin/phpunit --no-coverage
1918

2019
jobs:
2120
include:
2221
- stage: coverage
2322
php: 7.1
2423
script:
25-
- ./tools/phpunit
24+
- ./vendor/bin/phpunit
2625
after_script:
2726
- travis_retry php phive.phar --no-progress install --trust-gpg-keys E82B2FB314E9906E php-coveralls/php-coveralls && ./tools/php-coveralls --verbose
2827
- travis_retry wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"minimum-stability": "stable",
2222
"require-dev": {
2323
"mockery/mockery": "~1.0",
24-
"league/flysystem-memory": "~1.0"
24+
"league/flysystem-memory": "~1.0",
25+
"phpunit/phpunit": "^6.5"
2526
}
2627
}

0 commit comments

Comments
 (0)