Skip to content

Commit

Permalink
fix travis
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefano Torresi committed Dec 12, 2013
1 parent 7fe4d05 commit 345b12d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ php:

before_install:
- composer self-update
- composer require --dev satooshi/php-coveralls:~0.6
- composer install --dev
- composer install --dev --prefer-source
- printf "\n" | pecl install imagick-beta
- wget http://cs.sensiolabs.org/get/php-cs-fixer.phar

script:
- php php-cs-fixer.phar fix -v --dry-run --level=all ./src
- php php-cs-fixer.phar fix -v --dry-run --level=all ./tests
- php php-cs-fixer.phar fix -v --dry-run --level=all ./config
- phpunit -c tests --coverage-clover ./coverage/clover.xml
- output=$(php php-cs-fixer.phar fix -v --dry-run --level=all ./src); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
- output=$(php php-cs-fixer.phar fix -v --dry-run --level=all ./tests); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;

after_script:
- composer require --dev satooshi/php-coveralls:~0.6
- ./vendor/bin/coveralls -v
12 changes: 8 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@
"description" : "A general purpose ZF2 module that provides miscellaneous classes",
"type" : "library",
"require" : {
"php" : ">=5.4.1",
"zendframework/zendframework" : "2.*"
"php" : ">=5.4.1"
},
"require-dev": {
"kriswallsmith/assetic": "*"
"kriswallsmith/assetic": "1.*",
"zendframework/zendframework" : "2.*"
},
"suggest": {
"zendframework/zendframework" : "The framework is required for most of MyBase content",
"doctrine/doctrine2" : "Doctrine2 is required to use MyBase\\Doctrine package"
},
"extra": {
"branch-alias": {
"dev-master": "1.x-dev",
"dev-0.x": "0.x-dev"
"dev-0.x": "0.x-dev"
}
},
"autoload" : {
Expand Down

0 comments on commit 345b12d

Please sign in to comment.