Skip to content

Commit

Permalink
Merge pull request #304 from cakephp/update-phinx-0.6.6
Browse files Browse the repository at this point in the history
Update phinx to version 0.6.6
  • Loading branch information
lorenzo committed Jan 24, 2017
2 parents 2809fe4 + 999fd92 commit 228af35
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ matrix:
before_script:
- sh -c "if [ '$HHVM' != '1' ]; then phpenv config-rm xdebug.ini; fi"
- composer self-update
- sh -c "if [ '$PREFER_LOWEST' != '1' ]; then composer install --prefer-source --no-interaction; fi"
- sh -c "if [ '$PREFER_LOWEST' = '1' ]; then composer update --prefer-source --no-interaction --prefer-lowest --prefer-stable; fi"
- sh -c "if [ '$PREFER_LOWEST' != '1' ]; then composer install --prefer-dist --no-interaction; fi"
- sh -c "if [ '$PREFER_LOWEST' = '1' ]; then composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi"

- sh -c "if [ '$DB' = 'mysql' ]; then mysql -u root -e 'CREATE DATABASE cakephp_test DEFAULT COLLATE=utf8mb4_general_ci; CREATE DATABASE cakephp_comparisons;'; fi"

Expand All @@ -71,7 +71,7 @@ before_script:
- cp phpunit.xml.dist phpunit.xml

script:
- sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; fi"
- sh -c "if [ '$DEFAULT' = '1' ]; then vendor/bin/phpunit --stderr; fi"
- sh -c "if [ '$PHPSTAN' = '1' ]; then composer require --dev phpstan/phpstan:^0.6 && vendor/bin/phpstan analyse -c phpstan.neon -l 1 src; fi"
- sh -c "if [ '$CODECOVERAGE' = '1' ]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml || true; fi"
- sh -c "if [ '$CODECOVERAGE' = '1' ]; then wget -O codecov.sh https://codecov.io/bash; fi"
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"require": {
"php": ">=5.4",
"robmorgan/phinx": "0.6.5",
"robmorgan/phinx": "0.6.6",
"cakephp/cakephp": "~3.1"
},
"require-dev": {
Expand Down

0 comments on commit 228af35

Please sign in to comment.