2 files changed, 54 insertions, 14 deletions

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 00000000..547120e6
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,22 @@
+filter:
+    paths:
+        - src/*
+    excluded_paths:
+        - 'vendor/*'
+        - 'app/*'
+        - 'web/*'
+        - 'src/Wallabag/*Bundle/Tests/*'
+        - '*Test.php'
+
+tools:
+    php_cs_fixer: true
+    php_analyzer: true
+    php_mess_detector: true
+    php_changetracking: true
+    php_code_sniffer: true
+    php_pdepend: true
+    sensiolabs_security_checker: true
+    external_code_coverage: true
+    php_code_coverage: true
+    php_sim: false
+    php_cpd: false
diff --git a/.travis.yml b/.travis.yml
index d9344827..6e938826 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,45 @@
 language: php
 
-# use docker-container infra
+# faster builds on docker-container setup
 sudo: false
 
+# cache vendor dirs
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
+
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-  - nightly
+    - 5.4
+    - 5.5
+    - 5.6
+    - hhvm
+    - nightly
 
 matrix:
-  allow_failures:
-    - php: hhvm
-    - php: nightly
+    fast_finish: true
+    allow_failures:
+        - php: hhvm
+        - php: nightly
 
 branches:
-  only:
-    - v2
+    only:
+        - v2
+
+install:
+    - composer self-update
 
+# build coverage only on one build, to speed up results feedbacks
 before_script:
-  - composer self-update
+    - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; fi;
 
 script:
-  - ant prepare
-  - phpunit --coverage-text
+    - ant prepare
+    - phpunit $PHPUNIT_FLAGS
+
+after_script:
+    - |
+        if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
+            wget https://scrutinizer-ci.com/ocular.phar
+            php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+        fi