Skip to content

Commit

Permalink
Update test runner on Travis CI to use latest testing tools
Browse files Browse the repository at this point in the history
  • Loading branch information
ramsey committed Feb 9, 2016
1 parent 434c636 commit e6048b7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 29 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Expand Up @@ -8,14 +8,16 @@ php:
- 7.0
- hhvm

sudo: false

before_script:
- travis_retry composer self-update
- travis_retry composer install --no-interaction --prefer-source
- travis_retry composer install --no-interaction --prefer-dist

script:
- mkdir -p build/logs
- ./vendor/bin/parallel-lint src tests
- ./vendor/bin/phpunit --coverage-text
- ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
- ./vendor/bin/phpcs src --standard=psr2 -sp

after_script:
Expand Down
9 changes: 5 additions & 4 deletions composer.json
Expand Up @@ -25,10 +25,11 @@
"php": ">=5.3.2"
},
"require-dev": {
"phpunit/phpunit": "~4.5",
"squizlabs/php_codesniffer": "~2.2",
"jakub-onderka/php-parallel-lint": "0.8.*",
"satooshi/php-coveralls": "0.6.*"
"phpunit/phpunit": "^4.7|^5.0",
"squizlabs/php_codesniffer": "^2.3",
"jakub-onderka/php-parallel-lint": "^0.9.0",
"satooshi/php-coveralls": "^0.6.1",
"apigen/apigen": "^4.1"
},
"autoload": {
"psr-4": { "Bitworking\\": "src/Bitworking/" }
Expand Down
11 changes: 1 addition & 10 deletions phpunit.xml.dist
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="./tests/bootstrap.php" colors="true">
<phpunit bootstrap="./vendor/autoload.php" colors="true" verbose="true">
<testsuites>
<testsuite>
<directory>./tests</directory>
Expand All @@ -10,13 +10,4 @@
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-html" target="build/coverage" title="Bitworking\Mimeparse"
charset="UTF-8" yui="true" highlight="true"
lowUpperBound="35" highLowerBound="70"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
<log type="junit" target="build/logs/junit.xml"
logIncompleteSkipped="false"/>
</logging>
</phpunit>

13 changes: 0 additions & 13 deletions tests/bootstrap.php

This file was deleted.

0 comments on commit e6048b7

Please sign in to comment.