Include code coverage (with coveralls)

.travis.yml

@@ -4,36 +4,32 @@ services:
   - mongodb
   - redis-server
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 php:
+  - 5.5
   - 5.6
   - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-
-addons:
-    apt:
-        sources:
-            -
-                key_url: 'https://packagecloud.io/gpg.key'
-                sourceline: 'deb https://packagecloud.io/basho/riak/ubuntu/ trusty main'
-            -
-                key_url: 'https://packagecloud.io/gpg.key'
-                sourceline: 'deb-src https://packagecloud.io/basho/riak/ubuntu/ trusty main'
-        update: true
-
-cache:
-    apt: true
+  - hhvm
 
 before_install:
-  - sudo apt-get install -y --allow-unauthenticated riak
-  - sudo service riak start
-  - pecl install --force mongodb
-  - if [[ ${TRAVIS_PHP_VERSION:0:1} != "7" ]]; then sh ./tests/travis.sh; fi
+  - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TRAVIS_PHP_VERSION != "7.0" ]]; then sh ./tests/travis.sh; fi
   - 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

UPGRADE.md

@@ -1,7 +0,0 @@
-# Upgrade to 0.3
-
-## BC Break: Fixed MongoDB storage usage
-
-Before v0.3 the storage name associated to a class wasn't used when the storage is `MongoDbStorage`.
-In order to be consistent with other storage drivers, the `storageName` is now used for the collection name when storing and data.
-To get the same behavior as in older versions, pass the collection name given in the constructor arguments as storage name.

composer.json

@@ -9,13 +9,14 @@
         "doctrine/couchdb": "^1.0.0-beta4",
         "phpunit/phpunit": "^4.8|^5.0",
         "aws/aws-sdk-php": "^3.8",
-        "php-riak/riak-client": "^1.0@alpha",
-        "mongodb/mongodb": "^1.4"
+        "riak/riak-client": "dev-master",
+        "friendsofphp/php-cs-fixer": "^1.11"
     },
     "suggest": {
         "aws/aws-sdk-php": "to use the DynamoDB storage",
         "doctrine/couchdb": "to use the CouchDB storage",
-        "ext-couchbase": "to use the Couchbase storage"
+        "ext-couchbase": "to use the Couchbase storage",
+        "riak/riak-client": "to use the Riak storage"
     },
     "description": "Simple Key-Value Store Abstraction Layer that maps to PHP objects, allowing for many backends.",
     "license": "MIT",

docs/reference/basic-usage.rst

@@ -8,7 +8,7 @@ This guide covers getting started with the Doctrine Key Value Store.
 
 To use the KeyValueStore you actually need:
 
-- PHP 5.6 or above
+- PHP 5.5 or above
 - Composer Package Manager (`Install Composer
   <http://getcomposer.org/doc/00-intro.md>`_)
 

docs/reference/configuration.rst

@@ -224,35 +224,36 @@ See the `AWS docs <http://docs.aws.amazon.com/amazondynamodb/latest/developergui
 MongoDB
 -------
 
-MongoDB is based on `mongodb/mongodb <https://github.com/mongodb/mongo-php-library>`_:
-MongoDB support is provided using a `Database <https://docs.mongodb.com/php-library/current/reference/class/MongoDBDatabase/>`_
-instance.
+Mongo support is provided using a `Mongo <http://php.net/manual/en/class.mongo.php>`_
+instance, the collection name and the database name.
+
+Both the options ``collection`` and ``database`` are required.
 
 .. code-block:: php
 
     <?php
 
-    use MongoDB\Client;
     use Doctrine\KeyValueStore\Storage\MongoDbStorage;
 
-    $client = new Client(/* connection parameters and options */);
+    $conn = new \Mongo(/* connection parameters and options */);
 
-    $storage = new MongoDbStorage($client->your_database);
+    $storage = new MongoDbStorage($conn, array(
+        'collection' => 'your_collection',
+        'database'   => 'your_database',
+    ));
 
 Riak
 ----
 
-Riak support is provided through the library `php-riak/riak-client <https://github.com/php-riak/riak-client>`_ :
+Riak support is provided through the library `riak/riak-client <https://github.com/nacmartin/riak-client>`_ :
 
 .. code-block:: php
 
     <?php
 
     use Doctrine\KeyValueStore\Storage\RiakStorage;
-    use Riak\Client\RiakClientBuilder;
+    use Riak\Client;
 
-    $conn = (new RiakClientBuilder())
-        ->withNodeUri(/* connection DNS */)
-        ->build();
+    $conn = new Riak(/* connection parameters */);
 
     $storage = new RiakStorage($conn);

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 @@ class ArrayStorage implements Storage
      */
     public function update($storageName, $key, array $data)
     {
-        if (!isset($this->data[$storageName])) {
+        if (! isset($this->data[$storageName])) {
             $this->data[$storageName] = [];
         }
 
@@ -93,11 +92,11 @@ class ArrayStorage implements Storage
      */
     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 @@ class ArrayStorage implements Storage
      */
     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();
         }
 

lib/Doctrine/KeyValueStore/Storage/MongoDbStorage.php

@@ -21,7 +21,6 @@
 namespace Doctrine\KeyValueStore\Storage;
 
 use Doctrine\KeyValueStore\NotFoundException;
-use MongoDB\Database;
 
 /**
  * MongoDb storage
@@ -31,16 +30,57 @@ use MongoDB\Database;
 class MongoDbStorage implements Storage
 {
     /**
-     * @var Database
+     * @var \Mongo
      */
-    private $database;
+    protected $mongo;
 
     /**
-     * @param Database $database
+     * @var array
      */
-    public function __construct(Database $database)
+    protected $dbOptions;
+
+    /**
+     * @var \MongoCollection
+     */
+    protected $collection;
+
+    /**
+     * Constructor
+     *
+     * @param \Mongo $mongo
+     * @param array  $dbOptions
+     */
+    public function __construct(\Mongo $mongo, array $dbOptions = [])
     {
-        $this->database = $database;
+        $this->mongo     = $mongo;
+        $this->dbOptions = array_merge([
+            'database'   => '',
+            'collection' => '',
+        ], $dbOptions);
+    }
+
+    /**
+     * Initialize the mongodb collection
+     *
+     * @throws \RuntimeException
+     */
+    public function initialize()
+    {
+        if (null !== $this->collection) {
+            return;
+        }
+
+        if (empty($this->dbOptions['database'])) {
+            throw new \RuntimeException('The option "database" must be set');
+        }
+        if (empty($this->dbOptions['collection'])) {
+            throw new \RuntimeException('The option "collection" must be set');
+        }
+
+        $this->collection = $this
+            ->mongo
+            ->selectDB($this->dbOptions['database'])
+            ->selectCollection($this->dbOptions['collection']);
     }
 
     /**
@@ -72,12 +112,14 @@ class MongoDbStorage implements Storage
      */
     public function insert($storageName, $key, array $data)
     {
-        $this->database
-            ->selectCollection($storageName)
-            ->insertOne([
-                'key'   => $key,
-                'value' => $data,
-            ]);
+        $this->initialize();
+
+        $value = [
+            'key'   => $key,
+            'value' => $data,
+        ];
+
+        $this->collection->insert($value);
     }
 
     /**
@@ -85,14 +127,14 @@ class MongoDbStorage implements Storage
      */
     public function update($storageName, $key, array $data)
     {
-        $this->database
-            ->selectCollection($storageName)
-            ->replaceOne([
-                'key'   => $key,
-            ], [
-                'key'   => $key,
-                'value' => $data,
-            ]);
+        $this->initialize();
+
+        $value = [
+            'key'   => $key,
+            'value' => $data,
+        ];
+
+        $this->collection->update(['key' => $key], $value);
     }
 
     /**
@@ -100,11 +142,9 @@ class MongoDbStorage implements Storage
      */
     public function delete($storageName, $key)
     {
-        $this->database
-            ->selectCollection($storageName)
-            ->deleteOne([
-                'key' => $key,
-            ]);
+        $this->initialize();
+
+        $this->collection->remove(['key' => $key]);
     }
 
     /**
@@ -112,23 +152,15 @@ class MongoDbStorage implements Storage
      */
     public function find($storageName, $key)
     {
-        $result = $this->database
-            ->selectCollection($storageName, [
-                'typeMap' => [
-                    'array' => 'array',
-                    'document' => 'array',
-                    'root' => 'array',
-                ],
-            ])
-            ->findOne([
-                'key' => $key,
-            ]);
+        $this->initialize();
 
-        if (! $result || ! $result['value']) {
-            throw new NotFoundException();
+        $value = $this->collection->findOne(['key' => $key], ['value']);
+
+        if ($value) {
+            return $value['value'];
         }
 
-        return $result['value'];
+        throw new NotFoundException();
     }
 
     /**

lib/Doctrine/KeyValueStore/Storage/RiakStorage.php

@@ -21,14 +21,7 @@
 namespace Doctrine\KeyValueStore\Storage;
 
 use Doctrine\KeyValueStore\NotFoundException;
-use Riak\Client\Command\Kv\DeleteValue;
-use Riak\Client\Command\Kv\FetchValue;
-use Riak\Client\Command\Kv\StoreValue;
-use Riak\Client\Core\Query\RiakLocation;
-use Riak\Client\Core\Query\RiakNamespace;
-use Riak\Client\Core\Query\RiakObject;
-use Riak\Client\RiakClient;
-use Riak\Client\RiakException;
+use Riak\Client;
 
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
@@ -36,11 +29,17 @@ use Riak\Client\RiakException;
 class RiakStorage implements Storage
 {
     /**
-     * @var RiakClient
+     * @var \Riak\Client
      */
-    private $client;
+    protected $client;
 
-    public function __construct(RiakClient $riak)
+    /**
+     * Constructor
+     *
+     * @param \Riak\Client $riak
+     * @param string       $bucketName
+     */
+    public function __construct(Client $riak)
     {
         $this->client = $riak;
     }
@@ -69,25 +68,14 @@ class RiakStorage implements Storage
         return false;
     }
 
-    private function store($storageName, $key, array $data)
-    {
-        $location = $this->getRiakLocation($storageName, $key);
-
-        $riakObject = new RiakObject();
-        $riakObject->setContentType('application/json');
-        $riakObject->setValue(json_encode($data));
-
-        $store = StoreValue::builder($location, $riakObject)->build();
-
-        $this->client->execute($store);
-    }
-
     /**
      * {@inheritDoc}
      */
     public function insert($storageName, $key, array $data)
     {
-        $this->store($storageName, $key, $data);
+        $bucket = $this->client->bucket($storageName);
+        $object = $bucket->newObject($key, $data);
+        $object->store();
     }
 
     /**
@@ -95,7 +83,12 @@ class RiakStorage implements Storage
      */
     public function update($storageName, $key, array $data)
     {
-        $this->store($storageName, $key, $data);
+        $bucket = $this->client->bucket($storageName);
+        /** @var $object \Riak\Object */
+        $object = $bucket->get($key);
+
+        $object->setData($data);
+        $object->store();
     }
 
     /**
@@ -103,15 +96,17 @@ class RiakStorage implements Storage
      */
     public function delete($storageName, $key)
     {
-        $location = $this->getRiakLocation($storageName, $key);
+        $bucket = $this->client->bucket($storageName);
 
-        $delete = DeleteValue::builder($location)->build();
+        /** @var $object \Riak\Object */
+        $object = $bucket->get($key);
 
-        try {
-            $this->client->execute($delete);
-        } catch (RiakException $exception) {
-            // deletion can fail silent
+        if (! $object->exists()) {
+            // object does not exist, do nothing
+            return;
         }
+
+        $object->delete();
     }
 
     /**
@@ -119,29 +114,16 @@ class RiakStorage implements Storage
      */
     public function find($storageName, $key)
     {
-        $location = $this->getRiakLocation($storageName, $key);
+        $bucket = $this->client->bucket($storageName);
 
-        // fetch object
-        $fetch = FetchValue::builder($location)->build();
+        /** @var $object \Riak\Object */
+        $object = $bucket->get($key);
 
-        try {
-            $result = $this->client->execute($fetch);
-        } catch (RiakException $exception) {
-            throw new NotFoundException();
+        if (! $object->exists()) {
+            throw new NotFoundException;
         }
 
-        $json = (string) $result
-            ->getValue()
-            ->getValue();
-
-        return json_decode($json, true);
-    }
-
-    private function getRiakLocation($storageName, $key)
-    {
-        $namespace = new RiakNamespace('default', $storageName);
-
-        return new RiakLocation($namespace, $key);
+        return $object->getData();
     }
 
     /**

lib/Doctrine/KeyValueStore/Storage/WindowsAzureTableStorage.php

@@ -183,7 +183,7 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
         $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) {

phpunit.xml.dist

@@ -16,6 +16,5 @@
         <var name="DOCTRINE_KEYVALUE_AZURE_AUTHSCHEMA" value="sharedlite" />
         <var name="DOCTRINE_KEYVALUE_AZURE_NAME" value="" />
         <var name="DOCTRINE_KEYVALUE_AZURE_KEY" value="" />
-        <env name="RIAK_DNS" value="" />
     </php>
 </phpunit>

tests/Doctrine/Tests/KeyValueStore/Storage/MongoDbStorageTest.php

@@ -20,34 +20,37 @@
 
 namespace Doctrine\Tests\KeyValueStore\Storage;
 
-use Doctrine\KeyValueStore\NotFoundException;
 use Doctrine\KeyValueStore\Storage\MongoDbStorage;
-use MongoDB\Client;
 
 /**
  * MongoDb storage testcase
  *
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
  *
- * @covers \Doctrine\KeyValueStore\Storage\MongoDbStorage
- * @requires extension mongodb
+ * @requires extension mongo
  */
 class MongoDbStorageTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var Client
-     */
-    private $client;
-
-    /**
-     * @var MongoDbStorage
-     */
-    private $storage;
-
     protected function setUp()
     {
-        $this->client = new Client();
-        $this->storage = new MongoDbStorage($this->client->test);
+        $this->mongo = $this->getMock('\Mongo');
+
+        $this->mongodb = $this->getMockBuilder('\MongoDB')->disableOriginalConstructor()->getMock();
+
+        $this->mongo->expects($this->any())
+                    ->method('selectDB')
+                    ->will($this->returnValue($this->mongodb));
+
+        $this->collection = $this->getMockBuilder('MongoCollection')->disableOriginalConstructor()->getMock();
+
+        $this->mongodb->expects($this->once())
+             ->method('selectCollection')
+             ->will($this->returnValue($this->collection));
+
+        $this->storage = new MongoDbStorage($this->mongo, [
+            'collection' => 'test',
+            'database'   => 'test',
+        ]);
     }
 
     public function testInsert()
@@ -57,21 +60,20 @@ class MongoDbStorageTest extends \PHPUnit_Framework_TestCase
             'title'  => 'example book',
         ];
 
-        $this->storage->insert('mongodb', 'testInsert', $data);
+        $dbDataset = [];
 
-        $result = $this->client
-            ->test
-            ->mongodb
-            ->findOne([
-                'key' => 'testInsert',
-            ]);
+        $this->collection->expects($this->once())
+            ->method('insert')
+            ->will($this->returnCallback(function ($data) use (&$dbDataset) {
+                $dbDataset[] = $data;
+            }));
 
-        $this->assertSame($data, $result['value']->getArrayCopy());
+        $this->storage->insert('mongodb', '1', $data);
+        $this->assertCount(1, $dbDataset);
+
+        $this->assertEquals([['key' => '1', 'value' => $data]], $dbDataset);
     }
 
-    /**
-     * @depends testInsert
-     */
     public function testUpdate()
     {
         $data = [
@@ -79,67 +81,80 @@ class MongoDbStorageTest extends \PHPUnit_Framework_TestCase
             'title'  => 'example book',
         ];
 
-        $this->storage->insert('mongodb', 'testUpdate', [
-            'foo' => 'bar',
-        ]);
-        $this->storage->update('mongodb', 'testUpdate', $data);
+        $dbDataset = [];
 
-        $result = $this->client
-            ->test
-            ->mongodb
-            ->findOne([
-                'key' => 'testUpdate',
-            ]);
+        $this->collection->expects($this->once())
+            ->method('update')
+            ->will($this->returnCallback(function ($citeria, $data) use (&$dbDataset) {
+                $dbDataset = [$citeria, $data];
+            }));
 
-        $this->assertSame($data, $result['value']->getArrayCopy());
+        $this->storage->update('mongodb', '1', $data);
+
+        $this->assertEquals(['key' => '1'], $dbDataset[0]);
+        $this->assertEquals(['key' => '1', 'value' => $data], $dbDataset[1]);
     }
 
-    /**
-     * @depends testInsert
-     */
     public function testDelete()
     {
-        $this->storage->insert('mongodb', 'testDelete', [
-            'foo' => 'bar',
-        ]);
+        $dataset = [
+            [
+                'key'   => 'foobar',
+                'value' => [
+                    'author' => 'John Doe',
+                    'title'  => 'example book',
+                ],
+            ],
+        ];
 
-        $this->storage->delete('mongodb', 'testDelete');
+        $this->collection->expects($this->once())
+             ->method('remove')
+             ->will($this->returnCallback(function ($citeria) use (&$dataset) {
+                    foreach ($dataset as $key => $row) {
+                        if ($row['key'] === $citeria['key']) {
+                            unset($dataset[$key]);
+                        }
+                    }
+                }
+             ));
 
-        $result = $this->client
-            ->test
-            ->mongodb
-            ->findOne([
-                'key' => 'testDelete',
-            ]);
+        $this->storage->delete('test', 'foobar');
 
-        $this->assertNull($result);
+        $this->assertCount(0, $dataset);
     }
 
-    /**
-     * @depends testInsert
-     */
     public function testFind()
     {
         $dataset = [
-            'author' => 'John Doe',
-            'title'  => 'example book',
+            [
+                'key'   => 'foobar',
+                'value' => [
+                    'author' => 'John Doe',
+                    'title'  => 'example book',
+                ],
+            ],
         ];
 
-        $this->storage->insert('mongodb', 'testFind', $dataset);
+        $this->collection->expects($this->once())
+            ->method('findOne')
+            ->will($this->returnCallback(function ($citeria, $fields) use (&$dataset) {
+                foreach ($dataset as $key => $row) {
+                    if ($row['key'] === $citeria['key']) {
+                        return $row;
+                    }
+                }
+            }
+        ));
 
-        $data = $this->storage->find('mongodb', 'testFind');
+        $data = $this->storage->find('test', 'foobar');
 
-        $this->assertEquals($dataset, $data);
-    }
-
-    public function testFindWithNotExistKey()
-    {
-        $this->setExpectedException(NotFoundException::class);
-        $this->storage->find('mongodb', 'not-existing-key');
+        $this->assertEquals($dataset[0]['value'], $data);
     }
 
     public function testGetName()
     {
+        $this->storage->initialize();
+
         $this->assertEquals('mongodb', $this->storage->getName());
     }
 }

tests/Doctrine/Tests/KeyValueStore/Storage/RiakStorageTest.php

@@ -20,46 +20,30 @@
 
 namespace Doctrine\Tests\KeyValueStore\Storage;
 
-use Doctrine\KeyValueStore\NotFoundException;
 use Doctrine\KeyValueStore\Storage\RiakStorage;
-use PHPUnit_Framework_TestCase;
-use Riak\Client\Command\Kv\Builder\ListKeysBuilder;
-use Riak\Client\Command\Kv\FetchValue;
-use Riak\Client\Core\Query\RiakLocation;
-use Riak\Client\Core\Query\RiakNamespace;
-use Riak\Client\Core\Query\RiakObject;
-use Riak\Client\Core\Transport\RiakTransportException;
-use Riak\Client\RiakClient;
-use Riak\Client\RiakClientBuilder;
 
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
  */
-class RiakStorageTest extends PHPUnit_Framework_TestCase
+class RiakStorageTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var RiakClient
-     */
-    private $client;
-
     /**
      * @var RiakStorage
      */
     private $storage;
 
-    protected function setUp()
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $riak;
+
+    protected function setup()
     {
-        $dns = getenv('RIAK_DNS');
+        $this->riak = $this->getMockBuilder('Riak\\Client')
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        if (empty($dns)) {
-            $this->markTestSkipped('Missing Riak DNS');
-        }
-
-        $this->client = (new RiakClientBuilder())
-            ->withNodeUri($dns)
-            ->build();
-
-        $this->storage = new RiakStorage($this->client);
+        $this->storage = new RiakStorage($this->riak);
     }
 
     public function testSupportsPartialUpdates()
@@ -79,124 +63,186 @@ class RiakStorageTest extends PHPUnit_Framework_TestCase
 
     public function testInsert()
     {
-        $data = [
-            'title' => 'Riak test',
-        ];
+        $bucket = $this->getMockBuilder('Riak\Bucket')
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->storage->insert('riak-test', 'foobar', $data);
+        $this->riak->expects($this->once())
+            ->method('bucket')
+            ->will($this->returnValue($bucket));
 
-        $location = $this->getRiakLocation();
+        $objectMock = $this->getMockBuilder('Riak\Object')
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $fetch = FetchValue::builder($location)->build();
+        $objectMock->expects($this->once())
+            ->method('store');
 
-        $json = (string) $this->client
-            ->execute($fetch)
-            ->getValue()
-            ->getValue();
+        $that = $this;
+        $bucket->expects($this->once())
+            ->method('newObject')
+            ->will($this->returnCallback(function ($key, $data) use ($objectMock, $that) {
+                $that->assertEquals('foobar', $key);
+                $that->assertEquals(['title' => 'Riak test'], $data);
+                return $objectMock;
+            }));
 
-        $this->assertSame($data, json_decode($json, true));
+        $this->storage->insert('riak-test', 'foobar', ['title' => 'Riak test']);
     }
 
-    /**
-     * @depends testInsert
-     */
     public function testUpdate()
     {
-        $data = [
-            'title' => 'Riak update',
-        ];
+        $objectMock = $this->getMockBuilder('Riak\Object')
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->storage->insert('riak-test', 'foobar', [
-            'title' => 'Riak insert',
-        ]);
+        $bucket = $this->getMockBuilder('Riak\Bucket')
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $location = $this->getRiakLocation();
+        $this->riak->expects($this->once())
+            ->method('bucket')
+            ->will($this->returnValue($bucket));
 
-        $this->assertTotalBucketKeys(1, $location);
+        $bucket->expects($this->once())
+             ->method('get')
+             ->will($this->returnValue($objectMock));
 
-        $this->storage->update('riak-test', 'foobar', $data);
+        $that = $this;
+        $objectMock->expects($this->once())
+            ->method('setData')
+            ->will($this->returnCallback(function ($data) use ($that) {
+                $that->assertEquals(['title' => 'Riak cookbook'], $data);
+            }));
 
-        $fetch = FetchValue::builder($location)->build();
+        $objectMock->expects($this->once())
+            ->method('store');
 
-        $json = (string) $this->client
-            ->execute($fetch)
-            ->getValue()
-            ->getValue();
-
-        $this->assertSame($data, json_decode($json, true));
-        $this->assertTotalBucketKeys(1, $location);
+        $this->storage->update('riak-test', 'foobar', ['title' => 'Riak cookbook']);
     }
 
-    /**
-     * @depends testInsert
-     */
     public function testDelete()
     {
-        $this->testInsert();
+        $objectMock = $this->getMockBuilder('Riak\Object')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $bucket = $this->getMockBuilder('Riak\Bucket')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->riak->expects($this->once())
+            ->method('bucket')
+            ->will($this->returnValue($bucket));
+
+        $bucket->expects($this->once())
+            ->method('get')
+            ->with('foobar')
+            ->will($this->returnValue($objectMock));
+
+        $objectMock->expects($this->once())
+            ->method('exists')
+            ->will($this->returnValue(true));
+
+        $objectMock->expects($this->once())
+            ->method('delete');
 
         $this->storage->delete('riak-test', 'foobar');
-
-        $location = $this->getRiakLocation();
-
-        $fetch = FetchValue::builder($location)->build();
-
-        $this->setExpectedException(RiakTransportException::class);
-        $this->client->execute($fetch);
-
-        $this->assertTotalBucketKeys(0, $location);
     }
 
-    /**
-     * @depends testDelete
-     */
     public function testDeleteWithNotExistKey()
     {
+        $objectMock = $this->getMockBuilder('Riak\Object')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $bucket = $this->getMockBuilder('Riak\Bucket')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->riak->expects($this->once())
+            ->method('bucket')
+            ->will($this->returnValue($bucket));
+
+        $bucket->expects($this->once())
+            ->method('get')
+            ->with('foobar')
+            ->will($this->returnValue($objectMock));
+
+        $objectMock->expects($this->once())
+            ->method('exists')
+            ->will($this->returnValue(false));
+
+        $objectMock->expects($this->never())
+            ->method('delete');
+
         $this->storage->delete('riak-test', 'foobar');
-        $this->storage->delete('riak-test', 'foobar');
+    }
+
+    public function testFind()
+    {
+        $objectMock = $this->getMockBuilder('Riak\Object')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $bucket = $this->getMockBuilder('Riak\Bucket')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->riak->expects($this->once())
+            ->method('bucket')
+            ->will($this->returnValue($bucket));
+
+        $bucket->expects($this->once())
+            ->method('get')
+            ->with('foobar')
+            ->will($this->returnValue($objectMock));
+
+        $objectMock->expects($this->once())
+            ->method('exists')
+            ->will($this->returnValue(true));
+
+        $objectMock->expects($this->once())
+            ->method('getData')
+            ->will($this->returnValue(['title' => 'Riak Test']));
+
+        $this->assertEquals(['title' => 'Riak Test'], $this->storage->find('riaktest', 'foobar'));
     }
 
     /**
-     * @depends testInsert
+     * @expectedException Doctrine\KeyValueStore\NotFoundException
      */
-    public function testFind()
-    {
-        $data = [
-            'title' => 'Riak test',
-        ];
-
-        $this->storage->insert('riak-test', 'foobar', $data);
-
-        $result = $this->storage->find('riak-test', 'foobar');
-
-        $this->assertSame($data, $result);
-    }
-
     public function testFindWithNotExistKey()
     {
-        $this->setExpectedException(NotFoundException::class);
-        $this->storage->find('riak-test', 'foobar-1');
+        $objectMock = $this->getMockBuilder('Riak\Object')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $bucket = $this->getMockBuilder('Riak\Bucket')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->riak->expects($this->once())
+            ->method('bucket')
+            ->will($this->returnValue($bucket));
+
+        $bucket->expects($this->once())
+            ->method('get')
+            ->with('foobar')
+            ->will($this->returnValue($objectMock));
+
+        $objectMock->expects($this->once())
+            ->method('exists')
+            ->will($this->returnValue(false));
+
+        $objectMock->expects($this->never())
+            ->method('getData');
+
+        $this->storage->find('riak-test', 'foobar');
     }
 
     public function testGetName()
     {
         $this->assertEquals('riak', $this->storage->getName());
     }
-
-    private function assertTotalBucketKeys($expectedTotal, $location)
-    {
-        $command = (new ListKeysBuilder($location->getNamespace()))->build();
-
-        $iterator = $this->client
-            ->execute($command)
-            ->getIterator();
-
-        $this->assertCount($expectedTotal, iterator_to_array($iterator));
-    }
-
-    private function getRiakLocation()
-    {
-        $namespace = new RiakNamespace('default', 'riak-test');
-
-        return new RiakLocation($namespace, 'foobar');
-    }
 }

tests/Doctrine/Tests/KeyValueStore/Storage/WindowsAzureTableStorageTest.php

@@ -20,9 +20,7 @@
 
 namespace Doctrine\Tests\KeyValueStore\Storage;
 
-use Doctrine\KeyValueStore\Http\Client;
 use Doctrine\KeyValueStore\Http\Response;
-use Doctrine\KeyValueStore\Storage\WindowsAzureTable\AuthorizationSchema;
 use Doctrine\KeyValueStore\Storage\WindowsAzureTableStorage;
 
 class WindowsAzureTableStorageTest extends AbstractStorageTestCase
@@ -31,14 +29,8 @@ class WindowsAzureTableStorageTest extends AbstractStorageTestCase
 
     protected function createStorage()
     {
-        $this->client = $this
-            ->getMockBuilder(Client::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $auth = $this
-            ->getMockBuilder(AuthorizationSchema::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->client = $this->getMock('Doctrine\KeyValueStore\Http\Client');
+        $auth         = $this->getMock('Doctrine\KeyValueStore\Storage\WindowsAzureTable\AuthorizationSchema');
         $auth->expects($this->any())->method('signRequest')->will($this->returnValue('Authorization: SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM='));
 
         $storage = new WindowsAzureTableStorage(

tests/travis.sh

@@ -7,5 +7,7 @@ sudo apt-get install -y libuv-dev libssl-dev
 cd /tmp && git clone https://github.com/datastax/php-driver.git && cd php-driver && git submodule update --init
 cd ext && ./install.sh && cd "$TRAVIS_BUILD_DIR"
 echo "extension=cassandra.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
+# PHP extensions
+yes | pecl install mongo
 # PECL extensions
 echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini