Skip to content

Commit

Permalink
Merge pull request #10 from sizuhiko/develop
Browse files Browse the repository at this point in the history
Release Version 0.2.2
  • Loading branch information
sizuhiko authored Dec 16, 2017
2 parents ed1f8d4 + 5bc93ea commit 7a8b744
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1

env:
- DB=mysql db_dsn='mysql://[email protected]/cakephp_test'
Expand All @@ -29,7 +31,7 @@ install:
before_script:
- sh -c "if [ '$PHPCS' = '1' ]; then composer require squizlabs/php_codesniffer; fi"

- sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:"^1.0"; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"

- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
Expand All @@ -39,9 +41,9 @@ before_script:
- cp phpunit.xml.dist phpunit.xml

script:
- sh -c "if [ '$PHPCS' != '1' ]; then phpunit; fi"
- sh -c "if [ '$PHPCS' != '1' ]; then ./vendor/bin/phpunit; fi"
- sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -p --extensions=php --standard=psr2 --ignore=tests/bootstrap.php ./src ; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then ./vendor/bin/phpunit --stderr --coverage-clover build/logs/clover.xml; fi"

after_script:
- sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"sizuhiko/fabricate": "~2.0"
},
"require-dev": {
"phpunit/phpunit": "*"
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 7a8b744

Please sign in to comment.