Merge branch 'master' into managed-server

.gitignore

@@ -17,3 +17,4 @@ coverage
 # vim
 .phpstorm_helpers
 .phpcomplete_extended
+.php_cs.cache

.php_cs.dist

@@ -0,0 +1,15 @@
+<?php
+$finder = PhpCsFixer\Finder::create()
+	->in('lib/')
+	->in('settings/')
+	->in('tests/')
+;
+return PhpCsFixer\Config::create()
+	->setRules([
+		'@PSR2' => true,
+		'array_syntax' => ['syntax' => 'short'],
+		'binary_operator_spaces' => ['align_double_arrow' => false, 'align_equals' => false],
+	])
+	->setIndent("\t")
+	->setFinder($finder)
+	;

.travis.yml

@@ -33,6 +33,11 @@ install: ./tests/travis/install-$REPO-$BRANCH.sh
 # Note the install script should make sure we are in the apps/ojsxc directory
 script:
   - composer install
-  - ./vendor/bin/phpunit -c phpunit.xml
-  - ./vendor/bin/phpunit -c phpunit.integration.xml
-  - cat ../../data/nextcloud.log  || cat ../../data/owncloud.log # in stable9 the log file is still called owncloud.log
+  - ./vendor/bin/phpunit -c phpunit.xml --coverage-clover=unit-coverage.xml
+  - ./vendor/bin/phpunit -c phpunit.integration.xml --coverage-clover=integration-coverage.xml
+  - cat ../../data/nextcloud.log
+  - vendor/bin/php-cs-fixer fix --dry-run --using-cache=no
+  - rm -r build/ && rm -r vendor/ && ../../occ app:check-code ojsxc
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -2,6 +2,7 @@ __Bugtracker and issues:__ https://github.com/jsxc/jsxc/issues<br />
 
 # Nextcloud JavaScript Xmpp Client
 [![Build Status](https://travis-ci.org/nextcloud/jsxc.nextcloud.svg?branch=master)](https://travis-ci.org/nextcloud/jsxc.nextcloud)
+[![codecov](https://codecov.io/gh/nextcloud/jsxc.nextcloud/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/jsxc.nextcloud)
 ![Downloads](https://img.shields.io/github/downloads/nextcloud/jsxc.nextcloud/total.svg)
 ![GitHub release](https://img.shields.io/github/release/nextcloud/jsxc.nextcloud.svg)
 

composer.json

@@ -4,6 +4,7 @@
         "sabre/uri": "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.7",
+        "friendsofphp/php-cs-fixer": "^2.4"
     }
 }