Permalink
Browse files

Merge branch 'hotfix/2699' into develop

Forward port #2699
  • Loading branch information...
2 parents 766e803 + f372e1b commit b3c766f3202d9ab8ac9cc96e263fc6c3f5d09fbd @weierophinney weierophinney committed Oct 8, 2012
Showing with 4 additions and 2 deletions.
  1. +3 −1 .travis.yml
  2. +1 −1 demos/Zend/ProgressBar/Upload.php
View
@@ -12,7 +12,9 @@ before_install:
script:
- php ./tests/run-tests.php
- - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 .); 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=psr2 library); 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=psr2 tests); 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=psr2 bin); 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"
@@ -116,7 +116,7 @@ function makeRequest(url)
if (httpRequest.overrideMimeType) {
httpRequest.overrideMimeType('text/xml');
}
- } elseif (window.ActiveXObject) {
+ } else if (window.ActiveXObject) {
try {
httpRequest = new ActiveXObject("Msxml2.XMLHTTP");
} catch (e) {

0 comments on commit b3c766f

Please sign in to comment.