Skip to content

Commit

Permalink
^ dep, * LF fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pmaselkowski committed Jun 16, 2015
1 parent 25716e8 commit d1f35a1
Show file tree
Hide file tree
Showing 14 changed files with 253 additions and 217 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ tmp/**/*
local.properties
.classpath
.settings/
.loadpath
.loadpath
Addendum.komodoproject
Addendum.phprj
Addendum.workspace
.codelite/
2 changes: 1 addition & 1 deletion .hedron.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
template: toc/file-header.phps
template: toc/file-header.phps
2 changes: 1 addition & 1 deletion .scrunitizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ tools:
excluded_dirs: [vendor, tests]
php_cpd:
enabled: true
excluded_dirs: [vendor, tests]
excluded_dirs: [vendor, tests]
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ matrix:
- nightly
install:
- composer install --dev --prefer-dist
- composer update maslosoft/addendumtest
- composer update maslosoft/addendumtest
after_script:
- wget --no-check-certificate https://scrutinizer-ci.com/ocular.phar
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then php ocular.phar code-coverage:upload --repository=g/Maslosoft/Addendum --revision=`git rev-parse HEAD` --format=php-clover ./tests/_output/coverage.clover; fi;'
script:
- bash -c 'if [ "$TRAVIS_PHP_VERSION" == "hhvm" ] || [ "$TRAVIS_PHP_VERSION" == "nightly" ]; then vendor/bin/codecept run unit; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then vendor/bin/codecept run unit --coverage --html --coverage-html=. --coverage-xml=./coverage.clover; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then vendor/bin/codecept run unit --coverage --html --coverage-html=. --coverage-xml=./coverage.clover; fi;'
2 changes: 1 addition & 1 deletion codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ coverage:
xml: coverage.clover
html: true
include:
- src/*
- src/*
Loading

0 comments on commit d1f35a1

Please sign in to comment.