Skip to content

Commit

Permalink
Merge pull request #7 from msvrtan/improvements
Browse files Browse the repository at this point in the history
Improvements
  • Loading branch information
msvrtan committed Feb 21, 2016
2 parents 0a5ce41 + 9aee956 commit 9902397
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@ script:
- if [[ $coverage == 'phpunit' ]]; then sed -i 's/^;//' ~/.phpenv/versions/$(phpenv global)/etc/conf.d/xdebug.ini; fi;
- php -d 'xdebug.max_nesting_level=500' bin/phpunit
- if [[ $coverage == 'phpunit' ]]; then sed -i 's/^/;/' ~/.phpenv/versions/$(phpenv global)/etc/conf.d/xdebug.ini; fi;
- if [[ $coverage == 'phpunit' ]]; then php bin/coveralls -v; fi;
- if [[ $coverage == 'phpunit' ]]; then php bin/test-reporter -v; fi;
- if [[ $coverage == 'phpspec' ]]; then sed -i 's/^;//' ~/.phpenv/versions/$(phpenv global)/etc/conf.d/xdebug.ini; fi;
- ./bin/phpspec run --no-interaction
- if [[ $coverage == 'phpspec' ]]; then sed -i 's/^/;/' ~/.phpenv/versions/$(phpenv global)/etc/conf.d/xdebug.ini; fi;
- if [[ $coverage == 'phpspec' ]]; then php bin/coveralls -v; fi;
- if [[ $coverage == 'phpspec' ]]; then php bin/test-reporter -v; fi;
- ant php-cs-fixer-check-task
- ant phpcs-task
- ant phpmd-task

after_script:
- if [[ $coverage == 'phpunit' ]]; then php bin/coveralls -v; fi;
- if [[ $coverage == 'phpunit' ]]; then php bin/test-reporter -v; fi;
- if [[ $coverage == 'phpspec' ]]; then php bin/coveralls -v; fi;
- if [[ $coverage == 'phpspec' ]]; then php bin/test-reporter -v; fi;
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<filter>
<whitelist>
<directory>src</directory>
<directory>tests</directory>
</whitelist>
</filter>

Expand Down

0 comments on commit 9902397

Please sign in to comment.