Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop

Conflicts: .travis.yml composer.json
2015-05-13 01:35:34 +01:00 · 2015-05-13 01:35:34 +01:00 · b057a52377
parent 4a977f1848 bb13357dcb
commit b057a52377
1 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -25,9 +25,9 @@ before_script:

 script:
  ## PHP_CodeSniffer
-  - ./vendor/bin/phpcs --report-width=200 --report-summary  --report-full Classes/ unitTests/ --standard=PSR2 -n
+  - ./vendor/bin/phpcs Classes/ unitTests/ --standard=PSR2 -n --ignore=Classes/PHPExcel/Shared/PCLZip
  ## PHPUnit
  - phpunit -c ./unitTests/

 notifications:
-  email: false
+  email: false