Merge branch 'Gasol-coveralls-integration' into develop (PR #290)

Conflicts:
	composer.json

.coveralls.yml

+service_name: travis-ci
+
+src_dir: library

.travis.yml

@@ -12,3 +12,4 @@ before_script:
 
 script: vendor/bin/phpunit -c phpunit.xml.travis
 
+after_script: vendor/bin/coveralls -v

README.md

@@ -46,4 +46,7 @@ http://wiki.solarium-project.org/index.php/V3:Installation#Getting_Solarium
 ## Travis Continuous Integration status
 
 * Develop branch [![Develop build status](https://secure.travis-ci.org/basdenooijer/solarium.png?branch=develop)](http://travis-ci.org/basdenooijer/solarium)
-* Master branch [![Develop build status](https://secure.travis-ci.org/basdenooijer/solarium.png?branch=master)](http://travis-ci.org/basdenooijer/solarium)
\ No newline at end of file
+* Develop branch [![Coverage Status](https://coveralls.io/repos/basdenooijer/solarium/badge.png?branch=develop)](https://coveralls.io/r/basdenooijer/solarium?branch=develop)
+* Master branch [![Develop build status](https://secure.travis-ci.org/basdenooijer/solarium.png?branch=master)](http://travis-ci.org/basdenooijer/solarium)
+* Master branch [![Coverage Status](https://coveralls.io/repos/basdenooijer/solarium/badge.png?branch=master)](https://coveralls.io/r/basdenooijer/solarium?branch=master)
+

composer.json

@@ -19,6 +19,7 @@
         "phpunit/phpunit": "~3.7",
         "squizlabs/php_codesniffer": "~1.4",
         "zendframework/zendframework1": "~1.12"
+        "satooshi/php-coveralls": "~0.6"
     },
     "extra": {
         "branch-alias": {

phpunit.xml.travis

@@ -7,6 +7,10 @@
        </testsuite>
     </testsuites>
 
+    <logging>
+      <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+
     <filter>
       <whitelist>
         <directory suffix=".php">library</directory>