diff --git a/.travis.yml b/.travis.yml
index 597b002..b3a40e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,10 @@ services:
   - mongodb
   - redis-server
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 php:
   - 5.5
   - 5.6
@@ -15,7 +19,17 @@ before_install:
   - composer self-update
 
 install:
-  - composer --prefer-source install
+  - composer require satooshi/php-coveralls:~0.6@stable --no-update
+  - composer install --prefer-dist --no-interaction --no-progress
+
+before_script:
+  - vendor/bin/php-cs-fixer -v fix --diff --dry-run
 
 script:
-  - vendor/bin/phpunit --verbose
+  - vendor/bin/phpunit --verbose --coverage-text --coverage-clover=coverage.clover
+
+after_script:
+  - if [[ $TRAVIS_PHP_VERSION != "5.6" && $TRAVIS_PULL_REQUEST == "false" ]]; then php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover; fi
+
+notifications:
+  email: false
diff --git a/composer.json b/composer.json
index 5d7ae4c..997e3be 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,8 @@
         "doctrine/couchdb": "^1.0.0-beta4",
         "phpunit/phpunit": "^4.8|^5.0",
         "aws/aws-sdk-php": "^3.8",
-        "riak/riak-client": "dev-master"
+        "riak/riak-client": "dev-master",
+        "friendsofphp/php-cs-fixer": "^1.11"
     },
     "suggest": {
         "aws/aws-sdk-php": "to use the DynamoDB storage",
diff --git a/lib/Doctrine/KeyValueStore/Storage/ArrayStorage.php b/lib/Doctrine/KeyValueStore/Storage/ArrayStorage.php
index cee54b8..843fab2 100644
--- a/lib/Doctrine/KeyValueStore/Storage/ArrayStorage.php
+++ b/lib/Doctrine/KeyValueStore/Storage/ArrayStorage.php
@@ -20,7 +20,6 @@
 
 namespace Doctrine\KeyValueStore\Storage;
 
-use Doctrine\DBAL\Connection;
 use Doctrine\KeyValueStore\NotFoundException;
 
 /**
@@ -79,7 +78,7 @@ public function insert($storageName, $key, array $data)
      */
     public function update($storageName, $key, array $data)
     {
-        if (!isset($this->data[$storageName])) {
+        if (! isset($this->data[$storageName])) {
             $this->data[$storageName] = [];
         }
 
@@ -93,11 +92,11 @@ public function update($storageName, $key, array $data)
      */
     public function delete($storageName, $key)
     {
-        if (!isset($this->data[$storageName])) {
+        if (! isset($this->data[$storageName])) {
             return;
         }
 
-        if (!isset($this->data[$storageName][serialize($key)])) {
+        if (! isset($this->data[$storageName][serialize($key)])) {
             return;
         }
 
@@ -113,11 +112,11 @@ public function delete($storageName, $key)
      */
     public function find($storageName, $key)
     {
-        if (!isset($this->data[$storageName])) {
+        if (! isset($this->data[$storageName])) {
             throw new NotFoundException();
         }
 
-        if (!isset($this->data[$storageName][serialize($key)])) {
+        if (! isset($this->data[$storageName][serialize($key)])) {
             throw new NotFoundException();
         }
 
diff --git a/lib/Doctrine/KeyValueStore/Storage/WindowsAzureTableStorage.php b/lib/Doctrine/KeyValueStore/Storage/WindowsAzureTableStorage.php
index b0b9ae8..d43475f 100644
--- a/lib/Doctrine/KeyValueStore/Storage/WindowsAzureTableStorage.php
+++ b/lib/Doctrine/KeyValueStore/Storage/WindowsAzureTableStorage.php
@@ -183,7 +183,7 @@ public function createTable($tableName)
         $tableNode->appendChild($dom->createTextNode($tableName));
         $xml = $dom->saveXML();
 
-        $url      = $this->baseUrl .  '/Tables';
+        $url      = $this->baseUrl . '/Tables';
         $response = $this->request('POST', $url, $xml, $headers);
 
         if ($response->getStatusCode() != 201) {