From fa2d6b59b7808bcb84ee13d8150b617c4c7131ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Oli=C5=A1ar?= <petr.olisar@gmail.com>
Date: Tue, 19 Jan 2016 14:54:06 +0100
Subject: [PATCH] Update scrutinizer and travis configuration

---
 .scrutinizer.yml | 33 +++++++++++++--------------------
 .travis.yml      | 11 +++++++----
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index b79f2f6..158ece6 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -5,28 +5,21 @@ filter:
 before_commands:
     - 'composer install --prefer-source'
 
+checks:
+    php:
+        code_rating: true
+        duplication: true
+
 tools:
-    sensiolabs_security_checker: true
-    php_changetracking: true
-    php_code_coverage: true
     php_mess_detector: true
-    php_analyzer: true
-    php_pdepend: true
     external_code_coverage:
-        enabled: true
-        timeout: 1200
-    php_sim:
-        min_mass: 30
-    php_loc:
-        excluded_dirs: [assets, vendor, tests]
-    php_cpd:
-        excluded_dirs: [assets, vendor, tests]
-    php_code_sniffer:
-        enabled: true
-        config:
-            ruleset: ./standards.xml
+       timeout: 600
 
-checks:
+coding_style:
     php:
-        code_rating: true
-        duplication: true
\ No newline at end of file
+        indentation:
+            general:
+                use_tabs: true
+        spaces:
+            around_operators:
+                concatenation: false
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index c17b97b..9333ff7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,6 @@ php:
   - 5.6
   - 7.0
 
-matrix:
-    allow_failures:
-        - php: 7.0
-
 before_install:
     - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then COVERAGE="-c `php -i | grep 'xdebug.ini'` --coverage coverage.xml --coverage-src src/"; else COVERAGE="" && if [ $TRAVIS_PHP_VERSION = '5.6' ]; then phpenv config-rm xdebug.ini; fi; fi
 
@@ -17,3 +13,10 @@ install:
 script:
     - vendor/bin/phpcs --standard=standards.xml --extensions=php --encoding=utf-8 -sp src/
     - vendor/bin/tester -p php $COVERAGE tests/
+
+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.xml
+        fi
\ No newline at end of file