Merge branch 'cs/travis' into develop

Reverted to old travis config, as script format is working again!
zendframework · Feb 6, 2013 · 0c4bddf · 0c4bddf
commit 0c4bddf
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,8 @@ before_install:
  - wget http://cs.sensiolabs.org/get/php-cs-fixer.phar
 
 script:
- - ./bin/travis-build.sh
+ - php ./tests/run-tests.php
+ - output=$(php php-cs-fixer.phar fix -v --dry-run .); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
 
 notifications:
   irc: "irc.freenode.org#zftalk.dev"