Skip to content

Commit

Permalink
Merge branch 'master' into patch/bc-remove-eol-versions
Browse files Browse the repository at this point in the history
  • Loading branch information
vanderlee committed Jul 20, 2018
2 parents 88ed951 + c5b4494 commit 9128fbf
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .gitignore
@@ -1,4 +1,7 @@
/nbproject/private/
/cache/
/nbproject/
/debug/
/debug/
/build/
/composer.lock
/vendor/
11 changes: 10 additions & 1 deletion .travis.yml
Expand Up @@ -9,5 +9,14 @@ php:
matrix:
allow_failures:
- php: hhvm
before_script:
install:
- composer install --no-interaction
script:
- mkdir -p cache
- mkdir -p build/logs
- php vendor/bin/phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml
after_success:
- travis_retry php vendor/bin/php-coveralls
# or enable logging
- travis_retry php vendor/bin/php-coveralls -v

3 changes: 2 additions & 1 deletion composer.json
Expand Up @@ -16,6 +16,7 @@
"classmap": ["classes/"]
},
"require-dev": {
"phpunit/phpunit": "^7.2"
"phpunit/phpunit": "^5.7",
"php-coveralls/php-coveralls": "^2.1"
}
}
7 changes: 6 additions & 1 deletion phpunit.xml
Expand Up @@ -5,4 +5,9 @@
<directory>tests</directory>
</testsuite>
</testsuites>
</phpunit>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">classes/</directory>
</whitelist>
</filter>
</phpunit>

0 comments on commit 9128fbf

Please sign in to comment.