Implement cassandra range query

.travis.yml

@@ -1,10 +1,17 @@
 language: php
 
 services:
-  - docker
+  - cassandra
+  - couchdb
   - mongodb
   - redis-server
 
+matrix:
+    include:
+        -
+            dist: precise
+            php: 5.5
+
 php:
   - 5.6
   - 7.0
@@ -12,25 +19,7 @@ php:
   - 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
-
 before_install:
-  - docker run -d -p 8000:8000 amazon/dynamodb-local
-  - 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
   - composer self-update
 

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

@@ -6,16 +6,16 @@
     },
     "require-dev": {
         "datastax/php-driver": "^1.0",
-        "doctrine/couchdb": "^1.0.0-beta4",
+        "doctrine/couchdb": "^2.0@alpha",
         "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"
     },
     "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

@@ -58,7 +58,6 @@ So far the following drivers exist (and are documented here):
 * Microsoft Windows Azure Table
 * Couchbase
 * CouchDB
-* DynamoDB
 * MongoDB
 * Riak
 
@@ -210,42 +209,51 @@ See the `AWS docs <http://docs.aws.amazon.com/amazondynamodb/latest/developergui
 
     <?php
 
-    $client = DynamoDbClient::factory([...])
+    $sdk = new \Aws\Sdk([...]);
+    $client = $sdk->createDynamoDb();
 
-    $storage = new DynamoDbStorage($client);
+    $storage = new DynamoDbStorage(
+        $client,
+        // Optional key name, defaults to Id.
+        null,
+        // Optional table name/ key name pairs.
+        // This example uses a table called Awesome keyed by MyKey.
+        ['storage_keys' => ['Awesome' => 'MyKey']]
+    );
 
 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/Query/RangeQuery.php

@@ -202,7 +202,7 @@ class RangeQuery
     /**
      * Execute query and return a result iterator.
      *
-     * @return ResultIterator
+     * @return array
      */
     public function execute()
     {

lib/Doctrine/KeyValueStore/Query/RangeQueryStorage.php

@@ -29,14 +29,14 @@ namespace Doctrine\KeyValueStore\Query;
 interface RangeQueryStorage
 {
     /**
-     * Execute the range query and return a ResultIterator
+     * Execute the range query and return an array
      *
      * @param RangeQuery $query
      * @param string     $storageName
      * @param array      $key
      * @param Closure    $hydrateRow
      *
-     * @return ResultIterator
+     * @return array
      */
     public function executeRangeQuery(RangeQuery $query, $storageName, $key, \Closure $hydrateRow = null);
 }

lib/Doctrine/KeyValueStore/Storage/CassandraStorage.php

@@ -23,6 +23,8 @@ namespace Doctrine\KeyValueStore\Storage;
 use Cassandra\ExecutionOptions;
 use Cassandra\Session;
 use Doctrine\KeyValueStore\NotFoundException;
+use Doctrine\KeyValueStore\Query\RangeQuery;
+use Doctrine\KeyValueStore\Query\RangeQueryStorage;
 
 /**
  * Cassandra Storage Engine for KeyValueStore.
@@ -31,7 +33,7 @@ use Doctrine\KeyValueStore\NotFoundException;
  *
  * @uses https://github.com/datastax/php-driver
  */
-class CassandraStorage implements Storage
+class CassandraStorage implements Storage, RangeQueryStorage
 {
     /**
      * @var \Cassandra\Session
@@ -176,6 +178,13 @@ class CassandraStorage implements Storage
         return $data;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function executeRangeQuery(RangeQuery $query, $storageName, $key, \Closure $hydrateRow = null)
+    {
+    }
+
     /**
      * {@inheritDoc}
      */

lib/Doctrine/KeyValueStore/Storage/CouchDbStorage.php

@@ -21,6 +21,9 @@
 namespace Doctrine\KeyValueStore\Storage;
 
 use Doctrine\CouchDB\CouchDBClient;
+use Doctrine\CouchDB\Mango\MangoQuery;
+use Doctrine\KeyValueStore\Query\RangeQuery;
+use Doctrine\KeyValueStore\Query\RangeQueryStorage;
 
 /**
  * Key-Value-Storage using a Doctrine CouchDB Client library as backend.
@@ -30,7 +33,7 @@ use Doctrine\CouchDB\CouchDBClient;
  *
  * @author Emanuele Minotto <minottoemanuele@gmail.com>
  */
-final class CouchDbStorage implements Storage
+final class CouchDbStorage implements Storage, RangeQueryStorage
 {
     /**
      * @var CouchDBClient
@@ -116,7 +119,7 @@ final class CouchDbStorage implements Storage
     /**
      * @param string       $storageName
      * @param array|string $key
-     * 
+     *
      * @return string
      */
     private function flattenKey($storageName, $key)
@@ -137,4 +140,72 @@ final class CouchDbStorage implements Storage
 
         return $finalKey;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function executeRangeQuery(RangeQuery $query, $storageName, $key, \Closure $hydrateRow = null)
+    {
+        $mangoQuery = new MangoQuery();
+        $partitionKey = $query->getPartitionKey();
+
+        $conditions = [];
+        foreach ($query->getConditions() as $condition) {
+            switch ($condition[0]) {
+                case RangeQuery::CONDITION_LE:
+                    $conditions[] = [
+                        $partitionKey => [
+                            '$lte' => $condition[1],
+                        ],
+                    ];
+                    break;
+
+                case RangeQuery::CONDITION_GE:
+                    $conditions[] = [
+                        $partitionKey => [
+                            '$gte' => $condition[1],
+                        ],
+                    ];
+                    break;
+
+                case RangeQuery::CONDITION_NEQ:
+                    $conditions[] = [
+                        $partitionKey => [
+                            '$ne' => $condition[1],
+                        ],
+                    ];
+                    break;
+
+                case RangeQuery::CONDITION_STARTSWITH:
+                    $conditions[] = [
+                        $partitionKey => [
+                            '$regex' => '^'.$condition[1],
+                        ],
+                    ];
+                    break;
+
+                default:
+                    $conditions[] = [
+                        $partitionKey => [
+                            '$'.$condition[0] => $condition[1],
+                        ],
+                    ];
+                    break;
+            }
+        }
+
+        $mangoQuery
+            ->select(['_id', $key])
+            ->where(['$and' => $conditions])
+            ->limit($query->getLimit());
+
+        $results = [];
+        $mangoResults = $this->client->find($query);
+
+        foreach ($mangoResults as $mangoResult) {
+            $results[] = $hydrateRow($mangoResult);
+        }
+
+        return $results;
+    }
 }

lib/Doctrine/KeyValueStore/Storage/DynamoDbStorage.php

@@ -22,21 +22,40 @@ namespace Doctrine\KeyValueStore\Storage;
 
 use Aws\DynamoDb\DynamoDbClient;
 use Aws\DynamoDb\Marshaler;
-use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Cache\Cache;
+use Doctrine\KeyValueStore\InvalidArgumentException;
 use Doctrine\KeyValueStore\NotFoundException;
 
 /**
- * DynamoDb storage.
+ * DyanmoDb storage
  *
  * @author Stan Lemon <stosh1985@gmail.com>
  */
 class DynamoDbStorage implements Storage
 {
     /**
-     * @var DynamoDbClient
+     * The key that DynamoDb uses to indicate the name of the table.
      */
-    private $client;
+    const TABLE_NAME_KEY = 'TableName';
+
+    /**
+     * The key that DynamoDb uses to indicate whether or not to do a consistent read.
+     */
+    const CONSISTENT_READ_KEY = 'ConsistentRead';
+
+    /**
+     * The key that is used to refer to the DynamoDb table key.
+     */
+    const TABLE_KEY = 'Key';
+
+    /**
+     * The key that is used to refer to the marshaled item for DynamoDb table.
+     */
+    const TABLE_ITEM_KEY = 'Item';
+
+    /**
+     * @var \Aws\DynamoDb\DynamoDbClient
+     */
+    protected $client;
 
     /**
      * @var Marshaler
@@ -44,27 +63,158 @@ class DynamoDbStorage implements Storage
     private $marshaler;
 
     /**
-     * @var Cache
+     * @var string
      */
-    private $descriptionCache;
+    private $defaultKeyName = 'Id';
 
     /**
-     * @param DynamoDbClient $client           The client for connecting to AWS DynamoDB
-     * @param Marshaler|null $marshaler        (optional) Marshaller for converting data to/from DynamoDB format
-     * @param Cache|null     $descriptionCache Cache used to store tables description
+     * A associative array where the key is the table name and the value is the name of the key.
+     *
+     * @var array
+     */
+    private $tableKeys = [];
+
+    /**
+     * @param DynamoDbClient $client         The client for connecting to AWS DynamoDB.
+     * @param Marshaler|null $marshaler      (optional) Marshaller for converting data to/from DynamoDB format.
+     * @param string         $defaultKeyName (optional) Default name to use for keys.
+     * @param array          $tableKeys      $tableKeys (optional) An associative array for keys representing table names and values
+     *                                       representing key names for those tables.
      */
     public function __construct(
-        DynamoDbClient $client,
-        Marshaler $marshaler = null,
-        Cache $descriptionCache = null
+      DynamoDbClient $client,
+      Marshaler $marshaler = null,
+      $defaultKeyName = null,
+      array $tableKeys = []
     ) {
-        $this->client = $client;
+        $this->client    = $client;
         $this->marshaler = $marshaler ?: new Marshaler();
-        $this->descriptionCache = $descriptionCache ?: new ArrayCache();
+
+        if ($defaultKeyName !== null) {
+            $this->setDefaultKeyName($defaultKeyName);
+        }
+
+        foreach ($tableKeys as $table => $keyName) {
+            $this->setKeyForTable($table, $keyName);
+        }
     }
 
     /**
-     * {@inheritdoc}
+     * Validates a DynamoDB key name.
+     *
+     * @param $name mixed The name to validate.
+     *
+     * @throws InvalidArgumentException When the key name is invalid.
+     */
+    private function validateKeyName($name)
+    {
+        if (! is_string($name)) {
+            throw InvalidArgumentException::invalidType('key', 'string', $name);
+        }
+
+        $len = strlen($name);
+        if ($len > 255 || $len < 1) {
+            throw InvalidArgumentException::invalidLength('name', 1, 255);
+        }
+    }
+
+    /**
+     * Validates a DynamoDB table name.
+     *
+     * @see http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html
+     *
+     * @param $name string The table name to validate.
+     *
+     * @throws InvalidArgumentException When the name is invalid.
+     */
+    private function validateTableName($name)
+    {
+        if (! is_string($name)) {
+            throw InvalidArgumentException::invalidType('key', 'string', $name);
+        }
+
+        if (! preg_match('/^[a-z0-9_.-]{3,255}$/i', $name)) {
+            throw InvalidArgumentException::invalidTableName($name);
+        }
+    }
+
+    /**
+     * Sets the default key name for storage tables.
+     *
+     * @param $name string The default name to use for the key.
+     *
+     * @throws InvalidArgumentException When the key name is invalid.
+     */
+    private function setDefaultKeyName($name)
+    {
+        $this->validateKeyName($name);
+        $this->defaultKeyName = $name;
+    }
+
+    /**
+     * Retrieves the default key name.
+     *
+     * @return string The default key name.
+     */
+    public function getDefaultKeyName()
+    {
+        return $this->defaultKeyName;
+    }
+
+    /**
+     * Sets a key name for a specific table.
+     *
+     * @param $table string The name of the table.
+     * @param $key string The name of the string.
+     *
+     * @throws InvalidArgumentException When the key or table name is invalid.
+     */
+    private function setKeyForTable($table, $key)
+    {
+        $this->validateTableName($table);
+        $this->validateKeyName($key);
+        $this->tableKeys[$table] = $key;
+    }
+
+    /**
+     * Retrieves a specific name for a key for a given table. The default is returned if this table does not have
+     * an actual override.
+     *
+     * @param string $tableName The name of the table.
+     *
+     * @return string
+     */
+    private function getKeyNameForTable($tableName)
+    {
+        return isset($this->tableKeys[$tableName]) ?
+          $this->tableKeys[$tableName] :
+          $this->defaultKeyName;
+    }
+
+    /**
+     * Prepares a key to be in a valid format for lookups for DynamoDB. If passing an array, that means that the key
+     * is the name of the key and the value is the actual value for the lookup.
+     *
+     * @param string $storageName Table name.
+     * @param string $key         Key name.
+     *
+     * @return array The key in DynamoDB format.
+     */
+    private function prepareKey($storageName, $key)
+    {
+        if (is_array($key)) {
+            $keyValue = reset($key);
+            $keyName  = key($key);
+        } else {
+            $keyValue = $key;
+            $keyName  = $this->getKeyNameForTable($storageName);
+        }
+
+        return $this->marshaler->marshalItem([$keyName => $keyValue]);
+    }
+
+    /**
+     * {@inheritDoc}
      */
     public function supportsPartialUpdates()
     {
@@ -72,7 +222,7 @@ class DynamoDbStorage implements Storage
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function supportsCompositePrimaryKeys()
     {
@@ -80,7 +230,7 @@ class DynamoDbStorage implements Storage
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function requiresCompositePrimaryKeys()
     {
@@ -88,98 +238,55 @@ class DynamoDbStorage implements Storage
     }
 
     /**
-     * Prepares a key to be in a valid format for lookups for DynamoDB. If passing an array, that means that the key
-     * is the name of the key and the value is the actual value for the lookup.
-     *
-     * @param string       $storageName Table name
-     * @param array|string $key         Key name
-     *
-     * @return array The key in DynamoDB format
-     */
-    private function prepareKey($storageName, $key)
-    {
-        if (! $this->descriptionCache->contains($storageName)) {
-            $result = $this->client->describeTable([
-                'TableName' => $storageName,
-            ]);
-
-            $keys = isset($result['Table']['KeySchema'])
-                ? $result['Table']['KeySchema']
-                : [];
-            $keys = array_column($keys, 'AttributeName') ?: [];
-
-            $this->descriptionCache->save($storageName, $keys);
-        }
-
-        $keys = isset($keys) ? $keys : $this->descriptionCache->fetch($storageName);
-        $keys = array_combine($keys, array_fill(0, (count($keys) - 1) ?: 1, $key));
-
-        if (!is_array($key)) {
-            $key = [
-                $storageName => $key,
-            ];
-        }
-
-        $keys = array_intersect_assoc($keys, $key) ?: $keys;
-
-        return $this->marshaler->marshalItem($keys);
-    }
-
-    /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function insert($storageName, $key, array $data)
     {
         $this->client->putItem([
-            'TableName' => $storageName,
-            'Item' => $this->prepareKey($storageName, $key) + $this->marshaler->marshalItem($data),
+          self::TABLE_NAME_KEY => $storageName,
+          self::TABLE_ITEM_KEY => $this->prepareKey($storageName, $key) + $this->marshaler->marshalItem($this->prepareData($data)),
         ]);
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function update($storageName, $key, array $data)
     {
-        // we are using PUT so we just replace the original item, if the key
-        // does not exist, it will be created.
-        $this->insert($storageName, $key, $data);
+        //We are using PUT so we just replace the original item, if the key
+        //does not exist, it will be created.
+        $this->insert($storageName, $key, $this->prepareData($data));
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function delete($storageName, $key)
     {
         $this->client->deleteItem([
-            'Key' => $this->prepareKey($storageName, $key),
-            'TableName' => $storageName,
+          self::TABLE_NAME_KEY => $storageName,
+          self::TABLE_KEY      => $this->prepareKey($storageName, $key),
         ]);
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function find($storageName, $key)
     {
-        $keys = $this->prepareKey($storageName, $key);
-
         $item = $this->client->getItem([
-            'ConsistentRead' => true,
-            'Key' => $keys,
-            'TableName' => $storageName,
+          self::TABLE_NAME_KEY      => $storageName,
+          self::CONSISTENT_READ_KEY => true,
+          self::TABLE_KEY           => $this->prepareKey($storageName, $key),
         ]);
 
-        if (! $item->hasKey('Item')) {
+        if (! $item) {
             throw NotFoundException::notFoundByKey($key);
         }
 
-        $item = $item->get('Item');
+        $item = $item->get(self::TABLE_ITEM_KEY);
 
-        $result = $this->marshaler->unmarshalItem($item);
-        $result = array_diff_key($result, $keys);
-
-        return $result;
+        return $this->marshaler->unmarshalItem($item);
     }
 
     /**
@@ -191,4 +298,25 @@ class DynamoDbStorage implements Storage
     {
         return 'dynamodb';
     }
+
+    /**
+     * Prepare data by removing empty item attributes.
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    protected function prepareData($data)
+    {
+        $callback = function ($value) {
+            return $value !== null && $value !== [] && $value !== '';
+        };
+
+        foreach ($data as &$value) {
+            if (is_array($value)) {
+                $value = $this->prepareData($value);
+            }
+        }
+        return array_filter($data, $callback);
+    }
 }

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();
     }
 
     /**

phpunit.xml.dist

@@ -16,7 +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="" />
-        <env name="DYNAMODB_DNS" value="" />
     </php>
 </phpunit>

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

@@ -1,157 +0,0 @@
-<?php
-
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Tests\KeyValueStore\Storage;
-
-use Doctrine\KeyValueStore\Storage\DynamoDbStorage;
-use Aws\DynamoDb\DynamoDbClient;
-use Doctrine\KeyValueStore\NotFoundException;
-
-/**
- * @covers \Doctrine\KeyValueStore\Storage\DynamoDbStorage
- */
-class DynamoDbStorageTest extends \PHPUnit_Framework_TestCase
-{
-    const DATA = [
-        'author' => 'John Doe',
-        'title' => 'example book',
-    ];
-
-    /**
-     * @var DynamoDbClient|null
-     */
-    private static $client;
-
-    /**
-     * @var DynamoDbStorage
-     */
-    private $storage;
-
-    public static function setUpBeforeClass()
-    {
-        $dns = getenv('DYNAMODB_DNS');
-
-        if (empty($dns)) {
-            return;
-        }
-
-        static::$client = DynamoDbClient::factory(array(
-            'credentials' => [
-                'key' => 'YOUR_KEY',
-                'secret' => 'YOUR_SECRET',
-            ],
-            'region' => 'us-west-2',
-            'endpoint' => $dns,
-            'version' => 'latest',
-            'retries' => 1,
-        ));
-
-        try {
-            static::$client->deleteTable([
-                'TableName' => 'dynamodb',
-            ]);
-        } catch (\Exception $exception) {
-            // table does not exist
-        }
-
-        try {
-            static::$client->createTable(array(
-                'TableName' => 'dynamodb',
-                'AttributeDefinitions' => array(
-                    array(
-                        'AttributeName' => 'id',
-                        'AttributeType' => 'S',
-                    ),
-                ),
-                'KeySchema' => array(
-                    array(
-                        'AttributeName' => 'id',
-                        'KeyType' => 'HASH',
-                    ),
-                ),
-                'ProvisionedThroughput' => array(
-                    'ReadCapacityUnits' => 10,
-                    'WriteCapacityUnits' => 20,
-                ),
-            ));
-        } catch (\Exception $exception) {
-            static::$client = null;
-        }
-    }
-
-    protected function setUp()
-    {
-        if (! static::$client) {
-            $this->markTestSkipped('DynamoDB is required.');
-        }
-
-        $this->storage = new DynamoDbStorage(static::$client);
-    }
-
-    public function testInsertAndFind()
-    {
-        $this->storage->insert('dynamodb', 'testInsertAndFind', self::DATA);
-
-        $data = $this->storage->find('dynamodb', 'testInsertAndFind');
-
-        $this->assertEquals(self::DATA, $data);
-    }
-
-    public function testUpdate()
-    {
-        $this->storage->insert('dynamodb', 'testUpdate', self::DATA);
-
-        $newData = [
-            'foo' => 'bar',
-        ];
-
-        $this->storage->update('dynamodb', 'testUpdate', $newData);
-
-        $data = $this->storage->find('dynamodb', 'testUpdate');
-        $this->assertEquals($newData, $data);
-    }
-
-    /**
-     * @depends testInsertAndFind
-     */
-    public function testFindWithNotExistKey()
-    {
-        $this->setExpectedException(NotFoundException::class);
-        $this->storage->find('dynamodb', 'not-existing-key');
-    }
-
-    /**
-     * @depends testInsertAndFind
-     * @depends testFindWithNotExistKey
-     */
-    public function testDelete()
-    {
-        $this->storage->insert('dynamodb', 'testDelete', self::DATA);
-        $this->storage->delete('dynamodb', 'testDelete');
-
-        $this->setExpectedException(NotFoundException::class);
-        $this->storage->find('dynamodb', 'testDelete');
-    }
-
-    public function testGetName()
-    {
-        $this->assertEquals('dynamodb', $this->storage->getName());
-    }
-}

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

@@ -0,0 +1,346 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Tests\KeyValueStore\Storage;
+
+use Doctrine\KeyValueStore\Storage\DynamoDbStorage;
+
+/**
+ * @covers \Doctrine\KeyValueStore\Storage\DynamoDbStorage
+ */
+class DynamoDbTest extends \PHPUnit_Framework_TestCase
+{
+    private function getDynamoDbMock($methods = [])
+    {
+        $client = $this->getMockBuilder('Aws\DynamoDb\DynamoDbClient')->disableOriginalConstructor();
+
+        if (count($methods)) {
+            $client->setMethods($methods);
+        }
+
+        return $client->getMock();
+    }
+
+    private function getDynamoDbResultMock($methods = [])
+    {
+        $result = $this->getMockBuilder('Aws\Result')->disableOriginalConstructor();
+
+        if (count($methods)) {
+            $result->setMethods($methods);
+        }
+
+        return $result->getMock();
+    }
+
+    public function testTheStorageName()
+    {
+        $client = $this->getDynamoDbMock();
+
+        $storage = new DynamoDbStorage($client);
+        $this->assertSame('dynamodb', $storage->getName());
+    }
+
+    public function testDefaultKeyName()
+    {
+        $client  = $this->getDynamoDbMock();
+        $storage = new DynamoDbStorage($client);
+        $this->assertAttributeSame('Id', 'defaultKeyName', $storage);
+    }
+
+    public function testThatTableKeysInitiallyEmpty()
+    {
+        $client  = $this->getDynamoDbMock();
+        $storage = new DynamoDbStorage($client);
+        $this->assertAttributeSame([], 'tableKeys', $storage);
+    }
+
+    public function testDefaultKeyCannotBeSomethingOtherThanString()
+    {
+        $client = $this->getDynamoDbMock();
+        $this->setExpectedException(
+            '\Doctrine\KeyValueStore\KeyValueStoreException',
+            'The key must be a string, got "array" instead.'
+        );
+        new DynamoDbStorage($client, null, []);
+    }
+
+    public function testTableKeysMustAllBeStringsOrElse()
+    {
+        $client = $this->getDynamoDbMock();
+        $this->setExpectedException(
+            '\Doctrine\KeyValueStore\KeyValueStoreException',
+            'The key must be a string, got "object" instead.'
+        );
+        new DynamoDbStorage($client, null, null, ['mytable' => 'hello', 'yourtable' => new \stdClass()]);
+    }
+
+    public function testKeyNameMustBeUnder255Bytes()
+    {
+        $client = $this->getDynamoDbMock();
+        $this->setExpectedException(
+            '\Doctrine\KeyValueStore\KeyValueStoreException',
+            'The name must be at least 1 but no more than 255 chars.'
+        );
+        new DynamoDbStorage($client, null, str_repeat('a', 256));
+    }
+
+    public function invalidTableNames()
+    {
+        return [
+            ['a2'],
+            ['yo%'],
+            ['что'],
+            ['h@llo'],
+        ];
+    }
+
+    public function validTableNames()
+    {
+        return [
+            ['MyTable'],
+            ['This_is0k-...'],
+            ['hello_world'],
+            ['...........00....'],
+        ];
+    }
+
+    private function invokeMethod($methodName, $obj, array $args = null)
+    {
+        $relf   = new \ReflectionObject($obj);
+        $method = $relf->getMethod($methodName);
+        $method->setAccessible(true);
+
+        if ($args) {
+            return $method->invokeArgs($obj, $args);
+        }
+
+        return $method->invoke($obj);
+    }
+
+    public function testTableNameMustBeAString()
+    {
+        $client  = $this->getDynamoDbMock();
+        $storage = new DynamoDbStorage($client);
+        $this->setExpectedException('\Doctrine\KeyValueStore\InvalidArgumentException');
+        $this->invokeMethod('setKeyForTable', $storage, [[], 'Id']);
+    }
+
+    /**
+     * @dataProvider invalidTableNames
+     */
+    public function testTableNameValidatesAgainstInvalidTableNames($tableName)
+    {
+        $client  = $this->getDynamoDbMock();
+        $storage = new DynamoDbStorage($client);
+        $this->setExpectedException('\Doctrine\KeyValueStore\KeyValueStoreException');
+        $this->invokeMethod('setKeyForTable', $storage, [$tableName, 'Id']);
+    }
+
+    /**
+     * @dataProvider validTableNames
+     */
+    public function testTableNameValidatesAgainstValidTableNames($tableName)
+    {
+        $client  = $this->getDynamoDbMock();
+        $storage = new DynamoDbStorage($client);
+        $this->invokeMethod('setKeyForTable', $storage, [$tableName, 'Id']);
+
+        $this->assertAttributeSame([$tableName => 'Id'], 'tableKeys', $storage);
+    }
+
+    public function testThatYouCanHaveMultipleTablesWithOverrides()
+    {
+        $client  = $this->getDynamoDbMock();
+        $storage = new DynamoDbStorage($client);
+        $this->invokeMethod('setKeyForTable', $storage, ['Aaa', '2']);
+        $this->invokeMethod('setKeyForTable', $storage, ['Bbb', '1']);
+
+        $this->assertAttributeSame(['Aaa' => '2', 'Bbb' => '1'], 'tableKeys', $storage);
+    }
+
+    public function testGetterForDefaultKeyName()
+    {
+        $client  = $this->getDynamoDbMock();
+        $storage = new DynamoDbStorage($client, null, 'CustomKey');
+        $this->assertSame('CustomKey', $storage->getDefaultKeyName());
+    }
+
+    public function testGetWillReturnDefaultKeyForUnrecognizedTableName()
+    {
+        $client  = $this->getDynamoDbMock();
+        $storage = new DynamoDbStorage($client, null, 'CustomKey');
+        $this->assertSame('CustomKey', $this->invokeMethod('getKeyNameForTable', $storage, ['whatever_this_is']));
+    }
+
+    public function testGetWillReturnCorrectKeyForRecognizedTableName()
+    {
+        $client  = $this->getDynamoDbMock();
+        $storage = new DynamoDbStorage($client, null, 'CustomKey', ['MyTable' => 'Yesss']);
+        $this->assertSame('Yesss', $this->invokeMethod('getKeyNameForTable', $storage, ['MyTable']));
+    }
+
+    public function testThatSomeStorageHasDifferentKey()
+    {
+        $client = $this->getDynamoDbMock();
+
+        $storage = new DynamoDbStorage($client, null, 'sauce', ['this' => 'that', 'yolo' => 'now']);
+
+        $this->assertSame(['that' => ['N' => '111']], $this->invokeMethod('prepareKey', $storage, ['this', 111]));
+    }
+
+    public function testThatSomeStorageUsesDefaultKey()
+    {
+        $client = $this->getDynamoDbMock();
+
+        $storage = new DynamoDbStorage($client, null, 'sauce', ['this' => 'that', 'yolo' => 'now']);
+
+        $this->assertSame(['sauce' => ['S' => 'hello']], $this->invokeMethod('prepareKey', $storage, ['MyTable', 'hello']));
+    }
+
+    public function testInsertingCallsAPutItem()
+    {
+        $client = $this->getDynamoDbMock(['putItem']);
+
+        $client->expects($this->once())->method('putItem')->with($this->equalTo([
+            'TableName' => 'MyTable',
+            'Item'      => [
+                'Id' => ['S' => 'stuff'],
+                'hi' => ['S' => 'there'],
+                'yo' => ['BOOL' => false],
+            ],
+        ]));
+
+        $storage = new DynamoDbStorage($client);
+        $storage->insert('MyTable', 'stuff', ['hi' => 'there', 'yo' => false]);
+    }
+
+    public function testInsertingPreparesNestedAttributes()
+    {
+        $client = $this->getDynamoDbMock(['putItem']);
+
+        $client->expects($this->once())->method('putItem')->with($this->equalTo([
+          'TableName' => 'MyTable',
+          'Item'      => [
+            'Id'   => ['S' => 'stuff'],
+            'hi'   => ['S' => 'there'],
+            'what' => ['L' => [
+                ['S' => 'Yep'],
+            ]],
+            'yo' => ['BOOL' => false],
+          ],
+        ]));
+
+        $storage = new DynamoDbStorage($client);
+        $storage->insert('MyTable', 'stuff', ['hi' => 'there', 'yo' => false, 'what' => ['Yep', '']]);
+    }
+
+    public function testUpdateActuallyAlsoCallsInsert()
+    {
+        $client = $this->getDynamoDbMock(['putItem']);
+
+        $client->expects($this->once())->method('putItem')->with($this->equalTo([
+            'TableName' => 'MyTable',
+            'Item'      => [
+                'Id' => ['S' => 'stuff'],
+                'hi' => ['S' => 'there'],
+                'yo' => ['BOOL' => false],
+            ],
+        ]));
+
+        $storage = new DynamoDbStorage($client);
+        $storage->update('MyTable', 'stuff', ['hi' => 'there', 'yo' => false]);
+    }
+
+    public function testDeleteItem()
+    {
+        $client = $this->getDynamoDbMock(['deleteItem']);
+
+        $client->expects($this->once())->method('deleteItem')->with($this->equalTo([
+            'TableName' => 'MyTable',
+            'Key'       => ['Id' => ['S' => 'abc123']],
+        ]));
+
+        $storage = new DynamoDbStorage($client);
+        $storage->delete('MyTable', 'abc123');
+    }
+
+    public function testDeleteItemWithKeyValuePair()
+    {
+        $client = $this->getDynamoDbMock(['deleteItem']);
+
+        $client->expects($this->once())->method('deleteItem')->with($this->equalTo([
+          'TableName' => 'MyTable',
+          'Key'       => ['Id' => ['S' => 'abc123']],
+        ]));
+
+        $storage = new DynamoDbStorage($client);
+        $storage->delete('MyTable', ['Id' => 'abc123']);
+    }
+
+    public function testPassingArrayAsKeyIsAPassthruToInsert()
+    {
+        $client = $this->getDynamoDbMock(['deleteItem']);
+
+        $client->expects($this->once())->method('deleteItem')->with($this->equalTo([
+            'TableName' => 'MyTable',
+            'Key'       => ['Id' => ['S' => 'abc123']],
+        ]));
+
+        $storage = new DynamoDbStorage($client);
+        $storage->delete('MyTable', 'abc123');
+    }
+
+    public function testTryingToFindAnItemThatDoesNotExist()
+    {
+        $client = $this->getDynamoDbMock(['getItem']);
+        $client->expects($this->once())->method('getItem')->with($this->equalTo([
+            'TableName'      => 'MyTable',
+            'ConsistentRead' => true,
+            'Key'            => ['Id' => ['N' => '1000']],
+        ]))->willReturn(null);
+
+        $storage = new DynamoDbStorage($client);
+        $this->setExpectedException(
+            '\Doctrine\KeyValueStore\NotFoundException',
+            'Could not find an item with key: 1000'
+        );
+        $storage->find('MyTable', 1000);
+    }
+
+    public function testFindAnItemThatExists()
+    {
+        $result = $this->getDynamoDbResultMock(['get']);
+        $result->expects($this->once())->method('get')->with('Item')->willReturn([
+            'hello' => ['S' => 'world'],
+        ]);
+
+        $client = $this->getDynamoDbMock(['getItem']);
+        $client->expects($this->once())->method('getItem')->with($this->equalTo([
+            'TableName'      => 'MyTable',
+            'ConsistentRead' => true,
+            'Key'            => ['Id' => ['N' => '1000']],
+        ]))->willReturn($result);
+
+        $storage      = new DynamoDbStorage($client);
+        $actualResult = $storage->find('MyTable', 1000);
+
+        $this->assertSame(['hello' => 'world'], $actualResult);
+    }
+}

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

@@ -20,34 +20,40 @@
 
 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
+            ->getMockBuilder('\Mongo')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $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 +63,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 +84,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,34 @@
 
 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()
-    {
-        $dns = getenv('RIAK_DNS');
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $riak;
 
-        if (empty($dns)) {
-            $this->markTestSkipped('Missing Riak DNS');
+    protected function setup()
+    {
+        if (PHP_MAJOR_VERSION >= 7) {
+            $this->markTestSkipped('Riak extension is not available for PHP versions >= 7');
         }
 
-        $this->client = (new RiakClientBuilder())
-            ->withNodeUri($dns)
-            ->build();
+        $this->riak = $this->getMockBuilder('Riak\\Client')
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->storage = new RiakStorage($this->client);
+        $this->storage = new RiakStorage($this->riak);
     }
 
     public function testSupportsPartialUpdates()
@@ -79,124 +67,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/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