Merge pull request #96 from doctrine/dynamodb-refactoring

DynamoDB internal refactoring

.editorconfig

@@ -0,0 +1,15 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -1,3 +1,4 @@
 vendor
 *phpunit.xml
 docs/_build
+/composer.lock

.php_cs

@@ -0,0 +1,82 @@
+<?php
+
+$header = <<<EOF
+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>.
+EOF;
+
+Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);
+
+$config = Symfony\CS\Config\Config::create()
+    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+    ->fixers([
+        'blankline_after_open_tag',
+        'empty_return',
+        'extra_empty_lines',
+        'function_typehint_space',
+        'join_function',
+        'method_argument_default_value',
+        'multiline_array_trailing_comma',
+        'no_blank_lines_after_class_opening',
+        'no_empty_lines_after_phpdocs',
+        'phpdoc_indent',
+        'phpdoc_no_access',
+        'phpdoc_no_empty_return',
+        'phpdoc_no_package',
+        'phpdoc_params',
+        'phpdoc_scalar',
+        'phpdoc_separation',
+        'phpdoc_trim',
+        'phpdoc_type_to_var',
+        'phpdoc_types',
+        'phpdoc_var_without_name',
+        'pre_increment',
+        'remove_leading_slash_use',
+        'remove_lines_between_uses',
+        'short_bool_cast',
+        'single_quote',
+        'spaces_after_semicolon',
+        'spaces_before_semicolon',
+        'spaces_cast',
+        'standardize_not_equal',
+        'ternary_spaces',
+        'trim_array_spaces',
+        'unneeded_control_parentheses',
+        'unused_use',
+        'whitespacy_lines',
+        'align_double_arrow',
+        'align_equals',
+        'concat_with_spaces',
+        'header_comment',
+        'logical_not_operators_with_successor_space',
+        'multiline_spaces_before_semicolon',
+        'newline_after_open_tag',
+        'ordered_use',
+        'php_unit_construct',
+        'phpdoc_order',
+        'short_array_syntax',
+    ]);
+
+if (null === $input->getArgument('path')) {
+    $config
+        ->finder(
+            Symfony\CS\Finder\DefaultFinder::create()
+                ->in('lib/')
+                ->in('tests/')
+        );
+}
+
+return $config;

.travis.yml

@@ -0,0 +1,41 @@
+language: php
+
+services:
+  - docker
+  - mongodb
+  - redis-server
+
+php:
+  - 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
+
+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
+
+install:
+  - composer --prefer-source install
+
+script:
+  - vendor/bin/phpunit --verbose

LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2006-2015 Doctrine Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,5 +1,7 @@
 # Doctrine Key Value Stores
 
+[![Build Status](https://travis-ci.org/doctrine/KeyValueStore.svg?branch=master)](https://travis-ci.org/doctrine/KeyValueStore)
+
 The Persistence interfaces are rather overkill for many implementations in the NoSQL world that are only key-value stores with some additional features on top. Doctrine Key Value Store to the rescue. This project offers a much simpler lightweight API that is centered on a key-value API to fetch/save objects.
 
 * Single- or multi-value primary keys
@@ -10,7 +12,7 @@ The Persistence interfaces are rather overkill for many implementations in the N
 * No support for references to other objects
 * EventListener for ODM/ORM that allows to manage key-value entities and collections of them as properties (postLoad, postUpdate, postPersist, postRemove)
 * Stripped down Object Manager Interface
-* Data-mapper as any other Doctrine library and persistence and data-objects are seperated.
+* Data-mapper as any other Doctrine library and persistence and data-objects are separated.
 * Inheritance (Single- or Multiple-Storage)
 
 ## Implementations
@@ -21,8 +23,9 @@ Following vendors are targeted:
 * Doctrine\Common\Cache provider (Implemented)
 * RDBMS (Implemented)
 * Couchbase (Implemented)
-* Amazon DynamoDB
-* CouchDB
+* Amazon DynamoDB (Implemented)
+* CouchDB (Implemented)
+* Cassandra
 * MongoDB (Implemented)
 * Riak (Implemented)
 * Redis (Implemented)

UPGRADE.md

@@ -0,0 +1,7 @@
+# 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

@@ -1,28 +1,32 @@
 {
     "name": "doctrine/key-value-store",
     "require": {
-        "doctrine/common": "*"
+        "php": "^5.5|^7.0",
+        "doctrine/common": "^2.4"
     },
     "require-dev": {
-        "riak/riak-client": "dev-master",
-        "microsoft/windowsazure": "dev-master"
-    },          
-    "repositories": [
-        {
-            "type": "pear",
-            "url": "http://pear.php.net"
-        }
-    ],
+        "datastax/php-driver": "^1.0",
+        "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"
+    },
     "suggest": {
-        "riak/riak-client": "to use the Riak storage",
-        "ext-couchbase": "to use the Couchbase storage",
-        "aws/aws-sdk-php": "to use the DynamoDB storage"
+        "aws/aws-sdk-php": "to use the DynamoDB storage",
+        "doctrine/couchdb": "to use the CouchDB storage",
+        "ext-couchbase": "to use the Couchbase storage"
     },
     "description": "Simple Key-Value Store Abstraction Layer that maps to PHP objects, allowing for many backends.",
     "license": "MIT",
     "autoload": {
-        "psr-0": {
-            "Doctrine\\KeyValueStore\\": "lib/"
+        "psr-4": {
+            "Doctrine\\KeyValueStore\\": "lib/Doctrine/KeyValueStore"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Doctrine\\Tests\\": "tests/Doctrine/Tests"
         }
     }
 }

composer.lock

@@ -1,752 +0,0 @@
-{
-    "hash": "bf53cb71537abb0dbed5002bbc4411f1",
-    "packages": [
-        {
-            "name": "doctrine/annotations",
-            "version": "v1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "v1.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/doctrine/annotations/archive/v1.0.zip",
-                "reference": "v1.0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2",
-                "doctrine/lexer": "1.*"
-            },
-            "require-dev": {
-                "doctrine/cache": "1.*"
-            },
-            "time": "2013-01-12 19:23:32",
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Annotations\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com",
-                    "homepage": "http://www.jwage.com/"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com",
-                    "homepage": "http://www.instaclick.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "parser",
-                "docblock"
-            ]
-        },
-        {
-            "name": "doctrine/cache",
-            "version": "v1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/cache.git",
-                "reference": "v1.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/doctrine/cache/archive/v1.0.zip",
-                "reference": "v1.0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "time": "2013-01-10 22:43:46",
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Cache\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com",
-                    "homepage": "http://www.jwage.com/"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com",
-                    "homepage": "http://www.instaclick.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
-                }
-            ],
-            "description": "Caching library offering an object-oriented API for many cache backends",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "cache",
-                "caching"
-            ]
-        },
-        {
-            "name": "doctrine/collections",
-            "version": "v1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/collections.git",
-                "reference": "v1.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/doctrine/collections/archive/v1.0.zip",
-                "reference": "v1.0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "time": "2013-01-12 16:36:50",
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Collections\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com",
-                    "homepage": "http://www.jwage.com/"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com",
-                    "homepage": "http://www.instaclick.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
-                }
-            ],
-            "description": "Collections Abstraction library",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "collections",
-                "iterator",
-                "array"
-            ]
-        },
-        {
-            "name": "doctrine/common",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/common",
-                "reference": "f0b548aa55bb7dac36d79061270a085dd38635b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/doctrine/common/archive/a5482b347530bb8522e355b399e5ff4983433a40.zip",
-                "reference": "a5482b347530bb8522e355b399e5ff4983433a40",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2",
-                "doctrine/inflector": "1.*",
-                "doctrine/cache": "1.*",
-                "doctrine/collections": "1.*",
-                "doctrine/lexer": "1.*",
-                "doctrine/annotations": "1.*"
-            },
-            "time": "2012-06-18 14:14:07",
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com",
-                    "homepage": "http://www.jwage.com/"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com",
-                    "homepage": "http://www.instaclick.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
-                }
-            ],
-            "description": "Common Library for Doctrine projects",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "collections",
-                "spl",
-                "eventmanager",
-                "annotations",
-                "persistence"
-            ]
-        },
-        {
-            "name": "doctrine/inflector",
-            "version": "v1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "v1.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/doctrine/inflector/archive/v1.0.zip",
-                "reference": "v1.0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "time": "2013-01-10 21:49:15",
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Inflector\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com",
-                    "homepage": "http://www.jwage.com/"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com",
-                    "homepage": "http://www.instaclick.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
-                }
-            ],
-            "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "string",
-                "inflection",
-                "singuarlize",
-                "pluarlize"
-            ]
-        },
-        {
-            "name": "doctrine/lexer",
-            "version": "v1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "v1.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/doctrine/lexer/archive/v1.0.zip",
-                "reference": "v1.0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "time": "2013-01-12 18:59:04",
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Lexer\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com",
-                    "homepage": "http://www.instaclick.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
-                    "role": "Developer of wrapped JMSSerializerBundle"
-                }
-            ],
-            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "parser",
-                "lexer"
-            ]
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "microsoft/windowsazure",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/WindowsAzure/azure-sdk-for-php",
-                "reference": "d8daa05ad1852e0c70a85d15a6db88f7e3b23405"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/WindowsAzure/azure-sdk-for-php/archive/d8daa05ad1852e0c70a85d15a6db88f7e3b23405.zip",
-                "reference": "d8daa05ad1852e0c70a85d15a6db88f7e3b23405",
-                "shasum": ""
-            },
-            "require": {
-                "pear-pear/http_request2": "*",
-                "pear-pear/mail_mime": "*",
-                "pear-pear/mail_mimedecode": "*"
-            },
-            "time": "2012-12-17 23:41:42",
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "WindowsAzure\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Azure PHP SDK",
-                    "email": "azurephpsdk@microsoft.com"
-                }
-            ],
-            "description": "This project provides a set of PHP client libraries that make it easy to access Windows Azure tables, blobs, queues, service runtime and service management APIs.",
-            "keywords": [
-                "php",
-                "sdk",
-                "azure"
-            ]
-        },
-        {
-            "name": "pear-pear.php.net/Archive_Tar",
-            "version": "1.3.10",
-            "dist": {
-                "type": "file",
-                "url": "http://pear.php.net/get/Archive_Tar-1.3.10.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=4.3.0.0"
-            },
-            "replace": {
-                "pear-pear/archive_tar": "== 1.3.10.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
-            },
-            "include-path": [
-                "/"
-            ],
-            "description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded."
-        },
-        {
-            "name": "pear-pear.php.net/Console_Getopt",
-            "version": "1.3.1",
-            "dist": {
-                "type": "file",
-                "url": "http://pear.php.net/get/Console_Getopt-1.3.1.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=4.3.0.0"
-            },
-            "replace": {
-                "pear-pear/console_getopt": "== 1.3.1.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
-            },
-            "include-path": [
-                "/"
-            ],
-            "description": "This is a PHP implementation of "getopt" supporting both\nshort and long options."
-        },
-        {
-            "name": "pear-pear.php.net/HTTP_Request2",
-            "version": "2.1.1",
-            "dist": {
-                "type": "file",
-                "url": "http://pear.php.net/get/HTTP_Request2-2.1.1.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=5.2.0.0",
-                "pear-pear.php.net/net_url2": ">=2.0.0.0",
-                "pear-pear.php.net/pear": ">=1.9.2.0"
-            },
-            "replace": {
-                "pear-pear/http_request2": "== 2.1.1.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
-            },
-            "include-path": [
-                "/"
-            ],
-            "description": "PHP5 rewrite of HTTP_Request package (with parts of HTTP_Client). Provides\ncleaner API and pluggable Adapters:\n  * Socket adapter, based on old HTTP_Request code,\n  * Curl adapter, wraps around PHP's cURL extension,\n  * Mock adapter, to use for testing packages dependent on HTTP_Request2.\nSupports POST requests with data and file uploads, basic and digest\nauthentication, cookies, managing cookies across requests, proxies, gzip and\ndeflate encodings, redirects, monitoring the request progress with Observers..."
-        },
-        {
-            "name": "pear-pear.php.net/Mail_Mime",
-            "version": "1.8.7",
-            "dist": {
-                "type": "file",
-                "url": "http://pear.php.net/get/Mail_Mime-1.8.7.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=4.3.0.0"
-            },
-            "replace": {
-                "pear-pear/mail_mime": "== 1.8.7.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
-            },
-            "include-path": [
-                "/"
-            ],
-            "description": "Mail_Mime provides classes to deal with the creation and manipulation of MIME messages.\nIt allows people to create e-mail messages consisting of:\n* Text Parts\n* HTML Parts\n* Inline HTML Images\n* Attachments\n* Attached messages\n\nIt supports big messages, base64 and quoted-printable encodings and\nnon-ASCII characters in filenames, subjects, recipients, etc. encoded\nusing RFC2047 and/or RFC2231."
-        },
-        {
-            "name": "pear-pear.php.net/Mail_mimeDecode",
-            "version": "1.5.5",
-            "dist": {
-                "type": "file",
-                "url": "http://pear.php.net/get/Mail_mimeDecode-1.5.5.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=4.3.0.0",
-                "pear-pear.php.net/mail_mime": ">1.4.0.0"
-            },
-            "replace": {
-                "pear-pear/mail_mimedecode": "== 1.5.5.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
-            },
-            "include-path": [
-                "/"
-            ],
-            "description": "Provides a class to deal with the decoding and interpreting of mime messages.\n This package used to be part of the Mail_Mime package, but has been split off."
-        },
-        {
-            "name": "pear-pear.php.net/Net_URL2",
-            "version": "2.0.0",
-            "dist": {
-                "type": "file",
-                "url": "http://pear.php.net/get/Net_URL2-2.0.0.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=5.0.0.0"
-            },
-            "replace": {
-                "pear-pear/net_url2": "== 2.0.0.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
-            },
-            "include-path": [
-                "/"
-            ],
-            "description": "Provides parsing of URLs into their constituent parts (scheme, host, path etc.), URL generation, and resolving of relative URLs."
-        },
-        {
-            "name": "pear-pear.php.net/PEAR",
-            "version": "1.9.4",
-            "dist": {
-                "type": "file",
-                "url": "http://pear.php.net/get/PEAR-1.9.4.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=4.4.0.0,!=5.0.0.0,!=5.1.0.0,!=5.1.1.0,!=5.1.2.0,!=5.1.3.0,!=5.1.4.0,!=5.1.5.0",
-                "pear-pear.php.net/archive_tar": ">=1.3.7.0",
-                "pear-pear.php.net/structures_graph": ">=1.0.2.0",
-                "pear-pear.php.net/console_getopt": ">=1.2.0.0",
-                "pear-pear.php.net/xml_util": ">=1.2.0.0",
-                "ext-xml": "*",
-                "ext-pcre": "*"
-            },
-            "conflict": {
-                "pear-pear.php.net/pear_frontend_web": "<=0.4.0.0",
-                "pear-pear.php.net/pear_frontend_gtk": "<0.4.0.0"
-            },
-            "replace": {
-                "pear-pear/pear": "== 1.9.4.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
-            },
-            "include-path": [
-                "/"
-            ],
-            "description": "The PEAR package contains:\n * the PEAR installer, for creating, distributing\n   and installing packages\n * the PEAR_Exception PHP5 error handling mechanism\n * the PEAR_ErrorStack advanced error handling mechanism\n * the PEAR_Error error handling mechanism\n * the OS_Guess class for retrieving info about the OS\n   where PHP is running on\n * the System class for quick handling of common operations\n   with files and directories\n * the PEAR base class\n  Features in a nutshell:\n  * full support for channels\n  * pre-download dependency validation\n  * new package.xml 2.0 format allows tremendous flexibility while maintaining BC\n  * support for optional dependency groups and limited support for sub-packaging\n  * robust dependency support\n  * full dependency validation on uninstall\n  * remote install for hosts with only ftp access - no more problems with\n    restricted host installation\n  * full support for mirroring\n  * support for bundling several packages into a single tarball\n  * support for static dependencies on a url-based package\n  * support for custom file roles and installation tasks"
-        },
-        {
-            "name": "pear-pear.php.net/Structures_Graph",
-            "version": "1.0.4",
-            "dist": {
-                "type": "file",
-                "url": "http://pear.php.net/get/Structures_Graph-1.0.4.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=4.2.0.0"
-            },
-            "replace": {
-                "pear-pear/structures_graph": "== 1.0.4.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
-            },
-            "include-path": [
-                "/"
-            ],
-            "description": "Structures_Graph is a package for creating and manipulating graph datastructures. It allows building of directed\nand undirected graphs, with data and metadata stored in nodes. The library provides functions for graph traversing\nas well as for characteristic extraction from the graph topology."
-        },
-        {
-            "name": "pear-pear.php.net/XML_Util",
-            "version": "1.2.1",
-            "dist": {
-                "type": "file",
-                "url": "http://pear.php.net/get/XML_Util-1.2.1.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=4.3.0.0",
-                "ext-pcre": "*"
-            },
-            "replace": {
-                "pear-pear/xml_util": "== 1.2.1.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
-            },
-            "include-path": [
-                "/"
-            ],
-            "description": "Selection of methods that are often needed when working with XML documents.  Functionality includes creating of attribute lists from arrays, creation of tags, validation of XML names and more."
-        },
-        {
-            "name": "riak/riak-client",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nacmartin/riak-client",
-                "reference": "cea446f04d759caaef44020a2064a38b41cbdfab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/nacmartin/riak-client/archive/cea446f04d759caaef44020a2064a38b41cbdfab.zip",
-                "reference": "cea446f04d759caaef44020a2064a38b41cbdfab",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "time": "2012-04-29 11:47:45",
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Riak": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache 2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Nacho Martín",
-                    "email": "nitram.ohcan@gmail.com"
-                },
-                {
-                    "name": "Kevin Burns"
-                },
-                {
-                    "name": "Jeffrey Massung"
-                },
-                {
-                    "name": "Mark Phillips"
-                },
-                {
-                    "name": "Bryank Fink"
-                },
-                {
-                    "name": "Abel Perez"
-                },
-                {
-                    "name": "Scoyy Lystig Fritchie"
-                },
-                {
-                    "name": "Jon Meredith"
-                },
-                {
-                    "name": "dreverri"
-                },
-                {
-                    "name": "fakepop"
-                }
-            ],
-            "description": "Riak client",
-            "homepage": "http://wiki.basho.com/Riak.html",
-            "keywords": [
-                "persistence",
-                "riak"
-            ]
-        }
-    ],
-    "aliases": [
-
-    ],
-    "minimum-stability": "stable",
-    "stability-flags": {
-        "riak/riak-client": 20,
-        "microsoft/windowsazure": 20
-    }
-}

docs/index.rst

@@ -8,10 +8,12 @@ databases are exchangeable, when working on a CRUD level.
 For some databases range queries are also supported that allow
 you to do range queries with parititioning.
 
-Contents:
-
-.. toctree::
-   :maxdepth: 2
-
-    reference/configuration
+Contents
+--------
 
+* :doc:`Configuration <reference/configuration>`
+* :doc:`Basic Usage <reference/basic-usage>`
+* **Mapping Drivers**:
+  :doc:`Docblock Annotations <reference/annotations-reference>` |
+  :doc:`XML <reference/xml-mapping>` |
+  :doc:`YAML <reference/yaml-mapping>`

docs/reference/annotations-reference.rst

@@ -0,0 +1,86 @@
+Annotations Reference
+=====================
+
+Index
+-----
+
+-  :ref:`@Entity <annref_entity>`
+-  :ref:`@Id <annref_id>`
+-  :ref:`@Transient <annref_transient>`
+
+Reference
+---------
+
+.. _annref_entity:
+
+@Entity
+~~~~~~~
+
+Required annotation to mark a PHP class as an entity. Doctrine manages
+the persistence of all classes marked as entities.
+
+Optional attributes:
+
+
+-  **storageName**: Specifies the storage name used to prevent conflicts.
+
+Example:
+
+.. code-block:: php
+
+    <?php
+    /**
+     * @Entity(storageName="admin")
+     */
+    class User
+    {
+        //...
+    }
+
+.. _annref_id:
+
+@Id
+~~~~~~~
+
+This annotation marks the identifier used to store the entity.
+More properties can be marked with this annotation, but at least one
+property has to be @Id.
+
+Example:
+
+.. code-block:: php
+
+    <?php
+    /**
+     * @Entity
+     */
+    class User
+    {
+    	/**
+    	 * @Id
+    	 */
+        private $username;
+    }
+
+.. _annref_transient:
+
+@Transient
+~~~~~~~
+
+This annotation is used to prevent the property to be stored.
+
+Example:
+
+.. code-block:: php
+
+    <?php
+    /**
+     * @Entity
+     */
+    class User
+    {
+    	/**
+    	 * @Transient
+    	 */
+        private $temporaryData;
+    }

docs/reference/basic-usage.rst

@@ -0,0 +1,127 @@
+Basic Usage
+===========
+
+Requirements
+------------
+
+This guide covers getting started with the Doctrine Key Value Store.
+
+To use the KeyValueStore you actually need:
+
+- PHP 5.6 or above
+- Composer Package Manager (`Install Composer
+  <http://getcomposer.org/doc/00-intro.md>`_)
+
+Installation
+------------
+
+To install the KeyValueStore in your project just run the Composer command:
+
+..
+
+    $ composer require doctrine/key-value-store
+
+or add it to your composer.json file with:
+
+..
+
+    {
+        "require": {
+            "doctrine/key-value-store": "^1.0"
+        }
+    }
+
+Usage Examples
+--------------
+
+In the guide examples we suppose to track e-mail campaigns
+based on campaign id and recipients.
+
+.. code-block:: php
+
+    <?php
+
+    use Doctrine\KeyValueStore\Mapping\Annotations as KeyValue;
+
+    /**
+     * @KeyValue\Entity(storageName="responses")
+     */
+    class Response
+    {
+        const RECEIVE = 0;
+        const OPEN = 10;
+        const CLICK = 20;
+        const ACTION = 30;
+
+        /**
+         * @KeyValue\Id
+         */
+        private $campaign;
+
+        /**
+         * @KeyValue\Id
+         */
+        private $recipient;
+
+        private $status;
+        private $date;
+
+        public function __construct($campaign, $recipient, $status)
+        {
+            $this->campaign = $campaign;
+            $this->recipient = $recipient;
+            $this->status = $status;
+        }
+    }
+
+Create
+------
+
+.. code-block:: php
+
+    <?php
+    $response = new Response(
+        '1234',
+        'kontakt@beberlei.de',
+        Response::RECEIVE
+    );
+
+    $entityManager->persist($response);
+    // persists as much as you can
+
+    $entityManager->flush();
+
+Read
+----
+
+.. code-block:: php
+
+    <?php
+    $response = $entityManager->find(
+        'Response',
+        array(
+            'campaign' => '1234',
+            'recipient' => 'kontakt@beberlei.de',
+        )
+    );
+
+Update
+------
+
+Same as create, just reuse the same id.
+
+Delete
+------
+
+.. code-block:: php
+
+    <?php
+    $response = $entityManager->find(
+        'Response',
+        array(
+            '1234',
+            'kontakt@beberlei.de',
+        )
+    );
+    $entityManager->remove($response);
+    $entityManager->flush();

docs/reference/configuration.rst

@@ -12,10 +12,11 @@ Mapping Configuration
 .. code-block:: php
 
     <?php
+
+    use Doctrine\Common\Annotations\AnnotationReader;
+    use Doctrine\Common\Cache\ArrayCache;
     use Doctrine\KeyValueStore\Configuration;
     use Doctrine\KeyValueStore\Mapping\AnnotationDriver;
-    use Doctrine\Common\Cache\ArrayCache;
-    use Doctrine\Common\Annotations\AnnotationReader;
 
     // 1. create Configuration instance
     $config = new Configuration();
@@ -51,23 +52,39 @@ database backends, you have to configure the actual storage you want to use.
 This configuration is obviously specific to all the different storage drivers.
 So far the following drivers exist (and are documented here):
 
+* PHP Array
 * Doctrine Cache Backend
 * SQL Backend with Doctrine DBAL
 * Microsoft Windows Azure Table
 * Couchbase
+* CouchDB
+* DynamoDB
 * MongoDB
 * Riak
 
 Also all those storage backends obviously have different dependencies in terms
 of PHP libraries or PHP PECL extensions.
 
+PHP Array
+---------
+
+PHP array is used mainly for development and teesting purposes.
+
+.. code-block:: php
+
+   <?php
+
+   use Doctrine\KeyValueStore\Storage\ArrayStorage;
+
+   $storage = new ArrayStorage();
+
 Doctrine Cache Backend
-^^^^^^^^^^^^^^^^^^^^^^
+----------------------
 
 The Doctrine Cache Backend uses the `Caching Framework
 <https://github.com/doctrine/cache>`_ from Doctrine as a backend. Depending on
 the cache driver you get a persistent or in-memory key value store with this
-solution. See the `Doctrine Common documentation 
+solution. See the `Doctrine Common documentation
 <http://docs.doctrine-project.org/projects/doctrine-common/en/latest/reference/caching.html>`_
 for more details about the different supported drivers.
 
@@ -76,6 +93,7 @@ Here is an example of configurating the Cache Storage using Redis:
 .. code-block:: php
 
    <?php
+
    use Doctrine\Common\Cache\RedisCache;
    use Doctrine\KeyValueStore\Storage\DoctrineCacheStorage;
    use Redis;
@@ -86,7 +104,7 @@ Here is an example of configurating the Cache Storage using Redis:
    $storage = new DoctrineCacheStorage($cache);
 
 Doctrine DBAL Backend
-^^^^^^^^^^^^^^^^^^^^^
+---------------------
 
 You can use a relational database as backend. It uses a very simple
 table as storage with one primary key and a blob field that stores
@@ -95,8 +113,9 @@ the properties.
 .. code-block:: php
 
     <?php
-    use Doctrine\KeyValueStore\Storage\DBALStorage;
+
     use Doctrine\DBAL\DriverManager;
+    use Doctrine\KeyValueStore\Storage\DBALStorage;
 
     $tableName = 'storage';
     $keyColumn = 'id';
@@ -108,7 +127,7 @@ the properties.
     $storage = new DBALStorage($conn, $tableName, $keyColumn, $dataColumn);
 
 Microsoft Windows Azure Table
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+-----------------------------
 
 Microsoft offers a NoSQL solution as part of their `Windows Azure
 <http://www.windowsazure.com/en-us/>`_ service. You can use that
@@ -117,26 +136,116 @@ as a storage layer through the Windows Azure PHP SDK:
 .. code-block:: php
 
    <?php
+
    use Doctrine\KeyValueStore\Storage\AzureSdkTableStorage;
    use WindowsAzure\Common\ServicesBuilder;
 
-   $connectionString = ""; // Windows Azure Connection string
+   $connectionString = ''; // Windows Azure Connection string
    $builder = ServicesBuilder::getInstance();
    $client = $builder->createTableService($connectionString);
 
    $storage = new AzureSdkTableStorage($client);
 
-Couchbase
-^^^^^^^^^
+Cassandra
+---------
 
-To be written
+Cassandra is supported through the `PECL extension <https://pecl.php.net/package/cassandra>`_
+and the `DataStax PHP driver <https://github.com/datastax/php-driver>`_:
+
+.. code-block:: php
+
+    <?php
+
+    use Cassandra;
+    use Cassandra\SimpleStatement;
+    use Doctrine\KeyValueStore\Storage\CassandraStorage;
+
+    $cluster = Cassandra::cluster()->build();
+    $session = $cluster->connect();
+    $session->execute(new SimpleStatement('USE doctrine'));
+
+    $storage = new CassandraStorage($session);
+
+Couchbase
+---------
+
+Until the version 1.2 also Couchbase is supported:
+
+.. code-block:: php
+
+    <?php
+
+    use Doctrine\KeyValueStore\Storage\CouchbaseStorage;
+
+    $conn = new Couchbase(/* connection parameters */);
+
+    $storage = new CouchbaseStorage($conn);
+
+CouchDB
+-------
+
+CouchDB storage setup based on `doctrine/couchdb-client <https://github.com/doctrine/couchdb-client>`_:
+
+.. code-block:: php
+
+    <?php
+
+    use Doctrine\CouchDB\CouchDBClient;
+    use Doctrine\KeyValueStore\Storage\CouchDbStorage;
+
+    $client = CouchDBClient::create(array(
+        'dbname' => 'doctrine_example',
+    ));
+
+    $storage = new CouchDbStorage($client);
+
+DynamoDb
+---------
+
+DynamoDb is supported through the `AWS SDK for PHP <https://aws.amazon.com/sdk-for-php/>`_
+Create your tables via the AWS DynamoDb console or using the `PHP based API <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/LowLevelPHPTableOperationsExample.html>`_
+See the `AWS docs <http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/UsingPHP.html#PHPSDKCredentialsSet>`_ for more information on configuring credentials for the client.
+
+.. code-block:: php
+
+    <?php
+
+    $client = DynamoDbClient::factory([...])
+
+    $storage = new DynamoDbStorage($client);
 
 MongoDB
-^^^^^^^
+-------
 
-To be written
+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.
+
+.. code-block:: php
+
+    <?php
+
+    use MongoDB\Client;
+    use Doctrine\KeyValueStore\Storage\MongoDbStorage;
+
+    $client = new Client(/* connection parameters and options */);
+
+    $storage = new MongoDbStorage($client->your_database);
 
 Riak
-^^^^
+----
 
-to be written
+Riak support is provided through the library `php-riak/riak-client <https://github.com/php-riak/riak-client>`_ :
+
+.. code-block:: php
+
+    <?php
+
+    use Doctrine\KeyValueStore\Storage\RiakStorage;
+    use Riak\Client\RiakClientBuilder;
+
+    $conn = (new RiakClientBuilder())
+        ->withNodeUri(/* connection DNS */)
+        ->build();
+
+    $storage = new RiakStorage($conn);

docs/reference/xml-mapping.rst

@@ -0,0 +1,40 @@
+XML Mapping
+===========
+
+To use the XML driver you must configure the directory where XML mappings are
+located:
+
+.. code-block:: php
+
+    <?php
+
+    use Doctrine\Common\Cache\ArrayCache;
+    use Doctrine\KeyValueStore\Configuration;
+    use Doctrine\KeyValueStore\EntityManager;
+    use Doctrine\KeyValueStore\Mapping\XmlDriver;
+
+    $cache = new ArrayCache;
+    $metadata = new XmlDriver('/path/to/xml/mappings');
+    $storage = // your preferred storage
+
+    $config = new Configuration();
+    $config->setMappingDriverImpl($metadata);
+    $config->setMetadataCache($cache);
+
+    return new EntityManager($storage, $config);
+
+Example
+-------
+
+.. code-block:: xml
+
+    // App.Doctrine.KeyValueStore.User.dcm.xml
+    <?xml version="1.0" encoding="UTF-8"?>
+    <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                              http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+        <entity name="App\Doctrine\KeyValueStore\User" storage-name="users">
+            <id>id</id>
+        </entity>
+    </doctrine-mapping>

docs/reference/yaml-mapping.rst

@@ -0,0 +1,35 @@
+YAML Mapping
+============
+
+To use the YAML driver you must configure the directory where YAML mappings are
+located:
+
+.. code-block:: php
+
+    <?php
+
+    use Doctrine\Common\Cache\ArrayCache;
+    use Doctrine\KeyValueStore\Configuration;
+    use Doctrine\KeyValueStore\EntityManager;
+    use Doctrine\KeyValueStore\Mapping\YamlDriver;
+
+    $cache = new ArrayCache;
+    $metadata = new YamlDriver('/path/to/yaml/mappings');
+    $storage = // your preferred storage
+
+    $config = new Configuration();
+    $config->setMappingDriverImpl($metadata);
+    $config->setMetadataCache($cache);
+
+    return new EntityManager($storage, $config);
+
+Example
+-------
+
+.. code-block:: yaml
+
+    # App.Doctrine.KeyValueStore.User.dcm.xml
+    App\Doctrine\KeyValueStore\User:
+      storageName: users
+      id:
+      - id

lib/Doctrine/KeyValueStore/Configuration.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -19,9 +20,9 @@
 
 namespace Doctrine\KeyValueStore;
 
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
-use Doctrine\Common\Cache\Cache;
 use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\Common\Cache\Cache;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\KeyValueStore\Id\IdConverterStrategy;
 use Doctrine\KeyValueStore\Id\NullIdConverter;
 
@@ -44,7 +45,7 @@ class Configuration
      */
     public function getMappingDriverImpl()
     {
-        if ( ! isset($this->config['mappingDriver'])) {
+        if (! isset($this->config['mappingDriver'])) {
             throw KeyValueStoreException::mappingDriverMissing();
         }
 
@@ -55,6 +56,7 @@ class Configuration
      * Set the mapping driver implementation.
      *
      * @param \Doctrine\Common\Persistence\Mapping\Driver\MappingDriver $driver
+     *
      * @return \Doctrine\KeyValueStore\Configuration
      */
     public function setMappingDriverImpl(MappingDriver $driver)
@@ -67,6 +69,7 @@ class Configuration
      * Set the Metadata Mapping cache used with this configuration.
      *
      * @param \Doctrine\Common\Cache\Cache $cache
+     *
      * @return \Doctrine\KeyValueStore\Configuration
      */
     public function setMetadataCache(Cache $cache)
@@ -82,7 +85,7 @@ class Configuration
      */
     public function getMetadataCache()
     {
-        if ( ! isset($this->config['metadataCache'])) {
+        if (! isset($this->config['metadataCache'])) {
             $this->config['metadataCache'] = new ArrayCache();
         }
 
@@ -93,6 +96,7 @@ class Configuration
      * Set the ID Converter Strategy
      *
      * @param \Doctrine\KeyValueStore\Id\IdConverterStrategy
+     *
      * @return \Doctrine\KeyValueStore\Configuration
      */
     public function setIdConverterStrategy(IdConverterStrategy $strategy)
@@ -108,11 +112,10 @@ class Configuration
      */
     public function getIdConverterStrategy()
     {
-        if ( ! isset($this->config['idConverter'])) {
+        if (! isset($this->config['idConverter'])) {
             $this->config['idConverter'] = new NullIdConverter();
         }
 
         return $this->config['idConverter'];
     }
 }
-

lib/Doctrine/KeyValueStore/EntityManager.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -19,9 +20,9 @@
 
 namespace Doctrine\KeyValueStore;
 
-use Doctrine\KeyValueStore\Storage\Storage;
 use Doctrine\KeyValueStore\Mapping\ClassMetadataFactory;
 use Doctrine\KeyValueStore\Query\RangeQuery;
+use Doctrine\KeyValueStore\Storage\Storage;
 
 /**
  * EntityManager for KeyValue stored objects.
@@ -43,7 +44,7 @@ class EntityManager
     /**
      * Create a new EntityManager
      *
-     * @param Storage $storageDriver
+     * @param Storage       $storageDriver
      * @param Configuration $config
      */
     public function __construct(Storage $storageDriver, Configuration $config)
@@ -58,13 +59,14 @@ class EntityManager
     /**
      * Find objects by key
      *
-     * @param string $className
+     * @param string       $className
      * @param string|array $key
+     *
      * @return object
      */
     public function find($className, $key)
     {
-        return $this->unitOfWork->reconsititute($className, $key);
+        return $this->unitOfWork->reconstititute($className, $key);
     }
 
     /**
@@ -76,6 +78,7 @@ class EntityManager
      *
      * @param string $className
      * @param string $partitionKey
+     *
      * @return \Doctrine\KeyValueStore\Query\RangeQuery
      */
     public function createRangeQuery($className, $partitionKey)
@@ -87,7 +90,6 @@ class EntityManager
      * Persist new object in key value storage.
      *
      * @param object $object
-     * @return void
      */
     public function persist($object)
     {
@@ -98,7 +100,6 @@ class EntityManager
      * Remove object
      *
      * @param object $object
-     * @return void
      */
     public function remove($object)
     {
@@ -108,8 +109,6 @@ class EntityManager
     /**
      * Flush all outstanding changes from the managed object-graph into the
      * key-value storage.
-     *
-     * @return void
      */
     public function flush()
     {
@@ -139,6 +138,7 @@ class EntityManager
 
     /**
      * @param string $className
+     *
      * @return Mapping\ClassMetadata
      */
     public function getClassMetadata($className)
@@ -146,4 +146,3 @@ class EntityManager
         return $this->unitOfWork->getClassMetadata($className);
     }
 }
-

lib/Doctrine/KeyValueStore/Http/Client.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -23,18 +24,20 @@ namespace Doctrine\KeyValueStore\Http;
  * Yet another HTTP client
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
+ *
+ * @deprecated This class is deprecated and will be removed in 2.0.
  */
 interface Client
 {
     /**
      * Send HTTP Request
      *
-     * @param string $method
-     * @param string $url
+     * @param string      $method
+     * @param string      $url
      * @param string|null $body
-     * @param array $headers
+     * @param array       $headers
+     *
      * @return Response
      */
-    function request($method, $url, $body = null, array $headers = array());
+    public function request($method, $url, $body = null, array $headers = []);
 }
-

lib/Doctrine/KeyValueStore/Http/Response.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -16,12 +17,15 @@
  * and is licensed under the MIT license. For more information, see
  * <http://www.doctrine-project.org>.
  */
+
 namespace Doctrine\KeyValueStore\Http;
 
 /**
  * HTTP Response
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
+ *
+ * @deprecated This class is deprecated and will be removed in 2.0.
  */
 class Response
 {
@@ -29,12 +33,12 @@ class Response
 
     private $body;
 
-    private $headers = array();
+    private $headers = [];
 
     public function __construct($code, $body, array $headers)
     {
-        $this->code = $code;
-        $this->body = $body;
+        $this->code    = $code;
+        $this->body    = $body;
         $this->headers = $headers;
     }
 
@@ -62,14 +66,14 @@ class Response
      * Get HTTP Response header
      *
      * @param string $name
+     *
      * @return null|string|array
      */
     public function getHeader($name)
     {
-        if ( ! isset($this->headers[$name])) {
-            return null;
+        if (! isset($this->headers[$name])) {
+            return;
         }
         return $this->headers[$name];
     }
 }
-

lib/Doctrine/KeyValueStore/Http/SocketClient.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -25,9 +26,13 @@ namespace Doctrine\KeyValueStore\Http;
  * extension dependencies.
  *
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ *
  * @link        www.doctrine-project.com
  * @since       1.0
+ *
  * @author      Kore Nordmann <kore@arbitracker.org>
+ *
+ * @deprecated  This class is deprecated and will be removed in 2.0.
  */
 class SocketClient implements Client
 {
@@ -42,11 +47,11 @@ class SocketClient implements Client
     /**
      * @var array
      */
-    private $options = array(
+    private $options = [
         'keep-alive' => true,
-    );
+    ];
 
-    public function __construct(array $options = array())
+    public function __construct(array $options = [])
     {
         $this->options = array_merge($this->options, $options);
     }
@@ -56,21 +61,18 @@ class SocketClient implements Client
      *
      * Checks if the connection already has been established, or tries to
      * establish the connection, if not done yet.
-     *
-     * @return void
      */
     protected function checkConnection($host, $port)
     {
-        $host = ($port == 443) ? "ssl://" . $host : "tcp://" . $host;
+        $host = ($port == 443) ? 'ssl://' . $host : 'tcp://' . $host;
 
         // If the connection could not be established, fsockopen sadly does not
         // only return false (as documented), but also always issues a warning.
-        if ( ( $this->connection === null ) &&
-             ( ( $this->connection = @stream_socket_client($host . ":" . $port, $errno, $errstr ) ) === false ) )
-        {
+        if (($this->connection === null) &&
+            (($this->connection = @stream_socket_client($host . ':' . $port, $errno, $errstr)) === false)) {
             // This is a bit hackisch...
             $this->connection = null;
-            throw new \RuntimeException("fail");
+            throw new \RuntimeException('fail');
         }
     }
 
@@ -82,13 +84,14 @@ class SocketClient implements Client
      * @param string $method
      * @param string $path
      * @param string $data
+     *
      * @return string
      */
-    protected function buildRequest($method, $url, $data, $headers )
+    protected function buildRequest($method, $url, $data, $headers)
     {
         $parts = parse_url($url);
-        $host = $parts['host'];
-        $path = $parts['path'];
+        $host  = $parts['host'];
+        $path  = $parts['path'];
 
         // Create basic request headers
         $request = "$method $path HTTP/1.1\r\nHost: {$host}\r\n";
@@ -96,17 +99,17 @@ class SocketClient implements Client
         // Set keep-alive header, which helps to keep to connection
         // initilization costs low, especially when the database server is not
         // available in the locale net.
-        $request .= "Connection: " . ( $this->options['keep-alive'] ? 'Keep-Alive' : 'Close' ) . "\r\n";
+        $request .= 'Connection: ' . ($this->options['keep-alive'] ? 'Keep-Alive' : 'Close') . "\r\n";
 
         // Also add headers and request body if data should be sent to the
         // server. Otherwise just add the closing mark for the header section
         // of the request.
         foreach ($headers as $name => $header) {
-            $request .= $name . ": " . $header . "\r\n";
+            $request .= $name . ': ' . $header . "\r\n";
         }
         $request = rtrim($request) . "\r\n\r\n";
 
-        if ( $data !== null ) {
+        if ($data !== null) {
             $request .= $data;
         }
 
@@ -124,40 +127,44 @@ class SocketClient implements Client
      * @param string $method
      * @param string $path
      * @param string $data
-     * @param bool $raw
+     * @param bool   $raw
+     *
      * @return Response
      */
-    public function request($method, $url, $data = null, array $headers = array())
+    public function request($method, $url, $data = null, array $headers = [])
     {
         // Try establishing the connection to the server
         $parts = parse_url($url);
-        $host = $parts['host'];
+        $host  = $parts['host'];
         $this->checkConnection($host, $parts['scheme']=='https' ? 443 : 80);
 
         // Send the build request to the server
-        if ( fwrite( $this->connection, $request = $this->buildRequest( $method, $url, $data, $headers ) ) === false ) {
+        if (fwrite($this->connection, $request = $this->buildRequest($method, $url, $data, $headers)) === false) {
             // Reestablish which seems to have been aborted
             //
             // The recursion in this method might be problematic if the
             // connection establishing mechanism does not correctly throw an
             // exception on failure.
             $this->connection = null;
-            return $this->request( $method, $url, $data, $headers );
+            return $this->request($method, $url, $data, $headers);
         }
 
         // Read server response headers
         $rawHeaders = '';
-        $headers = array(
-            'connection' => ( $this->options['keep-alive'] ? 'Keep-Alive' : 'Close' ),
-        );
+        $headers    = [
+            'connection' => ($this->options['keep-alive'] ? 'Keep-Alive' : 'Close'),
+        ];
 
         // Remove leading newlines, should not accur at all, actually.
-        while ( ( ( $line = fgets( $this->connection ) ) !== false ) &&
-                ( ( $lineContent = rtrim( $line ) ) === '' ) );
+        while (true) {
+            if (! (($line = fgets($this->connection)) !== false) || ! (($lineContent = rtrim($line)) === '')) {
+                break;
+            }
+        }
 
         // Throw exception, if connection has been aborted by the server, and
         // leave handling to the user for now.
-        if ( $line === false ) {
+        if ($line === false) {
             // Reestablish which seems to have been aborted
             //
             // The recursion in this method might be problematic if the
@@ -167,7 +174,7 @@ class SocketClient implements Client
             // An aborted connection seems to happen here on long running
             // requests, which cause a connection timeout at server side.
             $this->connection = null;
-            return $this->request( $method, $url, $data, $raw );
+            return $this->request($method, $url, $data, $raw);
         }
 
         do {
@@ -175,32 +182,29 @@ class SocketClient implements Client
             $rawHeaders .= $lineContent . "\n";
 
             // Extract header values
-            if ( preg_match( '(^HTTP/(?P<version>\d+\.\d+)\s+(?P<status>\d+))S', $lineContent, $match ) )
-            {
+            if (preg_match('(^HTTP/(?P<version>\d+\.\d+)\s+(?P<status>\d+))S', $lineContent, $match)) {
                 $headers['version'] = $match['version'];
                 $headers['status']  = (int) $match['status'];
+            } else {
+                list($key, $value)         = explode(':', $lineContent, 2);
+                $headers[strtolower($key)] = ltrim($value);
             }
-            else
-            {
-                list( $key, $value ) = explode( ':', $lineContent, 2 );
-                $headers[strtolower( $key )] = ltrim( $value );
-            }
-        }  while ( ( ( $line = fgets( $this->connection ) ) !== false ) &&
-                   ( ( $lineContent = rtrim( $line ) ) !== '' ) );
+        } while ((($line = fgets($this->connection)) !== false) &&
+                   (($lineContent = rtrim($line)) !== ''));
 
         // Read response body
         $body = '';
-        if ( !isset( $headers['transfer-encoding'] ) ||
-             ( $headers['transfer-encoding'] !== 'chunked' ) ) {
+        if (! isset($headers['transfer-encoding']) ||
+             ($headers['transfer-encoding'] !== 'chunked')) {
             // HTTP 1.1 supports chunked transfer encoding, if the according
             // header is not set, just read the specified amount of bytes.
-            $bytesToRead = (int) ( isset( $headers['content-length'] ) ? $headers['content-length'] : 0 );
+            $bytesToRead = (int) (isset($headers['content-length']) ? $headers['content-length'] : 0);
 
             // Read body only as specified by chunk sizes, everything else
             // are just footnotes, which are not relevant for us.
-            while ( $bytesToRead > 0 ) {
-                $body .= $read = fgets( $this->connection, $bytesToRead + 1 );
-                $bytesToRead -= strlen( $read );
+            while ($bytesToRead > 0) {
+                $body .= $read = fgets($this->connection, $bytesToRead + 1);
+                $bytesToRead  -= strlen($read);
             }
         } else {
             // When transfer-encoding=chunked has been specified in the
@@ -208,43 +212,41 @@ class SocketClient implements Client
             // until the server has finished. Ignore all additional HTTP
             // options after that.
             do {
-                $line = rtrim( fgets( $this->connection ) );
+                $line = rtrim(fgets($this->connection));
 
                 // Get bytes to read, with option appending comment
-                if ( preg_match( '(^([0-9a-fA-F]+)(?:;.*)?$)', $line, $match ) ) {
-                    $bytesToRead = hexdec( $match[1] );
+                if (preg_match('(^([0-9a-fA-F]+)(?:;.*)?$)', $line, $match)) {
+                    $bytesToRead = hexdec($match[1]);
 
                     // Read body only as specified by chunk sizes, everything else
                     // are just footnotes, which are not relevant for us.
                     $bytesLeft = $bytesToRead;
-                    while ( $bytesLeft > 0 )
-                    {
-                        $body .= $read = fread( $this->connection, $bytesLeft + 2 );
-                        $bytesLeft -= strlen( $read );
+                    while ($bytesLeft > 0) {
+                        $body .= $read = fread($this->connection, $bytesLeft + 2);
+                        $bytesLeft    -= strlen($read);
                     }
                 }
-            } while ( $bytesToRead > 0 );
+            } while ($bytesToRead > 0);
 
             // Chop off \r\n from the end.
-            $body = substr( $body, 0, -2 );
+            $body = substr($body, 0, -2);
         }
 
         // Reset the connection if the server asks for it.
-        if ( $headers['connection'] !== 'Keep-Alive' ) {
-            fclose( $this->connection );
+        if ($headers['connection'] !== 'Keep-Alive') {
+            fclose($this->connection);
             $this->connection = null;
         }
 
         // Handle some response state as special cases
-        switch ( $headers['status'] ) {
+        switch ($headers['status']) {
             case 301:
             case 302:
             case 303:
             case 307:
-                return $this->request( $method, $headers['location'], $data, $raw );
+                return $this->request($method, $headers['location'], $data, $raw);
         }
 
-        return new Response( $headers['status'], $body, $headers );
+        return new Response($headers['status'], $body, $headers);
     }
 }
-

lib/Doctrine/KeyValueStore/Id/CompositeIdHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -25,15 +26,17 @@ class CompositeIdHandler implements IdHandlingStrategy
 {
     public function normalizeId(ClassMetadata $metadata, $key)
     {
-        if (!$metadata->isCompositeKey && !is_array($key)) {
-            $id = array($metadata->identifier[0] => $key);
-        } else if (!is_array($key)) {
-            throw new \InvalidArgumentException("Array of identifier key-value pairs is expected!");
+        if (! $metadata->isCompositeKey && ! is_array($key)) {
+            $id = [$metadata->identifier[0] => $key];
+        } elseif (! is_array($key)) {
+            throw new \InvalidArgumentException('Array of identifier key-value pairs is expected!');
         } else {
-            $id = array();
+            $id = [];
             foreach ($metadata->identifier as $field) {
-                if (!isset($key[$field])) {
-                    throw new \InvalidArgumentException("Missing identifier field $field in request for the primary key.");
+                if (! isset($key[$field])) {
+                    throw new \InvalidArgumentException(
+                        "Missing identifier field $field in request for the primary key."
+                    );
                 }
                 $id[$field] = $key[$field];
             }
@@ -49,7 +52,6 @@ class CompositeIdHandler implements IdHandlingStrategy
 
     public function hash($key)
     {
-        return implode('__##__', (array)$key);
+        return implode('__##__', (array) $key);
     }
 }
-

lib/Doctrine/KeyValueStore/Id/IdConverterStrategy.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -30,7 +31,6 @@ namespace Doctrine\KeyValueStore\Id;
  */
 interface IdConverterStrategy
 {
-    function serialize($class, $data);
-    function unserialize($class, $data);
+    public function serialize($class, $data);
+    public function unserialize($class, $data);
 }
-

lib/Doctrine/KeyValueStore/Id/IdHandlingStrategy.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -32,26 +33,28 @@ interface IdHandlingStrategy
      * Given an unstructured key format and a class metadata, generate a key.
      *
      * @param ClassMetadata $metadata
-     * @param string|array $key
+     * @param string|array  $key
+     *
      * @return string|array
      */
-    function normalizeId(ClassMetadata $metadata, $key);
+    public function normalizeId(ClassMetadata $metadata, $key);
 
     /**
      * Extract identifier from an object
      *
      * @param ClassMetadata $metadata
-     * @param object $object
+     * @param object        $object
+     *
      * @return string|array
      */
-    function getIdentifier(ClassMetadata $metadata, $object);
+    public function getIdentifier(ClassMetadata $metadata, $object);
 
     /**
      * Given a normalized key, generate a hash version for it.
      *
      * @param array|string $key
+     *
      * @return string
      */
-    function hash($key);
+    public function hash($key);
 }
-

lib/Doctrine/KeyValueStore/Id/NullIdConverter.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -31,4 +32,3 @@ class NullIdConverter implements IdConverterStrategy
         return $data;
     }
 }
-

lib/Doctrine/KeyValueStore/Id/SingleIdHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -44,4 +45,3 @@ class SingleIdHandler implements IdHandlingStrategy
         return $key;
     }
 }
-

lib/Doctrine/KeyValueStore/InvalidArgumentException.php

@@ -0,0 +1,48 @@
+<?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\KeyValueStore;
+
+class InvalidArgumentException extends KeyValueStoreException
+{
+    public static function invalidType($name, $expectedType, &$actual)
+    {
+        return new static(
+            sprintf('The %s must be a %s, got "%s" instead.', $name, $expectedType, gettype($actual)),
+            0
+        );
+    }
+
+    public static function invalidLength($name, $min, $max)
+    {
+        return new static(
+            sprintf('The %s must be at least %d but no more than %d chars.', $name, $min, $max),
+            0
+        );
+    }
+
+    public static function invalidTableName($name)
+    {
+        return new static(
+            sprintf('Invalid table name: %s', $name),
+            0
+        );
+    }
+}

lib/Doctrine/KeyValueStore/KeyValueStoreException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -21,9 +22,8 @@ namespace Doctrine\KeyValueStore;
 
 class KeyValueStoreException extends \Exception
 {
-    static public function mappingDriverMissing()
+    public static function mappingDriverMissing()
     {
-        return new self("No mapping driver was assigned to the configuration. Use \$config->setMappingDriverImpl()");
+        return new self('No mapping driver was assigned to the configuration. Use $config->setMappingDriverImpl()');
     }
 }
-

lib/Doctrine/KeyValueStore/Mapping/AnnotationDriver.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -19,14 +20,25 @@
 
 namespace Doctrine\KeyValueStore\Mapping;
 
+use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 
 class AnnotationDriver implements MappingDriver
 {
+    /**
+     * Doctrine common annotations reader.
+     *
+     * @var AnnotationReader
+     */
     private $reader;
 
-    public function __construct($reader)
+    /**
+     * Constructor with required dependencies.
+     *
+     * @param $reader AnnotationReader Doctrine common annotations reader.
+     */
+    public function __construct(AnnotationReader $reader)
     {
         $this->reader = $reader;
     }
@@ -34,34 +46,40 @@ class AnnotationDriver implements MappingDriver
     /**
      * Loads the metadata for the specified class into the provided container.
      *
-     * @param string $className
+     * @param string        $className
      * @param ClassMetadata $metadata
      */
-    function loadMetadataForClass($className, ClassMetadata $metadata)
+    public function loadMetadataForClass($className, ClassMetadata $metadata)
     {
         $class = $metadata->getReflectionClass();
-        if (!$class) {
+        if (! $class) {
             // this happens when running annotation driver in combination with
             // static reflection services. This is not the nicest fix
             $class = new \ReflectionClass($metadata->name);
         }
 
         $entityAnnot = $this->reader->getClassAnnotation($class, 'Doctrine\KeyValueStore\Mapping\Annotations\Entity');
-        if (!$entityAnnot) {
-            throw new \InvalidArgumentException($metadata->name . " is not a valid key-value-store entity.");
+        if (! $entityAnnot) {
+            throw new \InvalidArgumentException($metadata->name . ' is not a valid key-value-store entity.');
         }
         $metadata->storageName = $entityAnnot->storageName;
 
         // Evaluate annotations on properties/fields
         foreach ($class->getProperties() as $property) {
-            $idAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\KeyValueStore\Mapping\Annotations\Id');
-            $transientAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\KeyValueStore\Mapping\Annotations\Transient');
+            $idAnnot        = $this->reader->getPropertyAnnotation(
+                $property,
+                'Doctrine\KeyValueStore\Mapping\Annotations\Id'
+            );
+            $transientAnnot = $this->reader->getPropertyAnnotation(
+                $property,
+                'Doctrine\KeyValueStore\Mapping\Annotations\Transient'
+            );
             if ($idAnnot) {
                 $metadata->mapIdentifier($property->getName());
-            } else if ($transientAnnot) {
+            } elseif ($transientAnnot) {
                 $metadata->skipTransientField($property->getName());
             } else {
-                $metadata->mapField(array('fieldName' => $property->getName()));
+                $metadata->mapField(['fieldName' => $property->getName()]);
             }
         }
     }
@@ -71,7 +89,7 @@ class AnnotationDriver implements MappingDriver
      *
      * @return array The names of all mapped classes known to this driver.
      */
-    function getAllClassNames()
+    public function getAllClassNames()
     {
     }
 
@@ -81,11 +99,11 @@ class AnnotationDriver implements MappingDriver
      * MappedSuperclass.
      *
      * @param string $className
-     * @return boolean
+     *
+     * @return bool
      */
-    function isTransient($className)
+    public function isTransient($className)
     {
         return false;
     }
 }
-

lib/Doctrine/KeyValueStore/Mapping/Annotations/Entity.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -21,12 +22,12 @@ namespace Doctrine\KeyValueStore\Mapping\Annotations;
 
 /**
  * @Annotation
+ * @Target("CLASS")
  */
-class Entity
+final class Entity
 {
     /**
      * @var string
      */
     public $storageName;
 }
-

lib/Doctrine/KeyValueStore/Mapping/Annotations/Id.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -21,8 +22,8 @@ namespace Doctrine\KeyValueStore\Mapping\Annotations;
 
 /**
  * @Annotation
+ * @Target("PROPERTY")
  */
-class Id
+final class Id
 {
 }
-

lib/Doctrine/KeyValueStore/Mapping/Annotations/Transient.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -21,8 +22,8 @@ namespace Doctrine\KeyValueStore\Mapping\Annotations;
 
 /**
  * @Annotation
+ * @Target("PROPERTY")
  */
-class Transient
+final class Transient
 {
 }
-

lib/Doctrine/KeyValueStore/Mapping/ClassMetadata.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -20,20 +21,21 @@
 namespace Doctrine\KeyValueStore\Mapping;
 
 use Doctrine\Common\Persistence\Mapping\ClassMetadata as BaseClassMetadata;
+use ReflectionClass;
 
 class ClassMetadata implements BaseClassMetadata
 {
     public $name;
     public $storageName;
     public $rootClassName;
-    public $fields = array();
-    public $identifier = array();
-    public $isCompositeKey = false;
-    public $transientFields = array();
-    public $reflFields = array();
+    public $fields          = [];
+    public $identifier      = [];
+    public $isCompositeKey  = false;
+    public $transientFields = [];
+    public $reflFields      = [];
     public $reflClass;
 
-    private $_prototype;
+    private $prototype;
 
     public function __construct($className)
     {
@@ -42,14 +44,14 @@ class ClassMetadata implements BaseClassMetadata
 
     public function mapIdentifier($fieldName)
     {
-        $this->identifier[] = $fieldName;
+        $this->identifier[]   = $fieldName;
         $this->isCompositeKey = count($this->identifier) > 1;
-        $this->mapField(array('fieldName' => $fieldName, 'id' => true));
+        $this->mapField(['fieldName' => $fieldName, 'id' => true]);
     }
 
     public function mapField($mapping)
     {
-        if ( ! isset($this->transientFields[$mapping['fieldName']])) {
+        if (! isset($this->transientFields[$mapping['fieldName']])) {
             $this->fields[$mapping['fieldName']] = $mapping;
         }
     }
@@ -69,21 +71,21 @@ class ClassMetadata implements BaseClassMetadata
      */
     public function newInstance()
     {
-        if ($this->_prototype === null) {
-            $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
+        if ($this->prototype === null) {
+            $this->prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));
         }
 
-        return clone $this->_prototype;
+        return clone $this->prototype;
     }
 
     public function __sleep()
     {
-        return array('fields', 'isCompositeKey', 'identifier', 'name', 'storageName');
+        return ['fields', 'isCompositeKey', 'identifier', 'name', 'storageName'];
     }
 
     public function getIdentifierValues($object)
     {
-        $id = array();
+        $id = [];
         foreach ($this->identifier as $field) {
             $value = $this->reflFields[$field]->getValue($object);
             if ($value !== null) {
@@ -92,12 +94,16 @@ class ClassMetadata implements BaseClassMetadata
         }
         return $id;
     }
+
     /**
      * Get fully-qualified class name of this persistent class.
      *
      * @return string
      */
-    function getName(){}
+    public function getName()
+    {
+        return $this->name;
+    }
 
     /**
      * Gets the mapped identifier field name.
@@ -106,54 +112,80 @@ class ClassMetadata implements BaseClassMetadata
      *
      * @return array
      */
-    function getIdentifier(){}
+    public function getIdentifier()
+    {
+        return $this->identifier;
+    }
 
     /**
      * Gets the ReflectionClass instance for this mapped class.
      *
      * @return ReflectionClass
      */
-    function getReflectionClass(){}
+    public function getReflectionClass()
+    {
+        return new ReflectionClass($this->name);
+    }
 
     /**
      * Checks if the given field name is a mapped identifier for this class.
      *
      * @param string $fieldName
-     * @return boolean
+     *
+     * @return bool
      */
-    function isIdentifier($fieldName){}
+    public function isIdentifier($fieldName)
+    {
+        return in_array($fieldName, $this->identifier);
+    }
 
     /**
      * Checks if the given field is a mapped property for this class.
      *
      * @param string $fieldName
-     * @return boolean
+     *
+     * @return bool
      */
-    function hasField($fieldName){}
+    public function hasField($fieldName)
+    {
+        return isset($this->fields[$fieldName]);
+    }
 
     /**
      * Checks if the given field is a mapped association for this class.
      *
      * @param string $fieldName
-     * @return boolean
+     *
+     * @return bool
      */
-    function hasAssociation($fieldName){}
+    public function hasAssociation($fieldName)
+    {
+        return false;
+    }
 
     /**
      * Checks if the given field is a mapped single valued association for this class.
      *
      * @param string $fieldName
-     * @return boolean
+     *
+     * @return bool
      */
-    function isSingleValuedAssociation($fieldName){}
+    public function isSingleValuedAssociation($fieldName)
+    {
+        return false;
+    }
 
     /**
      * Checks if the given field is a mapped collection valued association for this class.
      *
      * @param string $fieldName
-     * @return boolean
+     *
+     * @return bool
      */
-    function isCollectionValuedAssociation($fieldName){}
+    public function isCollectionValuedAssociation($fieldName)
+    {
+        return false;
+    }
 
     /**
      * A numerically indexed list of field names of this persistent class.
@@ -162,14 +194,20 @@ class ClassMetadata implements BaseClassMetadata
      *
      * @return array
      */
-    function getFieldNames(){}
+    public function getFieldNames()
+    {
+        return array_column($this->fields, 'fieldName');
+    }
 
     /**
      * Returns an array of identifier field names numerically indexed.
      *
      * @return array
      */
-    function getIdentifierFieldNames(){}
+    public function getIdentifierFieldNames()
+    {
+        return $this->identifier;
+    }
 
     /**
      * A numerically indexed list of association names of this persistent class.
@@ -178,7 +216,9 @@ class ClassMetadata implements BaseClassMetadata
      *
      * @return array
      */
-    function getAssociationNames(){}
+    public function getAssociationNames()
+    {
+    }
 
     /**
      * Returns a type name of this field.
@@ -187,32 +227,44 @@ class ClassMetadata implements BaseClassMetadata
      * integer, string, boolean, float/double, datetime.
      *
      * @param string $fieldName
+     *
      * @return string
      */
-    function getTypeOfField($fieldName){}
+    public function getTypeOfField($fieldName)
+    {
+    }
 
     /**
      * Returns the target class name of the given association.
      *
      * @param string $assocName
+     *
      * @return string
      */
-    function getAssociationTargetClass($assocName){}
+    public function getAssociationTargetClass($assocName)
+    {
+    }
 
     /**
      * Checks if the association is the inverse side of a bidirectional association
      *
      * @param string $assocName
-     * @return boolean
+     *
+     * @return bool
      */
-    function isAssociationInverseSide($assocName){}
+    public function isAssociationInverseSide($assocName)
+    {
+        return false;
+    }
 
     /**
      * Returns the target field of the owning side of the association
      *
      * @param string $assocName
+     *
      * @return string
      */
-    function getAssociationMappedByTargetField($assocName){}
+    public function getAssociationMappedByTargetField($assocName)
+    {
+    }
 }
-

lib/Doctrine/KeyValueStore/Mapping/ClassMetadataFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -20,10 +21,10 @@
 namespace Doctrine\KeyValueStore\Mapping;
 
 use Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory;
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\KeyValueStore\Mapping\ClassMetadata as KeyValueMetadata;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Common\Persistence\Mapping\ReflectionService;
+use Doctrine\KeyValueStore\Mapping\ClassMetadata as KeyValueMetadata;
 
 /**
  * Load Metadata of an entity.
@@ -45,7 +46,7 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
 
     protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
     {
-        throw new \InvalidArgumentException("aliasing is not supported.");
+        throw new \InvalidArgumentException('aliasing is not supported.');
     }
 
     protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonSuperclassParents)
@@ -54,16 +55,16 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
 
         if ($parent) {
             $class->rootClassName = $parent->name;
-            $class->storageName = $parent->storageName;
+            $class->storageName   = $parent->storageName;
         }
 
-        if ( ! $class->storageName) {
-            $parts = explode("\\", $class->name);
+        if (! $class->storageName) {
+            $parts              = explode('\\', $class->name);
             $class->storageName = end($parts);
         }
 
-        if (!$class->identifier) {
-            throw new \InvalidArgumentException("Class " . $class->name . " has no identifier.");
+        if (! $class->identifier) {
+            throw new \InvalidArgumentException('Class ' . $class->name . ' has no identifier.');
         }
     }
 
@@ -90,17 +91,16 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
         $class->reflClass = $reflService->getClass($class->name);
         if ($class->reflClass) {
             foreach ($class->reflClass->getProperties() as $property) {
-                $class->mapField(array('fieldName' => $property->getName()));
+                $class->mapField(['fieldName' => $property->getName()]);
             }
         }
     }
 
     /**
      * copied from doctrine/common - tests/Doctrine/Tests/Common/Persistence/Mapping/ClassMetadataFactoryTest.php
-     */ 
+     */
     protected function isEntity(ClassMetadata $class)
     {
         return true;
     }
 }
-

lib/Doctrine/KeyValueStore/Mapping/XmlDriver.php

@@ -0,0 +1,118 @@
+<?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\KeyValueStore\Mapping;
+
+use Doctrine\Common\Persistence\Mapping\ClassMetadata as CommonClassMetadata;
+use Doctrine\Common\Persistence\Mapping\Driver\FileDriver;
+use Doctrine\Common\Persistence\Mapping\MappingException;
+
+class XmlDriver extends FileDriver
+{
+    const DEFAULT_FILE_EXTENSION = '.dcm.xml';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENSION)
+    {
+        parent::__construct($locator, $fileExtension);
+    }
+
+    /**
+     * Loads a mapping file with the given name and returns a map
+     * from class/entity names to their corresponding file driver elements.
+     *
+     * @param string $file The mapping file to load.
+     *
+     * @return array
+     */
+    protected function loadMappingFile($file)
+    {
+        $result     = [];
+        $xmlElement = simplexml_load_file($file);
+
+        if (isset($xmlElement->entity)) {
+            foreach ($xmlElement->entity as $entityElement) {
+                $entityName          = (string) $entityElement['name'];
+                $result[$entityName] = $entityElement;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Loads the metadata for the specified class into the provided container.
+     *
+     * @param string              $className
+     * @param CommonClassMetadata $metadata
+     */
+    public function loadMetadataForClass($className, CommonClassMetadata $metadata)
+    {
+        try {
+            $xmlRoot = $this->getElement($className);
+        } catch (MappingException $exception) {
+            throw new \InvalidArgumentException($metadata->name . ' is not a valid key-value-store entity.');
+        }
+
+        if ($xmlRoot->getName() != 'entity') {
+            throw new \InvalidArgumentException($metadata->name . ' is not a valid key-value-store entity.');
+        }
+
+        $class = new \ReflectionClass($className);
+
+        if (isset($xmlRoot['storage-name'])) {
+            $metadata->storageName = $xmlRoot['storage-name'];
+        }
+
+        $ids = [];
+        if (isset($xmlRoot->id)) {
+            foreach ($xmlRoot->id as $id) {
+                $ids[] = (string) $id;
+            }
+        }
+
+        $transients = [];
+        if (isset($xmlRoot->transient)) {
+            foreach ($xmlRoot->transient as $transient) {
+                $transients[] = (string) $transient;
+            }
+        }
+
+        foreach ($class->getProperties() as $property) {
+            if (in_array($property->getName(), $ids)) {
+                $metadata->mapIdentifier($property->getName());
+
+                continue;
+            }
+
+            if (in_array($property->getName(), $transients)) {
+                $metadata->skipTransientField($property->getName());
+
+                continue;
+            }
+
+            $metadata->mapField([
+                'fieldName' => $property->getName(),
+            ]);
+        }
+    }
+}

lib/Doctrine/KeyValueStore/Mapping/YamlDriver.php

@@ -0,0 +1,102 @@
+<?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\KeyValueStore\Mapping;
+
+use Doctrine\Common\Persistence\Mapping\ClassMetadata as CommonClassMetadata;
+use Doctrine\Common\Persistence\Mapping\Driver\FileDriver;
+use Doctrine\Common\Persistence\Mapping\MappingException;
+use Symfony\Component\Yaml\Yaml;
+
+class YamlDriver extends FileDriver
+{
+    const DEFAULT_FILE_EXTENSION = '.dcm.yml';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct($locator, $fileExtension = self::DEFAULT_FILE_EXTENSION)
+    {
+        parent::__construct($locator, $fileExtension);
+    }
+
+    /**
+     * Loads a mapping file with the given name and returns a map
+     * from class/entity names to their corresponding file driver elements.
+     *
+     * @param string $file The mapping file to load.
+     *
+     * @return array
+     */
+    protected function loadMappingFile($file)
+    {
+        return Yaml::parse(file_get_contents($file));
+    }
+
+    /**
+     * Loads the metadata for the specified class into the provided container.
+     *
+     * @param string              $className
+     * @param CommonClassMetadata $metadata
+     */
+    public function loadMetadataForClass($className, CommonClassMetadata $metadata)
+    {
+        /** @var \Doctrine\KeyValueStore\Mapping\ClassMetadata $metadata */
+        try {
+            $element = $this->getElement($className);
+        } catch (MappingException $exception) {
+            throw new \InvalidArgumentException($metadata->name . ' is not a valid key-value-store entity.');
+        }
+
+        $class = new \ReflectionClass($className);
+
+        if (isset($element['storageName'])) {
+            $metadata->storageName = $element['storageName'];
+        }
+
+        $ids = [];
+        if (isset($element['id'])) {
+            $ids = $element['id'];
+        }
+
+        $transients = [];
+        if (isset($element['transient'])) {
+            $transients = $element['transient'];
+        }
+
+        foreach ($class->getProperties() as $property) {
+            if (in_array($property->getName(), $ids)) {
+                $metadata->mapIdentifier($property->getName());
+
+                continue;
+            }
+
+            if (in_array($property->getName(), $transients)) {
+                $metadata->skipTransientField($property->getName());
+
+                continue;
+            }
+
+            $metadata->mapField([
+                'fieldName' => $property->getName(),
+            ]);
+        }
+    }
+}

lib/Doctrine/KeyValueStore/NotFoundException.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -21,6 +22,8 @@ namespace Doctrine\KeyValueStore;
 
 class NotFoundException extends KeyValueStoreException
 {
-    
+    public static function notFoundByKey($key)
+    {
+        return new static(sprintf('Could not find an item with key: %s', $key), 0);
+    }
 }
-

lib/Doctrine/KeyValueStore/Query/RangeQuery.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -29,14 +30,14 @@ use Doctrine\KeyValueStore\EntityManager;
  */
 class RangeQuery
 {
-    const CONDITION_EQ          = 'eq';
-    const CONDITION_LE          = 'le';
-    const CONDITION_LT          = 'lt';
-    const CONDITION_GT          = 'gt';
-    const CONDITION_GE          = 'ge';
-    const CONDITION_NEQ         = 'neq';
-    const CONDITION_BETWEEN     = 'between';
-    const CONDITION_STARTSWITH  = 'startswith';
+    const CONDITION_EQ         = 'eq';
+    const CONDITION_LE         = 'le';
+    const CONDITION_LT         = 'lt';
+    const CONDITION_GT         = 'gt';
+    const CONDITION_GE         = 'ge';
+    const CONDITION_NEQ        = 'neq';
+    const CONDITION_BETWEEN    = 'between';
+    const CONDITION_STARTSWITH = 'startswith';
 
     /**
      * @param string
@@ -51,7 +52,7 @@ class RangeQuery
     /**
      * @var array
      */
-    protected $conditions = array();
+    protected $conditions = [];
 
     /**
      * Limit result to only a set of entities.
@@ -65,7 +66,7 @@ class RangeQuery
      *
      * @var array
      */
-    protected $hints = array();
+    protected $hints = [];
 
     /**
      * @var EntityManager
@@ -74,8 +75,8 @@ class RangeQuery
 
     public function __construct(EntityManager $em, $className, $partitionKey)
     {
-        $this->em = $em;
-        $this->className = $className;
+        $this->em           = $em;
+        $this->className    = $className;
         $this->partitionKey = $partitionKey;
     }
 
@@ -114,11 +115,12 @@ class RangeQuery
      * Add range equals condition to range key.
      *
      * @param mixed $value
+     *
      * @return RangeQuery
      */
     public function rangeEquals($value)
     {
-        $this->conditions[] = array(self::CONDITION_EQ, $value);
+        $this->conditions[] = [self::CONDITION_EQ, $value];
         return $this;
     }
 
@@ -126,11 +128,12 @@ class RangeQuery
      * Add range not equals condition to range key.
      *
      * @param mixed $value
+     *
      * @return RangeQuery
      */
     public function rangeNotEquals($value)
     {
-        $this->conditions[] = array(self::CONDITION_NEQ, $value);
+        $this->conditions[] = [self::CONDITION_NEQ, $value];
         return $this;
     }
 
@@ -138,11 +141,12 @@ class RangeQuery
      * Add range less than condition to range key.
      *
      * @param mixed $value
+     *
      * @return RangeQuery
      */
     public function rangeLessThan($value)
     {
-        $this->conditions[] = array(self::CONDITION_LT, $value);
+        $this->conditions[] = [self::CONDITION_LT, $value];
         return $this;
     }
 
@@ -150,11 +154,12 @@ class RangeQuery
      * Add range less than equals condition to range key.
      *
      * @param mixed $value
+     *
      * @return RangeQuery
      */
     public function rangeLessThanEquals($value)
     {
-        $this->conditions[] = array(self::CONDITION_LE, $value);
+        $this->conditions[] = [self::CONDITION_LE, $value];
         return $this;
     }
 
@@ -162,11 +167,12 @@ class RangeQuery
      * Add range greater than condition to range key.
      *
      * @param mixed $value
+     *
      * @return RangeQuery
      */
     public function rangeGreaterThan($value)
     {
-        $this->conditions[] = array(self::CONDITION_GT, $value);
+        $this->conditions[] = [self::CONDITION_GT, $value];
         return $this;
     }
 
@@ -174,11 +180,12 @@ class RangeQuery
      * Add range greater than equals condition to range key.
      *
      * @param mixed $value
+     *
      * @return RangeQuery
      */
     public function rangeGreaterThanEquals($value)
     {
-        $this->conditions[] = array(self::CONDITION_GE, $value);
+        $this->conditions[] = [self::CONDITION_GE, $value];
         return $this;
     }
 
@@ -201,21 +208,23 @@ class RangeQuery
     {
         $storage = $this->em->unwrap();
 
-        if ( ! ($storage instanceof RangeQueryStorage)) {
-            throw new \RuntimeException("The storage backend " . $this->storage->getName() . " does not support range queries.");
+        if (! $storage instanceof RangeQueryStorage) {
+            throw new \RuntimeException(
+                'The storage backend ' . $storage->getName() . ' does not support range queries.'
+            );
         }
 
         $uow   = $this->em->getUnitOfWork();
         $class = $this->em->getClassMetadata($this->className);
 
-        return $storage->executeRangeQuery($this, $class->storageName, $class->identifier, function ($row) use($uow, $class) {
-            $key = array();
+        $rowHydration = function ($row) use ($uow, $class) {
+            $key = [];
             foreach ($class->identifier as $id) {
                 $key[$id] = $row[$id];
             }
 
             return $uow->createEntity($class, $key, $row);
-        });
+        };
+        return $storage->executeRangeQuery($this, $class->storageName, $class->identifier, $rowHydration);
     }
 }
-

lib/Doctrine/KeyValueStore/Query/RangeQueryStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -31,11 +32,11 @@ interface RangeQueryStorage
      * Execute the range query and return a ResultIterator
      *
      * @param RangeQuery $query
-     * @param string $storageName
-     * @param array $key
-     * @param Closure $hydrateRow
+     * @param string     $storageName
+     * @param array      $key
+     * @param Closure    $hydrateRow
+     *
      * @return ResultIterator
      */
-    function executeRangeQuery(RangeQuery $query, $storageName, $key, \Closure $hydrateRow = null);
+    public function executeRangeQuery(RangeQuery $query, $storageName, $key, \Closure $hydrateRow = null);
 }
-

lib/Doctrine/KeyValueStore/Storage/ArrayStorage.php

@@ -0,0 +1,136 @@
+<?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\KeyValueStore\Storage;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\KeyValueStore\NotFoundException;
+
+/**
+ * Array storage, mainly used for development purposes.
+ *
+ * @author Emanuele Minotto <minottoemanuele@gmail.com>
+ */
+class ArrayStorage implements Storage
+{
+    /**
+     * @var array
+     */
+    private $data = [];
+
+    public function supportsPartialUpdates()
+    {
+        return false;
+    }
+
+    /**
+     * Does this storage support composite primary keys?
+     *
+     * @return bool
+     */
+    public function supportsCompositePrimaryKeys()
+    {
+        return false;
+    }
+
+    /**
+     * Does this storage require composite primary keys?
+     *
+     * @return bool
+     */
+    public function requiresCompositePrimaryKeys()
+    {
+        return false;
+    }
+
+    /**
+     * Insert data into the storage key specified.
+     *
+     * @param array|string $key
+     * @param array        $data
+     */
+    public function insert($storageName, $key, array $data)
+    {
+        $this->update($storageName, $key, $data);
+    }
+
+    /**
+     * Update data into the given key.
+     *
+     * @param array|string $key
+     * @param array        $data
+     */
+    public function update($storageName, $key, array $data)
+    {
+        if (!isset($this->data[$storageName])) {
+            $this->data[$storageName] = [];
+        }
+
+        $this->data[$storageName][serialize($key)] = $data;
+    }
+
+    /**
+     * Delete data at key
+     *
+     * @param array|string $key
+     */
+    public function delete($storageName, $key)
+    {
+        if (!isset($this->data[$storageName])) {
+            return;
+        }
+
+        if (!isset($this->data[$storageName][serialize($key)])) {
+            return;
+        }
+
+        unset($this->data[$storageName][serialize($key)]);
+    }
+
+    /**
+     * Find data at key
+     *
+     * @param array|string $key
+     *
+     * @return array
+     */
+    public function find($storageName, $key)
+    {
+        if (!isset($this->data[$storageName])) {
+            throw new NotFoundException();
+        }
+
+        if (!isset($this->data[$storageName][serialize($key)])) {
+            throw new NotFoundException();
+        }
+
+        unset($this->data[$storageName][serialize($key)]);
+    }
+
+    /**
+     * Return a name of the underlying storage.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'array';
+    }
+}

lib/Doctrine/KeyValueStore/Storage/AzureSdkTableStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -19,14 +20,13 @@
 
 namespace Doctrine\KeyValueStore\Storage;
 
-use WindowsAzure\Table\TableRestProxy;
-use WindowsAzure\Table\Models\Entity;
-use WindowsAzure\Table\Models\EdmType;
-use WindowsAzure\Common\ServiceException;
-
 use Doctrine\KeyValueStore\NotFoundException;
 use Doctrine\KeyValueStore\Query\RangeQuery;
 use Doctrine\KeyValueStore\Query\RangeQueryStorage;
+use WindowsAzure\Common\ServiceException;
+use WindowsAzure\Table\Models\EdmType;
+use WindowsAzure\Table\Models\Entity;
+use WindowsAzure\Table\TableRestProxy;
 
 /**
  * Storage implementation for Microsoft Windows Azure Table using the PHP SDK.
@@ -78,13 +78,14 @@ class AzureSdkTableStorage implements Storage, RangeQueryStorage
 
         try {
             $this->client->insertEntity($storageName, $entity);
-        } catch(ServiceException $e){
+        } catch (ServiceException $e) {
             if ($e->getCode() == 404) {
                 $this->client->createTable($storageName);
             } else {
                 throw new StorageException(
-                    "Could not save entity in table, WindowsAzure SDK client reported error: " . $e->getMessage(),
-                    $e->getCode(), $e
+                    'Could not save entity in table, WindowsAzure SDK client reported error: ' . $e->getMessage(),
+                    $e->getCode(),
+                    $e
                 );
             }
         }
@@ -99,10 +100,11 @@ class AzureSdkTableStorage implements Storage, RangeQueryStorage
 
         try {
             $this->client->updateEntity($storageName, $entity);
-        } catch(ServiceException $e){
+        } catch (ServiceException $e) {
             throw new StorageException(
-                "Could not update entity in table, WindowsAzure SDK client reported error: " . $e->getMessage(),
-                $e->getCode(), $e
+                'Could not update entity in table, WindowsAzure SDK client reported error: ' . $e->getMessage(),
+                $e->getCode(),
+                $e
             );
         }
     }
@@ -112,14 +114,15 @@ class AzureSdkTableStorage implements Storage, RangeQueryStorage
      */
     public function delete($storageName, $key)
     {
-        list ($partitonKey, $rowKey) = array_values($key);
+        list($partitonKey, $rowKey) = array_values($key);
 
         try {
             $this->client->deleteEntity($storageName, $partitonKey, $rowKey);
-        } catch(ServiceException $e) {
+        } catch (ServiceException $e) {
             throw new StorageException(
-                "Could not delete entity in table, WindowsAzure SDK client reported error: " . $e->getMessage(),
-                $e->getCode(), $e
+                'Could not delete entity in table, WindowsAzure SDK client reported error: ' . $e->getMessage(),
+                $e->getCode(),
+                $e
             );
         }
     }
@@ -129,17 +132,18 @@ class AzureSdkTableStorage implements Storage, RangeQueryStorage
      */
     public function find($storageName, $key)
     {
-        list ($partitonKey, $rowKey) = array_values($key);
+        list($partitonKey, $rowKey) = array_values($key);
 
         try {
-            $result     = $this->client->getEntity($storageName, $partitonKey, $rowKey);
-        } catch(ServiceException $e) {
+            $result = $this->client->getEntity($storageName, $partitonKey, $rowKey);
+        } catch (ServiceException $e) {
             if ($e->getCode() === 404) {
                 throw new NotFoundException();
             } else {
                 throw new StorageException(
-                    "Could not find entity in table, WindowsAzure SDK client reported error: " . $e->getMessage(),
-                    $e->getCode(), $e
+                    'Could not find entity in table, WindowsAzure SDK client reported error: ' . $e->getMessage(),
+                    $e->getCode(),
+                    $e
                 );
             }
         }
@@ -149,12 +153,12 @@ class AzureSdkTableStorage implements Storage, RangeQueryStorage
 
     private function getProperties(Entity $entity)
     {
-        $properties = array();
+        $properties = [];
 
         foreach ($entity->getProperties() as $name => $property) {
             if ($name === 'PartitionKey') {
                 $name = 'dist';
-            } else if ($name === 'RowKey') {
+            } elseif ($name === 'RowKey') {
                 $name = 'range';
             }
 
@@ -177,19 +181,21 @@ class AzureSdkTableStorage implements Storage, RangeQueryStorage
      */
     public function executeRangeQuery(RangeQuery $query, $storageName, $key, \Closure $hydrateRow = null)
     {
-        $filters = array("PartitionKey eq " . $this->quoteFilterValue($query->getPartitionKey()));
+        $filters = ['PartitionKey eq ' . $this->quoteFilterValue($query->getPartitionKey())];
 
         foreach ($query->getConditions() as $condition) {
-            if ( ! in_array($condition[0], array('eq', 'neq', 'le', 'lt', 'ge', 'gt'))) {
-                throw new \InvalidArgumentException("Windows Azure Table only supports eq, neq, le, lt, ge, gt as conditions.");
+            if (! in_array($condition[0], ['eq', 'neq', 'le', 'lt', 'ge', 'gt'])) {
+                throw new \InvalidArgumentException(
+                    'Windows Azure Table only supports eq, neq, le, lt, ge, gt as conditions.'
+                );
             }
-            $filters[] = "RowKey " . $condition[0] . " " . $this->quoteFilterValue($condition[1]);
+            $filters[] = 'RowKey ' . $condition[0] . ' ' . $this->quoteFilterValue($condition[1]);
         }
 
-        $filter = '(' . implode(" and ", $filters) . ')';
+        $filter = '(' . implode(' and ', $filters) . ')';
         $result = $this->client->queryEntities($storageName, $filter);
 
-        $rows = array();
+        $rows = [];
 
         foreach ($result->getEntities() as $entity) {
             $row    = $this->getProperties($entity);
@@ -201,7 +207,7 @@ class AzureSdkTableStorage implements Storage, RangeQueryStorage
 
     private function quoteFilterValue($value)
     {
-        return "'" . str_replace("'", "", $value) . "'";
+        return "'" . str_replace("'", '', $value) . "'";
     }
 
     /**
@@ -209,15 +215,16 @@ class AzureSdkTableStorage implements Storage, RangeQueryStorage
      *
      * @param array $key
      * @param array $data
+     *
      * @return \WindowsAzure\Table\Model\Entity
      */
     private function createEntity(array $key, array $data)
     {
-        list ($partitonKey, $rowKey) = array_values($key);
+        list($partitonKey, $rowKey) = array_values($key);
 
         $entity = new Entity();
-        $entity->setPartitionKey((string)$partitonKey);
-        $entity->setRowKey((string)$rowKey);
+        $entity->setPartitionKey((string) $partitonKey);
+        $entity->setRowKey((string) $rowKey);
 
         foreach ($data as $variable => $value) {
             $type = $this->getPropertyType($value);
@@ -234,11 +241,11 @@ class AzureSdkTableStorage implements Storage, RangeQueryStorage
     {
         if ($propertyValue instanceof \DateTime) {
             return EdmType::DATETIME;
-        } else if (is_float($propertyValue)) {
+        } elseif (is_float($propertyValue)) {
             return EdmType::DOUBLE;
-        } else if (is_int($propertyValue)) {
+        } elseif (is_int($propertyValue)) {
             return EdmType::INT32;
-        } else if (is_bool($propertyValue)) {
+        } elseif (is_bool($propertyValue)) {
             return EdmType::BOOLEAN;
         }
 

lib/Doctrine/KeyValueStore/Storage/CassandraStorage.php

@@ -0,0 +1,186 @@
+<?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\KeyValueStore\Storage;
+
+use Cassandra\ExecutionOptions;
+use Cassandra\Session;
+use Doctrine\KeyValueStore\NotFoundException;
+
+/**
+ * Cassandra Storage Engine for KeyValueStore.
+ *
+ * Uses the PHP Driver from Datastax.
+ *
+ * @uses https://github.com/datastax/php-driver
+ */
+class CassandraStorage implements Storage
+{
+    /**
+     * @var \Cassandra\Session
+     */
+    private $session;
+
+    public function __construct(Session $session)
+    {
+        $this->session = $session;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function supportsPartialUpdates()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function supportsCompositePrimaryKeys()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function requiresCompositePrimaryKeys()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function insert($storageName, $key, array $data)
+    {
+        $keys = $values = [];
+
+        foreach ($key as $name => $value) {
+            $keys[]   = $name;
+            $values[] = $value;
+        }
+
+        foreach ($data as $name => $value) {
+            $keys[]   = $name;
+            $values[] = $value;
+        }
+
+        $stmt = $this->session->prepare('INSERT INTO ' . $storageName . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', array_fill(0, count($values), '?')) . ')');
+
+        $options = new ExecutionOptions([
+            'arguments' => $values,
+        ]);
+
+        $this->session->execute($stmt, $options);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function update($storageName, $key, array $data)
+    {
+        $where = [];
+        $set   = [];
+
+        foreach ($key as $name => $value) {
+            $where[] = $name . ' = ?';
+        }
+
+        foreach ($data as $name => $value) {
+            $set[] = $name . ' = ?';
+        }
+
+        $stmt = $this->session->prepare('UPDATE ' . $storageName . ' SET ' . implode(', ', $set) . ' WHERE ' . implode(' AND ', $where));
+
+        $values = array_merge(array_values($data), array_values($key));
+
+        $options = new ExecutionOptions([
+            'arguments' => $values,
+        ]);
+
+        $this->session->execute($stmt, $options);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function delete($storageName, $key)
+    {
+        $where = [];
+
+        foreach ($key as $name => $value) {
+            $where[] = $name . ' = ?';
+        }
+
+        $stmt = $this->session->prepare('DELETE FROM ' . $storageName . ' WHERE ' . implode(' AND ', $where));
+
+        $options = new ExecutionOptions([
+            'arguments' => array_values($key),
+        ]);
+
+        $this->session->execute($stmt, $options);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function find($storageName, $key)
+    {
+        $where = [];
+
+        foreach ($key as $name => $value) {
+            $where[] = $name . ' = ?';
+        }
+
+        $stmt = $this->session->prepare('SELECT * FROM ' . $storageName . ' WHERE ' . implode(' AND ', $where));
+
+        $options = new ExecutionOptions([
+            'arguments' => array_values($key),
+        ]);
+
+        $result = $this->session->execute($stmt, $options);
+        $rows   = iterator_to_array($result);
+
+        if (! isset($rows[0])) {
+            throw new NotFoundException();
+        }
+
+        $data = [];
+        foreach ($rows[0] as $column => $value) {
+            if (isset($key[$column])) {
+                continue;
+            }
+
+            $data[$column] = $value;
+        }
+
+        return $data;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return 'cassandra';
+    }
+}

lib/Doctrine/KeyValueStore/Storage/CouchDbStorage.php

@@ -0,0 +1,140 @@
+<?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\KeyValueStore\Storage;
+
+use Doctrine\CouchDB\CouchDBClient;
+
+/**
+ * Key-Value-Storage using a Doctrine CouchDB Client library as backend.
+ *
+ * CouchDB requires scalar identifiers, so the `flattenKey` method is used
+ * to flatten passed keys.
+ *
+ * @author Emanuele Minotto <minottoemanuele@gmail.com>
+ */
+final class CouchDbStorage implements Storage
+{
+    /**
+     * @var CouchDBClient
+     */
+    private $client;
+
+    /**
+     * @param CouchDBClient $client
+     */
+    public function __construct(CouchDBClient $client)
+    {
+        $this->client = $client;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function supportsPartialUpdates()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function supportsCompositePrimaryKeys()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function requiresCompositePrimaryKeys()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function insert($storageName, $key, array $data)
+    {
+        $key = $this->flattenKey($storageName, $key);
+        $this->client->putDocument($data, $key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function update($storageName, $key, array $data)
+    {
+        $key = $this->flattenKey($storageName, $key);
+        $this->client->putDocument($data, $key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function delete($storageName, $key)
+    {
+        $key = $this->flattenKey($storageName, $key);
+        $this->client->deleteDocument($key, null);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function find($storageName, $key)
+    {
+        $key = $this->flattenKey($storageName, $key);
+        return $this->client->findDocument($key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return 'couchdb';
+    }
+
+    /**
+     * @param string       $storageName
+     * @param array|string $key
+     * 
+     * @return string
+     */
+    private function flattenKey($storageName, $key)
+    {
+        $finalKey = $storageName . '-';
+
+        if (is_string($key)) {
+            return $finalKey . $key;
+        }
+
+        if (! is_array($key)) {
+            throw new \InvalidArgumentException('The key should be a string or a flat array.');
+        }
+
+        foreach ($key as $property => $value) {
+            $finalKey .= sprintf('%s:%s-', $property, $value);
+        }
+
+        return $finalKey;
+    }
+}

lib/Doctrine/KeyValueStore/Storage/CouchbaseStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,6 @@
  * <http://www.doctrine-project.org>.
  */
 
-
 namespace Doctrine\KeyValueStore\Storage;
 
 use Doctrine\KeyValueStore\NotFoundException;

lib/Doctrine/KeyValueStore/Storage/DBALStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -19,8 +20,8 @@
 
 namespace Doctrine\KeyValueStore\Storage;
 
-use Doctrine\KeyValueStore\NotFoundException;
 use Doctrine\DBAL\Connection;
+use Doctrine\KeyValueStore\NotFoundException;
 
 /**
  * Relational databased backed system.
@@ -36,11 +37,15 @@ class DBALStorage implements Storage
     private $keyColumn;
     private $dataColumn;
 
-    public function __construct(Connection $conn, $table = 'storage', $keyColumn = 'id', $dataColumn = 'serialized_data')
-    {
-        $this->conn = $conn;
-        $this->table = $table;
-        $this->keyColumn = $keyColumn;
+    public function __construct(
+        Connection $conn,
+        $table = 'storage',
+        $keyColumn = 'id',
+        $dataColumn = 'serialized_data'
+    ) {
+        $this->conn       = $conn;
+        $this->table      = $table;
+        $this->keyColumn  = $keyColumn;
         $this->dataColumn = $dataColumn;
     }
 
@@ -73,17 +78,16 @@ class DBALStorage implements Storage
      * Insert data into the storage key specified.
      *
      * @param array|string $key
-     * @param array $data
-     * @return void
+     * @param array        $data
      */
-    function insert($storageName, $key, array $data)
+    public function insert($storageName, $key, array $data)
     {
         try {
-            $this->conn->insert($this->table, array(
-                $this->keyColumn => $key,
-                $this->dataColumn => serialize($data)
-            ));
-        } catch(\Exception $e) {
+            $this->conn->insert($this->table, [
+                $this->keyColumn  => $key,
+                $this->dataColumn => serialize($data),
+            ]);
+        } catch (\Exception $e) {
         }
     }
 
@@ -91,18 +95,17 @@ class DBALStorage implements Storage
      * Update data into the given key.
      *
      * @param array|string $key
-     * @param array $data
-     * @return void
+     * @param array        $data
      */
     public function update($storageName, $key, array $data)
     {
         try {
-            $this->conn->update($this->table, array(
-                $this->dataColumn => serialize($data)
-            ), array(
-                $this->keyColumn => $key
-            ));
-        } catch(\Exception $e) {
+            $this->conn->update($this->table, [
+                $this->dataColumn => serialize($data),
+            ], [
+                $this->keyColumn => $key,
+            ]);
+        } catch (\Exception $e) {
         }
     }
 
@@ -110,13 +113,12 @@ class DBALStorage implements Storage
      * Delete data at key
      *
      * @param array|string $key
-     * @return void
      */
     public function delete($storageName, $key)
     {
         try {
-            $this->conn->delete($this->table, array($this->keyColumn => $key));
-        } catch(\Exception $e) {
+            $this->conn->delete($this->table, [$this->keyColumn => $key]);
+        } catch (\Exception $e) {
         }
     }
 
@@ -124,22 +126,23 @@ class DBALStorage implements Storage
      * Find data at key
      *
      * @param array|string $key
+     *
      * @return array
      */
     public function find($storageName, $key)
     {
         $qb = $this->conn->createQueryBuilder();
 
-        $qb->select("s.{$this->dataColumn}")
+        $qb->select('s.' . $this->dataColumn)
             ->from($this->table, 's')
-            ->where("{$this->keyColumn} = ?")
-            ->setParameters(array($key));
+            ->where($this->keyColumn . ' = ?')
+            ->setParameters([$key]);
 
         $stmt = $qb->execute();
 
         $data = $stmt->fetchColumn();
 
-        if (!$data) {
+        if (! $data) {
             throw new NotFoundException();
         }
 
@@ -156,4 +159,3 @@ class DBALStorage implements Storage
         return 'dbal';
     }
 }
-

lib/Doctrine/KeyValueStore/Storage/DoctrineCacheStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -40,7 +41,7 @@ class DoctrineCacheStorage implements Storage
 
     public function __construct(Cache $cache, $supportsCompositeKeys = true)
     {
-        $this->cache = $cache;
+        $this->cache                 = $cache;
         $this->supportsCompositeKeys = $supportsCompositeKeys;
     }
 
@@ -61,14 +62,14 @@ class DoctrineCacheStorage implements Storage
 
     private function flattenKey($storageName, $key)
     {
-        if ( ! $this->supportsCompositeKeys) {
-            return $storageName . "-" . $key;
+        if (! $this->supportsCompositeKeys) {
+            return $storageName . '-' . $key;
         }
 
-        $hash = $storageName . "-oid:";
+        $hash = $storageName . '-oid:';
         ksort($key);
         foreach ($key as $property => $value) {
-            $hash .= "$property=$value;";
+            $hash .= $property . '=' . $value . ';';
         }
         return $hash;
     }
@@ -102,4 +103,3 @@ class DoctrineCacheStorage implements Storage
         return 'doctrine_cache';
     }
 }
-

lib/Doctrine/KeyValueStore/Storage/DynamoDbStorage.php

@@ -1,53 +1,70 @@
 <?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>.
-*/
+ * 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\KeyValueStore\Storage;
 
-use Doctrine\KeyValueStore\NotFoundException;
 use Aws\DynamoDb\DynamoDbClient;
-use Aws\DynamoDb\Exception\ResourceNotFoundException;
-use Aws\DynamoDb\Iterator\ItemIterator;
+use Aws\DynamoDb\Marshaler;
+use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\Common\Cache\Cache;
+use Doctrine\KeyValueStore\NotFoundException;
 
 /**
- * DyanmoDb storage
+ * DynamoDb storage.
  *
  * @author Stan Lemon <stosh1985@gmail.com>
  */
 class DynamoDbStorage implements Storage
 {
     /**
-     * @var \Aws\DynamoDb\DynamoDbClient
+     * @var DynamoDbClient
      */
-    protected $client;
+    private $client;
 
     /**
-     * Constructor
-     *
-     * @param \Aws\DynamoDb\DynamoDbClient $client
+     * @var Marshaler
      */
-    public function __construct(DynamoDbClient $client)
-    {
+    private $marshaler;
+
+    /**
+     * @var Cache
+     */
+    private $descriptionCache;
+
+    /**
+     * @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
+     */
+    public function __construct(
+        DynamoDbClient $client,
+        Marshaler $marshaler = null,
+        Cache $descriptionCache = null
+    ) {
         $this->client = $client;
+        $this->marshaler = $marshaler ?: new Marshaler();
+        $this->descriptionCache = $descriptionCache ?: new ArrayCache();
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function supportsPartialUpdates()
     {
@@ -55,7 +72,7 @@ class DynamoDbStorage implements Storage
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function supportsCompositePrimaryKeys()
     {
@@ -63,7 +80,7 @@ class DynamoDbStorage implements Storage
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function requiresCompositePrimaryKeys()
     {
@@ -71,77 +88,98 @@ class DynamoDbStorage implements Storage
     }
 
     /**
-     * {@inheritDoc}
+     * 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}
      */
     public function insert($storageName, $key, array $data)
     {
-        $this->createTable($storageName);
-
-        $this->prepareData($key, $data);
-
-        $result = $this->client->putItem(array(
+        $this->client->putItem([
             'TableName' => $storageName,
-            'Item' => $this->client->formatAttributes($data),
-            'ReturnConsumedCapacity' => 'TOTAL'
-        ));
+            'Item' => $this->prepareKey($storageName, $key) + $this->marshaler->marshalItem($data),
+        ]);
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function update($storageName, $key, array $data)
     {
-        $this->prepareData($key, $data);
-
-        unset($data['id']);
-
-        foreach ($data as $k => $v) {
-            $data[$k] = array(
-                "Value" => $this->client->formatValue($v),
-            );
-        }
-
-        $result = $this->client->updateItem(array(
-            'TableName' => $storageName,
-            'Key' => array(
-                "id" => array('S' => $key)
-            ),
-            "AttributeUpdates" => $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);
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function delete($storageName, $key)
     {
-        $result = $this->client->deleteItem(array(
+        $this->client->deleteItem([
+            'Key' => $this->prepareKey($storageName, $key),
             'TableName' => $storageName,
-            'Key' => array(
-                'id' => array('S' => $key),
-            )
-        ));
+        ]);
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function find($storageName, $key)
     {
-        $iterator = new ItemIterator($this->client->getScanIterator(array(
-            "TableName" => $storageName,
-            "Key" => array(
-                "Id" => array('S' => $key),
-            ),
-        )));
+        $keys = $this->prepareKey($storageName, $key);
 
-        $results = $iterator->toArray();
+        $item = $this->client->getItem([
+            'ConsistentRead' => true,
+            'Key' => $keys,
+            'TableName' => $storageName,
+        ]);
 
-        if (count($results)) {
-            return array_shift($results);
+        if (! $item->hasKey('Item')) {
+            throw NotFoundException::notFoundByKey($key);
         }
 
-        throw new NotFoundException();
+        $item = $item->get('Item');
+
+        $result = $this->marshaler->unmarshalItem($item);
+        $result = array_diff_key($result, $keys);
+
+        return $result;
     }
 
     /**
@@ -153,54 +191,4 @@ class DynamoDbStorage implements Storage
     {
         return 'dynamodb';
     }
-    
-
-    /**
-     * @param string $tableName
-     */
-    protected function createTable($tableName)
-    {
-        try {
-            $this->client->describeTable(array(
-                'TableName' => $tableName,
-            ));
-        } catch(ResourceNotFoundException $e) {
-            $this->client->createTable(array(
-                'AttributeDefinitions' => array(
-                    array(
-                        'AttributeName' => 'id',
-                        'AttributeType' => 'S',
-                    ),
-                ),
-                'TableName' => $tableName,
-                'KeySchema' => array(
-                    array(
-                        'AttributeName' => 'id',
-                        'KeyType' => 'HASH',
-                    ),
-                ),
-                'ProvisionedThroughput' => array(
-                    'ReadCapacityUnits' => 1,
-                    'WriteCapacityUnits' => 1,
-                ),
-            ));
-        }
-    }
-
-    /**
-     * @param string $key 
-     * @param array $data 
-     */
-    protected function prepareData($key, &$data)
-    {
-        $data = array_merge($data, array(
-            'id' => $key,
-        ));
-
-        foreach ($data as $key => $value) {
-            if ($value === null || $value === array() || $value === '') {
-                unset($data[$key]);
-            }
-        }
-    }
-}
+}

lib/Doctrine/KeyValueStore/Storage/MongoDbStorage.php

@@ -1,25 +1,27 @@
 <?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>.
-*/
+ * 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\KeyValueStore\Storage;
 
 use Doctrine\KeyValueStore\NotFoundException;
+use MongoDB\Database;
 
 /**
  * MongoDb storage
@@ -29,54 +31,16 @@ use Doctrine\KeyValueStore\NotFoundException;
 class MongoDbStorage implements Storage
 {
     /**
-     * @var \Mongo
+     * @var Database
      */
-    protected $mongo;
+    private $database;
 
     /**
-     * @var array
+     * @param Database $database
      */
-    protected $dbOptions;
-
-    /**
-     * @var \MongoCollection
-     */
-    protected $collection;
-
-    /**
-     * Constructor
-     *
-     * @param \Mongo $mongo
-     * @param array $dbOptions
-     */
-    public function __construct(\Mongo $mongo, array $dbOptions = array())
+    public function __construct(Database $database)
     {
-        $this->mongo = $mongo;
-        $this->dbOptions = array_merge(array(
-            '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']);
+        $this->database = $database;
     }
 
     /**
@@ -108,14 +72,12 @@ class MongoDbStorage implements Storage
      */
     public function insert($storageName, $key, array $data)
     {
-        $this->initialize();
-
-        $value = array(
-            'key'   => $key,
-            'value' => $data,
-        );
-
-        $this->collection->insert($value);
+        $this->database
+            ->selectCollection($storageName)
+            ->insertOne([
+                'key'   => $key,
+                'value' => $data,
+            ]);
     }
 
     /**
@@ -123,14 +85,14 @@ class MongoDbStorage implements Storage
      */
     public function update($storageName, $key, array $data)
     {
-        $this->initialize();
-
-        $value = array(
-            'key'   => $key,
-            'value' => $data,
-        );
-
-        $this->collection->update(array('key' => $key), $value);
+        $this->database
+            ->selectCollection($storageName)
+            ->replaceOne([
+                'key'   => $key,
+            ], [
+                'key'   => $key,
+                'value' => $data,
+            ]);
     }
 
     /**
@@ -138,9 +100,11 @@ class MongoDbStorage implements Storage
      */
     public function delete($storageName, $key)
     {
-        $this->initialize();
-
-        $this->collection->remove(array('key' => $key));
+        $this->database
+            ->selectCollection($storageName)
+            ->deleteOne([
+                'key' => $key,
+            ]);
     }
 
     /**
@@ -148,15 +112,23 @@ class MongoDbStorage implements Storage
      */
     public function find($storageName, $key)
     {
-        $this->initialize();
+        $result = $this->database
+            ->selectCollection($storageName, [
+                'typeMap' => [
+                    'array' => 'array',
+                    'document' => 'array',
+                    'root' => 'array',
+                ],
+            ])
+            ->findOne([
+                'key' => $key,
+            ]);
 
-        $value = $this->collection->findOne(array('key' => $key), array('value'));
-
-        if ($value) {
-            return $value['value'];
+        if (! $result || ! $result['value']) {
+            throw new NotFoundException();
         }
 
-        throw new NotFoundException();
+        return $result['value'];
     }
 
     /**
@@ -168,4 +140,4 @@ class MongoDbStorage implements Storage
     {
         return 'mongodb';
     }
-}
+}

lib/Doctrine/KeyValueStore/Storage/RedisStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,7 +18,6 @@
  * <http://www.doctrine-project.org>.
  */
 
-
 namespace Doctrine\KeyValueStore\Storage;
 
 use Doctrine\KeyValueStore\NotFoundException;
@@ -48,15 +48,15 @@ class RedisStorage implements Storage
      * Constructor
      *
      * @param \Redis $redis
-     * @param array $dbOptions
+     * @param array  $dbOptions
      */
-    public function __construct($redis, $dbOptions = array())
+    public function __construct($redis, $dbOptions = [])
     {
         $this->client = $redis;
 
-        $this->dbOptions = array_merge(array(
-            'keyPrefix' => $this->keyPrefix
-        ), $dbOptions);
+        $this->dbOptions = array_merge([
+            'keyPrefix' => $this->keyPrefix,
+        ], $dbOptions);
     }
 
     /**
@@ -138,7 +138,8 @@ class RedisStorage implements Storage
     /**
      * Add prefix to Redis key space name
      *
-     * @param  string $key
+     * @param string $key
+     *
      * @return string
      */
     public function getKeyName($key)

lib/Doctrine/KeyValueStore/Storage/RiakStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -17,12 +18,17 @@
  * <http://www.doctrine-project.org>.
  */
 
-
 namespace Doctrine\KeyValueStore\Storage;
 
 use Doctrine\KeyValueStore\NotFoundException;
-
-use Riak\Client;
+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;
 
 /**
  * @author Markus Bachmann <markus.bachmann@bachi.biz>
@@ -30,17 +36,11 @@ use Riak\Client;
 class RiakStorage implements Storage
 {
     /**
-     * @var \Riak\Client
+     * @var RiakClient
      */
-    protected $client;
+    private $client;
 
-    /**
-     * Constructor
-     *
-     * @param \Riak\Client $riak
-     * @param string       $bucketName
-     */
-    public function __construct(Client $riak)
+    public function __construct(RiakClient $riak)
     {
         $this->client = $riak;
     }
@@ -69,14 +69,25 @@ 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)
     {
-        $bucket = $this->client->bucket($storageName);
-        $object = $bucket->newObject($key, $data);
-        $object->store();
+        $this->store($storageName, $key, $data);
     }
 
     /**
@@ -84,12 +95,7 @@ class RiakStorage implements Storage
      */
     public function update($storageName, $key, array $data)
     {
-        $bucket = $this->client->bucket($storageName);
-        /** @var $object \Riak\Object */
-        $object = $bucket->get($key);
-
-        $object->setData($data);
-        $object->store();
+        $this->store($storageName, $key, $data);
     }
 
     /**
@@ -97,17 +103,15 @@ class RiakStorage implements Storage
      */
     public function delete($storageName, $key)
     {
-        $bucket = $this->client->bucket($storageName);
+        $location = $this->getRiakLocation($storageName, $key);
 
-        /** @var $object \Riak\Object */
-        $object = $bucket->get($key);
+        $delete = DeleteValue::builder($location)->build();
 
-        if (!$object->exists()) {
-            // object does not exist, do nothing
-            return;
+        try {
+            $this->client->execute($delete);
+        } catch (RiakException $exception) {
+            // deletion can fail silent
         }
-
-        $object->delete();
     }
 
     /**
@@ -115,16 +119,29 @@ class RiakStorage implements Storage
      */
     public function find($storageName, $key)
     {
-        $bucket = $this->client->bucket($storageName);
+        $location = $this->getRiakLocation($storageName, $key);
 
-        /** @var $object \Riak\Object */
-        $object = $bucket->get($key);
+        // fetch object
+        $fetch = FetchValue::builder($location)->build();
 
-        if (!$object->exists()) {
-            throw new NotFoundException;
+        try {
+            $result = $this->client->execute($fetch);
+        } catch (RiakException $exception) {
+            throw new NotFoundException();
         }
 
-        return $object->getData();
+        $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);
     }
 
     /**

lib/Doctrine/KeyValueStore/Storage/SimpleDbStorage.php

@@ -1,29 +1,30 @@
 <?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>.
-*/
+ * 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\KeyValueStore\Storage;
 
-use Doctrine\KeyValueStore\NotFoundException;
-use Doctrine\KeyValueStore\KeyValueStoreException;
-use Aws\SimpleDb\SimpleDbClient;
 use Aws\SimpleDb\Exception\NoSuchDomainException;
 use Aws\SimpleDb\Exception\SimpleDbException;
+use Aws\SimpleDb\SimpleDbClient;
+use Doctrine\KeyValueStore\KeyValueStoreException;
+use Doctrine\KeyValueStore\NotFoundException;
 
 /**
  * SimpleDb storage
@@ -78,11 +79,11 @@ class SimpleDbStorage implements Storage
     {
         $this->createDomain($storageName);
 
-        $this->client->putAttributes(array(
+        $this->client->putAttributes([
             'DomainName' => $storageName,
             'ItemName'   => $key,
             'Attributes' => $this->makeAttributes($data),
-        ));
+        ]);
     }
 
     /**
@@ -98,10 +99,10 @@ class SimpleDbStorage implements Storage
      */
     public function delete($storageName, $key)
     {
-        $this->client->deleteAttributes(array(
+        $this->client->deleteAttributes([
             'DomainName' => $storageName,
             'ItemName'   => $key,
-        ));
+        ]);
     }
 
     /**
@@ -109,19 +110,19 @@ class SimpleDbStorage implements Storage
      */
     public function find($storageName, $key)
     {
-        $select = "select * from {$storageName} where itemName() = '{$key}'";
+        $select = 'select * from ' . $storageName . ' where itemName() = \'' . $key . '\'';
 
-        $iterator = $this->client->select(array(
+        $iterator = $this->client->select([
             'SelectExpression' => $select,
-        ));
-        
+        ]);
+
         $results = $iterator->get('Items');
 
         if (count($results)) {
             $result = array_shift($results);
 
-            $data = array('id' => $result['Name']);
-        
+            $data = ['id' => $result['Name']];
+
             foreach ($result['Attributes'] as $attribute) {
                 $data[$attribute['Name']] = $attribute['Value'];
             }
@@ -148,11 +149,11 @@ class SimpleDbStorage implements Storage
     protected function createDomain($domainName)
     {
         try {
-            $domain = $this->client->domainMetadata(array('DomainName' => $domainName));
+            $domain = $this->client->domainMetadata(['DomainName' => $domainName]);
         } catch (NoSuchDomainException $e) {
-            $this->client->createDomain(array('DomainName' => $domainName));
+            $this->client->createDomain(['DomainName' => $domainName]);
 
-            $domain = $this->client->domainMetadata(array('DomainName' => $domainName));
+            $domain = $this->client->domainMetadata(['DomainName' => $domainName]);
         } catch (SimpleDbException $e) {
             throw new KeyValueStoreException($e->getMessage(), 0, $e);
         }
@@ -161,23 +162,23 @@ class SimpleDbStorage implements Storage
     }
 
     /**
-     * @param string $key 
-     * @param array $data 
+     * @param string $key
+     * @param array  $data
      */
     protected function makeAttributes($data)
     {
-        $attributes = array();
+        $attributes = [];
 
         foreach ($data as $name => $value) {
-            if ($value !== null && $value !== array() && $value !== '') {
-                $attributes[] = array(
-                    'Name' => $name,
-                    'Value' => $value,
+            if ($value !== null && $value !== [] && $value !== '') {
+                $attributes[] = [
+                    'Name'    => $name,
+                    'Value'   => $value,
                     'Replace' => true,
-                );
+                ];
             }
         }
 
         return $attributes;
     }
-}
+}

lib/Doctrine/KeyValueStore/Storage/Storage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -47,70 +48,67 @@ interface Storage
      *
      * @return bool
      */
-    function supportsPartialUpdates();
+    public function supportsPartialUpdates();
 
     /**
      * Does this storage support composite primary keys?
      *
      * @return bool
      */
-    function supportsCompositePrimaryKeys();
+    public function supportsCompositePrimaryKeys();
 
     /**
      * Does this storage require composite primary keys?
      *
      * @return bool
      */
-    function requiresCompositePrimaryKeys();
+    public function requiresCompositePrimaryKeys();
 
     /**
      * Insert data into the storage key specified.
      *
-     * @param string $storageName
+     * @param string       $storageName
      * @param array|string $key
-     * @param array $data
-     * @return void
+     * @param array        $data
      */
-    function insert($storageName, $key, array $data);
+    public function insert($storageName, $key, array $data);
 
     /**
      * Update data into the given key.
      *
-     * @param string $storageName
+     * @param string       $storageName
      * @param array|string $key
-     * @param array $data
-     * @return void
+     * @param array        $data
      */
-    function update($storageName, $key, array $data);
+    public function update($storageName, $key, array $data);
 
     /**
      * Delete data at key
      *
-     * @param string $storageName
+     * @param string       $storageName
      * @param array|string $key
-     * @return void
      */
-    function delete($storageName, $key);
+    public function delete($storageName, $key);
 
     /**
      * Find data at key
      *
      * Important note: The returned array does contain the identifier (again)!
      *
+     *
+     * @param string       $storageName
+     * @param array|string $key
+     *
      * @throws Doctrine\KeyValueStore\NotFoundException When data with key is not found.
      *
-     * @param string $storageName
-     * @param array|string $key
      * @return array
      */
-    function find($storageName, $key);
+    public function find($storageName, $key);
 
     /**
      * Return a name of the underlying storage.
      *
      * @return string
      */
-    function getName();
+    public function getName();
 }
-
-

lib/Doctrine/KeyValueStore/Storage/StorageException.php

@@ -1,14 +1,21 @@
 <?php
-/**
- * Doctrine KeyValueStore
+
+/*
+ * 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.
  *
- * LICENSE
- *
- * This source file is subject to the MIT license that is bundled
- * with this package in the file LICENSE.txt.
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to kontakt@beberlei.de so I can send you a copy immediately.
+ * 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\KeyValueStore\Storage;
@@ -18,4 +25,3 @@ use Doctrine\KeyValueStore\KeyValueStoreException;
 class StorageException extends KeyValueStoreException
 {
 }
-

lib/Doctrine/KeyValueStore/Storage/WindowsAzureTable/AuthorizationSchema.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -16,13 +17,17 @@
  * and is licensed under the MIT license. For more information, see
  * <http://www.doctrine-project.org>.
  */
+
 namespace Doctrine\KeyValueStore\Storage\WindowsAzureTable;
 
 /**
  * Abstraction for WindowsAzure Authorization Schemes
  *
  * @link http://msdn.microsoft.com/en-us/library/windowsazure/dd179428.aspx
+ *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
+ *
+ * @deprecated This class is deprecated and will be removed in 2.0.
  */
 interface AuthorizationSchema
 {
@@ -33,9 +38,9 @@ interface AuthorizationSchema
      * @param string $path
      * @param string $queryString
      * @param string $body
-     * @param array $headers
+     * @param array  $headers
+     *
      * @return string
      */
-    function signRequest($method, $path, $queryString, $body, array $headers);
+    public function signRequest($method, $path, $queryString, $body, array $headers);
 }
-

lib/Doctrine/KeyValueStore/Storage/WindowsAzureTable/HttpStorageException.php

@@ -1,22 +1,30 @@
 <?php
-/**
- * Doctrine Key Value Store
+
+/*
+ * 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.
  *
- * LICENSE
- *
- * This source file is subject to the MIT license that is bundled
- * with this package in the file LICENSE.txt.
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to kontakt@beberlei.de so I can send you a copy immediately.
+ * 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\KeyValueStore\Storage\WindowsAzureTable;
 
 use Doctrine\KeyValueStore\Storage\StorageException;
 
+/**
+ * @deprecated This class is deprecated and will be removed in 2.0.
+ */
 class HttpStorageException extends StorageException
 {
-    
 }
-

lib/Doctrine/KeyValueStore/Storage/WindowsAzureTable/SharedKeyAuthorization.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -19,6 +20,9 @@
 
 namespace Doctrine\KeyValueStore\Storage\WindowsAzureTable;
 
+/**
+ * @deprecated This class is deprecated and will be removed in 2.0.
+ */
 class SharedKeyAuthorization implements AuthorizationSchema
 {
     /**
@@ -33,7 +37,7 @@ class SharedKeyAuthorization implements AuthorizationSchema
     public function __construct($accountName, $accountKey)
     {
         $this->accountName = $accountName;
-        $this->accountKey = base64_decode($accountKey);
+        $this->accountKey  = base64_decode($accountKey);
     }
 
     /**
@@ -42,13 +46,13 @@ class SharedKeyAuthorization implements AuthorizationSchema
      */
     public function signRequest($method, $path, $queryString, $body, array $headers)
     {
-        $canonicalResource = "/" . $this->accountName . $path;
-        $stringToSign =  $method . "\n" .
+        $canonicalResource = '/' . $this->accountName . $path;
+        $stringToSign      = $method . "\n" .
                         md5($body) . "\n" .
                         "application/atom+xml\n" .
                         $headers['x-ms-date'] . "\n" .
                         $canonicalResource;
-        return "Authorization: SharedKey " . $this->accountName . ":" . base64_encode(hash_hmac('sha256', $stringToSign, $this->accountKey, true));
+        return 'Authorization: SharedKey ' . $this->accountName . ':' .
+            base64_encode(hash_hmac('sha256', $stringToSign, $this->accountKey, true));
     }
 }
-

lib/Doctrine/KeyValueStore/Storage/WindowsAzureTable/SharedKeyLiteAuthorization.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -19,6 +20,9 @@
 
 namespace Doctrine\KeyValueStore\Storage\WindowsAzureTable;
 
+/**
+ * @deprecated This class is deprecated and will be removed in 2.0.
+ */
 class SharedKeyLiteAuthorization implements AuthorizationSchema
 {
     /**
@@ -33,7 +37,7 @@ class SharedKeyLiteAuthorization implements AuthorizationSchema
     public function __construct($accountName, $accountKey)
     {
         $this->accountName = $accountName;
-        $this->accountKey = base64_decode($accountKey);
+        $this->accountKey  = base64_decode($accountKey);
     }
 
     /**
@@ -42,10 +46,10 @@ class SharedKeyLiteAuthorization implements AuthorizationSchema
      */
     public function signRequest($method, $path, $queryString, $body, array $headers)
     {
-        $canonicalResource = "/" . $this->accountName . $path;
-        $stringToSign = $headers['x-ms-date'] . "\n" .
+        $canonicalResource = '/' . $this->accountName . $path;
+        $stringToSign      = $headers['x-ms-date'] . "\n" .
                         $canonicalResource;
-        return "Authorization: SharedKeyLite " . $this->accountName . ":" . base64_encode(hash_hmac('sha256', $stringToSign, $this->accountKey, true));
+        return 'Authorization: SharedKeyLite ' . $this->accountName . ':' .
+            base64_encode(hash_hmac('sha256', $stringToSign, $this->accountKey, true));
     }
 }
-

lib/Doctrine/KeyValueStore/Storage/WindowsAzureTableStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -20,11 +21,11 @@
 namespace Doctrine\KeyValueStore\Storage;
 
 use Doctrine\KeyValueStore\Http\Client;
-use Doctrine\KeyValueStore\Storage\WindowsAzureTable\AuthorizationSchema;
-use Doctrine\KeyValueStore\Storage\WindowsAzureTable\HttpStorageException;
+use Doctrine\KeyValueStore\NotFoundException;
 use Doctrine\KeyValueStore\Query\RangeQuery;
 use Doctrine\KeyValueStore\Query\RangeQueryStorage;
-use Doctrine\KeyValueStore\NotFoundException;
+use Doctrine\KeyValueStore\Storage\WindowsAzureTable\AuthorizationSchema;
+use Doctrine\KeyValueStore\Storage\WindowsAzureTable\HttpStorageException;
 
 /**
  * Storage implementation for Microsoft Windows Azure Table.
@@ -32,14 +33,15 @@ use Doctrine\KeyValueStore\NotFoundException;
  * Using a HTTP client to communicate with the REST API of Azure Table.
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @deprecated Use the AzureSdkTableStorage instead, this will be unmaintained.
+ *
+ * @deprecated This class is deprecated and will be removed in 2.0, use the AzureSdkTableStorage instead.
  */
 class WindowsAzureTableStorage implements Storage, RangeQueryStorage
 {
     const WINDOWS_AZURE_TABLE_BASEURL = 'https://%s.table.core.windows.net';
 
     const METADATA_NS = 'http://schemas.microsoft.com/ado/2007/08/dataservices/metadata';
-    const DATA_NS = 'http://schemas.microsoft.com/ado/2007/08/dataservices';
+    const DATA_NS     = 'http://schemas.microsoft.com/ado/2007/08/dataservices';
 
     /**
      * @var string
@@ -59,7 +61,7 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
 </entry>';
 
     const XML_TEMPLATE_TABLE = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom"> 
+<entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom">
 <title />
 <updated></updated>
 <author>
@@ -73,12 +75,12 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
   </content>
 </entry>';
 
-    const TYPE_INT32 = 'Edm.Int32';
-    const TYPE_INT64 = 'Edm.Int64';
+    const TYPE_INT32    = 'Edm.Int32';
+    const TYPE_INT64    = 'Edm.Int64';
     const TYPE_DATETIME = 'Edm.DateTime';
-    const TYPE_BOOLEAN = 'Edm.Boolean';
-    const TYPE_DOUBLE = 'Edm.Double';
-    const TYPE_BINARY = 'Edm.Binary';
+    const TYPE_BOOLEAN  = 'Edm.Boolean';
+    const TYPE_DOUBLE   = 'Edm.Double';
+    const TYPE_BINARY   = 'Edm.Binary';
 
     /**
      * @var \Doctrine\KeyValueStore\Http\Client
@@ -101,16 +103,16 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
     private $now;
 
     /**
-     * @param HttpClient $client
+     * @param HttpClient          $client
      * @param AuthorizationSchema $authorization
      */
     public function __construct(Client $client, $accountName, AuthorizationSchema $authorization, \DateTime $now = null)
     {
-        $this->client = $client;
+        $this->client        = $client;
         $this->authorization = $authorization;
-        $this->baseUrl = sprintf(self::WINDOWS_AZURE_TABLE_BASEURL, $accountName);
-        $this->now = $now ? clone $now : new \DateTime();
-        $this->now->setTimeZone(new \DateTimeZone("UTC"));
+        $this->baseUrl       = sprintf(self::WINDOWS_AZURE_TABLE_BASEURL, $accountName);
+        $this->now           = $now ? clone $now : new \DateTime();
+        $this->now->setTimeZone(new \DateTimeZone('UTC'));
     }
 
     public function supportsPartialUpdates()
@@ -130,9 +132,9 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
 
     public function insert($storageName, $key, array $data)
     {
-        $headers = array(
+        $headers = [
             'Content-Type' => 'application/atom+xml',
-        );
+        ];
         // TODO: This sucks
         $tableName = $storageName;
 
@@ -147,15 +149,13 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
         $contentNodes->item(0)->appendChild($propertiesNode);
         $xml = $dom->saveXML();
 
-        $url = $this->baseUrl . '/' . $tableName;
+        $url      = $this->baseUrl . '/' . $tableName;
         $response = $this->request('POST', $url, $xml, $headers);
 
         if ($response->getStatusCode() == 404) {
-
             $this->createTable($tableName);
             $this->insert($storageName, $key, $data);
-        } else if ($response->getStatusCode() >= 400) {
-
+        } elseif ($response->getStatusCode() >= 400) {
             $this->convertResponseToException($response);
         }
     }
@@ -168,22 +168,22 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
         $node = $dom->getElementsByTagName('Message')->item(0);
 
         throw new HttpStorageException(
-            $node ? $node->nodeValue : "An error has occured"
+            $node ? $node->nodeValue : 'An error has occured'
         );
     }
 
     public function createTable($tableName)
     {
-        $headers = array(
+        $headers = [
             'Content-Type' => 'application/atom+xml',
-        );
+        ];
 
-        $dom = $this->createDomDocumentRequestBody(self::XML_TEMPLATE_TABLE);
+        $dom       = $this->createDomDocumentRequestBody(self::XML_TEMPLATE_TABLE);
         $tableNode = $dom->getElementsByTagNameNS(self::DATA_NS, 'TableName')->item(0);
         $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) {
@@ -195,11 +195,11 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
 
     public function update($storageName, $key, array $data)
     {
-        $headers = array(
+        $headers = [
             'Content-Type' => 'application/atom+xml',
-            'x-ms-date' => $this->now(),
-            'If-Match' => '*',
-        );
+            'x-ms-date'    => $this->now(),
+            'If-Match'     => '*',
+        ];
         // TODO: This sucks
         $tableName = $storageName;
 
@@ -209,10 +209,14 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
 
         $this->serializeKeys($propertiesNode, $key);
         $this->serializeProperties($propertiesNode, $key, $data);
-        $keys = array_values($key);
-        $clientUrl = $this->baseUrl . '/' . $tableName . ("(PartitionKey='" . $keys[0] . "', RowKey='" . $keys[1] . "')");
-        $url = $this->baseUrl . '/' . $tableName . rawurlencode("(PartitionKey='" . $keys[0] . "', RowKey='" . $keys[1] . "')");
-        $idNode = $dom->getElementsByTagName('id')->item(0);
+        $keys      = array_values($key);
+        $clientUrl = $this->baseUrl . '/' . $tableName . (
+            "(PartitionKey='" . $keys[0] . "', RowKey='" . $keys[1] . "')"
+        );
+        $url       = $this->baseUrl . '/' . $tableName . rawurlencode(
+            "(PartitionKey='" . $keys[0] . "', RowKey='" . $keys[1] . "')"
+        );
+        $idNode    = $dom->getElementsByTagName('id')->item(0);
         $idNode->appendChild($dom->createTextNode($clientUrl));
 
         $contentNodes = $dom->getElementsByTagName('content');
@@ -228,17 +232,19 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
 
     public function delete($storageName, $key)
     {
-        $headers = array(
-            'Content-Type' => 'application/atom+xml',
-            'x-ms-date' => $this->now(),
+        $headers = [
+            'Content-Type'   => 'application/atom+xml',
+            'x-ms-date'      => $this->now(),
             'Content-Length' => 0,
-            'If-Match' => '*',
-        );
+            'If-Match'       => '*',
+        ];
 
         // TODO: This sucks
         $tableName = $storageName;
-        $keys = array_values($key);
-        $url = $this->baseUrl . '/' . $tableName . rawurlencode("(PartitionKey='" . $keys[0] . "', RowKey='" . $keys[1] . "')");
+        $keys      = array_values($key);
+        $url       = $this->baseUrl . '/' . $tableName . rawurlencode(
+            "(PartitionKey='" . $keys[0] . "', RowKey='" . $keys[1] . "')"
+        );
 
         $response = $this->request('DELETE', $url, '', $headers);
 
@@ -249,16 +255,18 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
 
     public function find($storageName, $key)
     {
-        $headers = array(
-            'Content-Type' => 'application/atom+xml',
-            'x-ms-date' => $this->now(),
+        $headers = [
+            'Content-Type'   => 'application/atom+xml',
+            'x-ms-date'      => $this->now(),
             'Content-Length' => 0,
-        );
+        ];
 
         // TODO: This sucks
         $tableName = $storageName;
-        $keys = array_values($key);
-        $url = $this->baseUrl . '/' . $tableName . rawurlencode("(PartitionKey='" . $keys[0] . "', RowKey='" . $keys[1] . "')");
+        $keys      = array_values($key);
+        $url       = $this->baseUrl . '/' . $tableName . rawurlencode(
+            "(PartitionKey='" . $keys[0] . "', RowKey='" . $keys[1] . "')"
+        );
 
         $response = $this->request('GET', $url, '', $headers);
 
@@ -276,7 +284,7 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
         $xpath = new \DOMXpath($dom);
         $xpath->registerNamespace('d', 'http://schemas.microsoft.com/ado/2007/08/dataservices');
         $xpath->registerNamespace('m', 'http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
-        $xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom");
+        $xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
         $entries = $xpath->evaluate('/atom:entry');
 
         return $this->createRow(array_keys($key), $xpath, $entries->item(0));
@@ -286,21 +294,21 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
     {
         $properties = $xpath->evaluate('atom:content/m:properties/d:*', $entry);
 
-        $data = array();
+        $data                        = [];
         list($partitionKey, $rowKey) = $keyNames;
 
         foreach ($properties as $property) {
             $name = substr($property->tagName, 2);
-            if ($name == "PartitionKey") {
+            if ($name == 'PartitionKey') {
                 $name = $partitionKey;
-            } else if ($name == "RowKey") {
+            } elseif ($name == 'RowKey') {
                 $name = $rowKey;
             }
 
             $value = $property->nodeValue;
             if ($property->hasAttributeNS(self::METADATA_NS, 'null')) {
                 $value = null;
-            } else if ($property->hasAttributeNS(self::METADATA_NS, 'type')) {
+            } elseif ($property->hasAttributeNS(self::METADATA_NS, 'type')) {
                 $type = $property->getAttributeNS(self::METADATA_NS, 'type');
                 switch ($type) {
                     case self::TYPE_BOOLEAN:
@@ -310,7 +318,7 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
                         $value = new \DateTime(substr($value, 0, 19), new \DateTimeZone('UTC'));
                         break;
                     case self::TYPE_INT32:
-                        $value = (int)$value;
+                        $value = (int) $value;
                         break;
                 }
             }
@@ -322,23 +330,25 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
 
     public function executeRangeQuery(RangeQuery $query, $storageName, $key, \Closure $hydrateRow = null)
     {
-        $headers = array(
-            'Content-Type' => 'application/atom+xml',
-            'x-ms-date' => $this->now(),
+        $headers = [
+            'Content-Type'   => 'application/atom+xml',
+            'x-ms-date'      => $this->now(),
             'Content-Length' => 0,
-        );
+        ];
 
-        $filters = array("PartitionKey eq " . $this->quoteFilterValue($query->getPartitionKey()));
+        $filters = ['PartitionKey eq ' . $this->quoteFilterValue($query->getPartitionKey())];
         foreach ($query->getConditions() as $condition) {
-            if ( ! in_array($condition[0], array('eq', 'neq', 'le', 'lt', 'ge', 'gt'))) {
-                throw new \InvalidArgumentException("Windows Azure Table only supports eq, neq, le, lt, ge, gt as conditions.");
+            if (! in_array($condition[0], ['eq', 'neq', 'le', 'lt', 'ge', 'gt'])) {
+                throw new \InvalidArgumentException(
+                    'Windows Azure Table only supports eq, neq, le, lt, ge, gt as conditions.'
+                );
             }
-            $filters[] = $key[1] . " " . $condition[0] . " " . $this->quoteFilterValue($condition[1]);
+            $filters[] = $key[1] . ' ' . $condition[0] . ' ' . $this->quoteFilterValue($condition[1]);
         }
 
         // TODO: This sucks
         $tableName = $storageName;
-        $url = $this->baseUrl . '/' . $tableName . '()?$filter=' . rawurlencode(implode(' ', $filters));
+        $url       = $this->baseUrl . '/' . $tableName . '()?$filter=' . rawurlencode(implode(' ', $filters));
         if ($query->getLimit()) {
             $url .= '&$top=' . $query->getLimit();
         }
@@ -355,12 +365,12 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
         $xpath = new \DOMXpath($dom);
         $xpath->registerNamespace('d', 'http://schemas.microsoft.com/ado/2007/08/dataservices');
         $xpath->registerNamespace('m', 'http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
-        $xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom");
+        $xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
         $entries = $xpath->evaluate('/atom:feed/atom:entry');
 
-        $results = array();
+        $results = [];
         foreach ($entries as $entry) {
-            $data = $this->createRow($key, $xpath, $entry);
+            $data      = $this->createRow($key, $xpath, $entry);
             $results[] = $hydrateRow ? $hydrateRow($data) : $data;
         }
 
@@ -373,7 +383,7 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
             return $value;
         }
 
-        return "'" . str_replace("'", "", $value) . "'";
+        return "'" . str_replace("'", '', $value) . "'";
     }
 
     public function getName()
@@ -407,7 +417,7 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
         if ($propertyValue instanceof \DateTime) {
             return self::TYPE_DATETIME;
         }
-        return null;
+        return;
     }
 
     private function convertPropertyValue($propertyValue, $type)
@@ -417,7 +427,7 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
                 $propertyValue = $this->isoDate($propertyValue);
                 break;
             case self::TYPE_BOOLEAN:
-                $propertyValue = $propertyValue ? "1" : "0";
+                $propertyValue = $propertyValue ? '1' : '0';
                 break;
         }
         return $propertyValue;
@@ -429,7 +439,11 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
         foreach ($key as $keyName => $keyValue) {
             switch ($keys) {
                 case 0:
-                    $partitionKey = $propertiesNode->ownerDocument->createElementNS(self::DATA_NS, 'PartitionKey', $keyValue);
+                    $partitionKey = $propertiesNode->ownerDocument->createElementNS(
+                        self::DATA_NS,
+                        'PartitionKey',
+                        $keyValue
+                    );
                     $propertiesNode->appendChild($partitionKey);
                     break;
                 case 1:
@@ -437,27 +451,27 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
                     $propertiesNode->appendChild($rowKey);
                     break;
                 default:
-                    throw new \RuntimeException("Only exactly 2 composite key fields allowed.");
+                    throw new \RuntimeException('Only exactly 2 composite key fields allowed.');
             }
-            $keys++;
+            ++$keys;
         }
     }
 
     private function request($method, $url, $xml, $headers)
     {
-        $parts = parse_url($url);
-        $requestDate = $this->now->format('D, d M Y H:i:s') . ' GMT';
-        $headers['Content-Length'] = strlen($xml);
-        $headers['Date'] = $requestDate;
-        $headers['x-ms-date'] = $requestDate;
-        $authorizationHeader = $this->authorization->signRequest(
+        $parts                           = parse_url($url);
+        $requestDate                     = $this->now->format('D, d M Y H:i:s') . ' GMT';
+        $headers['Content-Length']       = strlen($xml);
+        $headers['Date']                 = $requestDate;
+        $headers['x-ms-date']            = $requestDate;
+        $authorizationHeader             = $this->authorization->signRequest(
             $method,
             isset($parts['path']) ? $parts['path'] : '/',
             isset($parts['query']) ? $parts['query'] : '',
             $xml,
             $headers
         );
-        $authorizationParts = explode(":" , $authorizationHeader, 2);
+        $authorizationParts              = explode(':', $authorizationHeader, 2);
         $headers[$authorizationParts[0]] = ltrim($authorizationParts[1]);
         return $this->client->request($method, $url, $xml, $headers);
     }
@@ -465,11 +479,11 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
     private function serializeProperties($propertiesNode, array $key, array $data)
     {
         foreach ($data as $propertyName => $propertyValue) {
-            if ( isset($key[$propertyName])) {
+            if (isset($key[$propertyName])) {
                 continue;
             }
 
-            $type = $this->getPropertyType($propertyValue);
+            $type          = $this->getPropertyType($propertyValue);
             $propertyValue = $this->convertPropertyValue($propertyValue, $type);
 
             $property = $propertiesNode->ownerDocument->createElementNS(self::DATA_NS, $propertyName, $propertyValue);
@@ -481,4 +495,3 @@ class WindowsAzureTableStorage implements Storage, RangeQueryStorage
         }
     }
 }
-

lib/Doctrine/KeyValueStore/UnitOfWork.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -55,9 +56,9 @@ class UnitOfWork
     private $identifiers;
 
     private $originalData;
-    private $scheduledInsertions = array();
-    private $scheduledDeletions  = array();
-    private $identityMap         = array();
+    private $scheduledInsertions = [];
+    private $scheduledDeletions  = [];
+    private $identityMap         = [];
     private $idConverter;
 
     public function __construct(ClassMetadataFactory $cmf, Storage $storageDriver, Configuration $config = null)
@@ -81,16 +82,16 @@ class UnitOfWork
         if (isset($this->identityMap[$className][$idHash])) {
             return $this->identityMap[$className][$idHash];
         }
-        return null;
+        return;
     }
 
-    public function reconsititute($className, $key)
+    public function reconstititute($className, $key)
     {
         $class = $this->cmf->getMetadataFor($className);
         $id    = $this->idHandler->normalizeId($class, $key);
         $data  = $this->storageDriver->find($class->storageName, $id);
 
-        if (!$data) {
+        if (! $data) {
             throw new NotFoundException();
         }
 
@@ -99,16 +100,18 @@ class UnitOfWork
 
     public function createEntity($class, $id, $data)
     {
-        if ( isset($data['php_class'])) {
-            if ( $data['php_class'] !== $class->name && ! is_subclass_of($data['php_class'], $class->name)) {
-                throw new \RuntimeException("Row is of class '" . $data['php_class'] . "' which is not a subtype of expected " . $class->name);
+        if (isset($data['php_class'])) {
+            if ($data['php_class'] !== $class->name && ! is_subclass_of($data['php_class'], $class->name)) {
+                throw new \RuntimeException(
+                    "Row is of class '" . $data['php_class'] . "' which is not a subtype of expected " . $class->name
+                );
             }
             $class = $this->cmf->getMetadataFor($data['php_class']);
         }
         unset($data['php_class']);
 
         $object = $this->tryGetById($class->name, $id);
-        if ( $object) {
+        if ($object) {
             return $object;
         }
 
@@ -136,16 +139,16 @@ class UnitOfWork
     private function computeChangeSet($class, $object)
     {
         $snapshot     = $this->getObjectSnapshot($class, $object);
-        $changeSet    = array();
+        $changeSet    = [];
         $originalData = $this->originalData[spl_object_hash($object)];
 
         foreach ($snapshot as $field => $value) {
-            if ( ! isset($originalData[$field]) || $originalData[$field] !== $value) {
+            if (! isset($originalData[$field]) || $originalData[$field] !== $value) {
                 $changeSet[$field] = $value;
             }
         }
 
-        if ( $changeSet && ! $this->storageDriver->supportsPartialUpdates()) {
+        if ($changeSet && ! $this->storageDriver->supportsPartialUpdates()) {
             $changeSet = array_merge($originalData, $changeSet);
         }
         return $changeSet;
@@ -153,16 +156,16 @@ class UnitOfWork
 
     private function getObjectSnapshot($class, $object)
     {
-        $data = array();
+        $data = [];
 
         foreach ($class->reflFields as $fieldName => $reflProperty) {
-            if ( ! isset( $class->fields[$fieldName]['id'])) {
+            if (! isset($class->fields[$fieldName]['id'])) {
                 $data[$fieldName] = $reflProperty->getValue($object);
             }
         }
 
         foreach (get_object_vars($object) as $property => $value) {
-            if ( ! isset($data[$property])) {
+            if (! isset($data[$property])) {
                 $data[$property] = $value;
             }
         }
@@ -180,14 +183,14 @@ class UnitOfWork
         $class = $this->cmf->getMetadataFor(get_class($object));
         $id    = $this->idHandler->getIdentifier($class, $object);
 
-        if ( ! $id) {
-            throw new \RuntimeException("Trying to persist entity that has no id.");
+        if (! $id) {
+            throw new \RuntimeException('Trying to persist entity that has no id.');
         }
 
         $idHash = $this->idHandler->hash($id);
 
         if (isset($this->identityMap[$class->name][$idHash])) {
-            throw new \RuntimeException("Object with ID already exists.");
+            throw new \RuntimeException('Object with ID already exists.');
         }
 
         $this->scheduledInsertions[$oid]          = $object;
@@ -197,8 +200,10 @@ class UnitOfWork
     public function scheduleForDelete($object)
     {
         $oid = spl_object_hash($object);
-        if (!isset($this->identifiers[$oid])) {
-            throw new \RuntimeException("Object scheduled for deletion is not managed. Only managed objects can be deleted.");
+        if (! isset($this->identifiers[$oid])) {
+            throw new \RuntimeException(
+                'Object scheduled for deletion is not managed. Only managed objects can be deleted.'
+            );
         }
         $this->scheduledDeletions[$oid] = $object;
     }
@@ -209,7 +214,7 @@ class UnitOfWork
             foreach ($entities as $object) {
                 $hash = spl_object_hash($object);
 
-                if ( isset($this->scheduledInsertions[$hash])) {
+                if (isset($this->scheduledInsertions[$hash])) {
                     continue;
                 }
 
@@ -237,8 +242,8 @@ class UnitOfWork
             $id    = $this->idHandler->getIdentifier($class, $object);
             $id    = $this->idConverter->serialize($class, $id);
 
-            if ( ! $id) {
-                throw new \RuntimeException("Trying to persist entity that has no id.");
+            if (! $id) {
+                throw new \RuntimeException('Trying to persist entity that has no id.');
             }
 
             $data              = $this->getObjectSnapshot($class, $object);
@@ -275,17 +280,16 @@ class UnitOfWork
         $this->processInsertions();
         $this->processDeletions();
 
-        $this->scheduledInsertions = array();
-        $this->scheduledDeletions  = array();
+        $this->scheduledInsertions = [];
+        $this->scheduledDeletions  = [];
     }
 
     public function clear()
     {
-        $this->scheduledInsertions = array();
-        $this->scheduledDeletions  = array();
-        $this->identifiers         = array();
-        $this->originalData        = array();
-        $this->identityMap         = array();
+        $this->scheduledInsertions = [];
+        $this->scheduledDeletions  = [];
+        $this->identifiers         = [];
+        $this->originalData        = [];
+        $this->identityMap         = [];
     }
 }
-

phpunit.xml.dist

@@ -16,5 +16,7 @@
         <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/ConfigurationTest.php

@@ -1,4 +1,23 @@
 <?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;
 
 use Doctrine\KeyValueStore\Configuration;
@@ -16,17 +35,16 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
     public function testDefaultCacheDriver()
     {
         $config = new Configuration();
-        $cache = $config->getMetadataCache();
+        $cache  = $config->getMetadataCache();
 
         $this->assertInstanceOf('Doctrine\Common\Cache\Cache', $cache);
     }
 
     public function testDefaultIdConverterStrategy()
     {
-        $config = new Configuration();
+        $config   = new Configuration();
         $strategy = $config->getIdConverterStrategy();
 
         $this->assertInstanceOf('Doctrine\KeyValueStore\Id\NullIdConverter', $strategy);
     }
 }
-

tests/Doctrine/Tests/KeyValueStore/Functional/BasicCrudTestCase.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -13,7 +14,7 @@
  * 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 LGPL. For more information, see
+ * and is licensed under the MIT license. For more information, see
  * <http://www.doctrine-project.org>.
  */
 
@@ -30,7 +31,6 @@ abstract class BasicCrudTestCase extends KeyValueStoreTestCase
     public function setUp()
     {
         $this->storage = $this->createStorage();
-        $this->manager = $this->createManager($this->storage);
     }
 
     abstract protected function createStorage();
@@ -41,12 +41,17 @@ abstract class BasicCrudTestCase extends KeyValueStoreTestCase
 
     abstract protected function find($id);
 
-    public function testPersistItem()
+    /**
+     * @dataProvider mappingDrivers
+     */
+    public function testPersistItem($mappingDriver)
     {
-        $post = new Post();
-        $post->id = "1";
-        $post->headline = "asdf";
-        $post->text = "foo";
+        $this->manager = $this->createManager($this->storage, $mappingDriver);
+
+        $post           = new Post();
+        $post->id       = '1';
+        $post->headline = 'asdf';
+        $post->text     = 'foo';
 
         $this->manager->persist($post);
         $this->manager->flush();
@@ -54,12 +59,17 @@ abstract class BasicCrudTestCase extends KeyValueStoreTestCase
         $this->assertKeyExists($post->id);
     }
 
-    public function testPersistAndRetrieveItem()
+    /**
+     * @dataProvider mappingDrivers
+     */
+    public function testPersistAndRetrieveItem($mappingDriver)
     {
-        $post = new Post();
-        $post->id = "1";
-        $post->headline = "asdf";
-        $post->text = "foo";
+        $this->manager = $this->createManager($this->storage, $mappingDriver);
+
+        $post           = new Post();
+        $post->id       = '1';
+        $post->headline = 'asdf';
+        $post->text     = 'foo';
 
         $this->manager->persist($post);
         $this->manager->flush();
@@ -68,9 +78,14 @@ abstract class BasicCrudTestCase extends KeyValueStoreTestCase
         $this->assertSame($post, $post2);
     }
 
-    public function testRetrieveItem()
+    /**
+     * @dataProvider mappingDrivers
+     */
+    public function testRetrieveItem($mappingDriver)
     {
-        $this->populate(1, array('id' => 1, 'headline' => 'test', 'body' => 'tset', 'foo' => 'bar', 'php_class' => __NAMESPACE__ . '\\Post'));
+        $this->manager = $this->createManager($this->storage, $mappingDriver);
+
+        $this->populate(1, ['id' => 1, 'headline' => 'test', 'body' => 'tset', 'foo' => 'bar', 'php_class' => __NAMESPACE__ . '\\Post']);
 
         $post = $this->manager->find(__NAMESPACE__ . '\\Post', 1);
 
@@ -82,39 +97,49 @@ abstract class BasicCrudTestCase extends KeyValueStoreTestCase
         $this->assertSame($post, $post2);
     }
 
-    public function testUpdateClass()
+    /**
+     * @dataProvider mappingDrivers
+     */
+    public function testUpdateClass($mappingDriver)
     {
-        $post = new Post();
-        $post->id = "1";
-        $post->headline = "asdf";
-        $post->text = "foo";
+        $this->manager = $this->createManager($this->storage, $mappingDriver);
+
+        $post           = new Post();
+        $post->id       = '1';
+        $post->headline = 'asdf';
+        $post->text     = 'foo';
 
         $this->manager->persist($post);
         $this->manager->flush();
 
-        $post->body = "bar";
-        $post->text = "baz";
+        $post->body = 'bar';
+        $post->text = 'baz';
 
         $this->manager->flush();
 
         $this->assertEquals(
-            array(
-                'id' => 1,
-                'headline' => 'asdf',
-                'body' => 'bar',
-                'text' => 'baz',
-                'php_class' => __NAMESPACE__ . '\\Post'
-            ),
+            [
+                'id'        => 1,
+                'headline'  => 'asdf',
+                'body'      => 'bar',
+                'text'      => 'baz',
+                'php_class' => __NAMESPACE__ . '\\Post',
+            ],
             $this->find(1)
         );
     }
 
-    public function testRemoveClass()
+    /**
+     * @dataProvider mappingDrivers
+     */
+    public function testRemoveClass($mappingDriver)
     {
-        $post = new Post();
-        $post->id = "1";
-        $post->headline = "asdf";
-        $post->text = "foo";
+        $this->manager = $this->createManager($this->storage, $mappingDriver);
+
+        $post           = new Post();
+        $post->id       = '1';
+        $post->headline = 'asdf';
+        $post->text     = 'foo';
 
         $this->manager->persist($post);
         $this->manager->flush();
@@ -126,6 +151,15 @@ abstract class BasicCrudTestCase extends KeyValueStoreTestCase
 
         $this->assertKeyNotExists($post->id);
     }
+
+    public function mappingDrivers()
+    {
+        return [
+            ['annotation'],
+            ['yaml'],
+            ['xml'],
+        ];
+    }
 }
 
 /**
@@ -137,5 +171,4 @@ class Post
     public $id;
     public $headline;
     public $body;
-
 }

tests/Doctrine/Tests/KeyValueStore/Functional/CompositeBasicCrudTest.php

@@ -1,4 +1,23 @@
 <?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\Functional;
 
 use Doctrine\Common\Cache\ArrayCache;
@@ -11,28 +30,27 @@ class CompositeBasicCrudTest extends BasicCrudTestCase
     protected function createStorage()
     {
         $this->cache = new ArrayCache();
-        $storage = new DoctrineCacheStorage($this->cache);
+        $storage     = new DoctrineCacheStorage($this->cache);
         return $storage;
     }
 
     public function assertKeyExists($id)
     {
-        $this->assertTrue($this->cache->contains("post-oid:id=".$id.";"));
+        $this->assertTrue($this->cache->contains('post-oid:id=' . $id . ';'));
     }
 
     public function assertKeyNotExists($id)
     {
-        $this->assertFalse($this->cache->contains("post-oid:id=".$id.";"));
+        $this->assertFalse($this->cache->contains('post-oid:id=' . $id . ';'));
     }
 
     public function populate($id, array $data)
     {
-        $this->cache->save("post-oid:id=".$id.";", $data);
+        $this->cache->save('post-oid:id=' . $id . ';', $data);
     }
 
     public function find($id)
     {
-        return $this->cache->fetch("post-oid:id=".$id.";");
+        return $this->cache->fetch('post-oid:id=' . $id . ';');
     }
 }
-

tests/Doctrine/Tests/KeyValueStore/Functional/InheritanceTest.php

@@ -1,9 +1,28 @@
 <?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\Functional;
 
+use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\KeyValueStore\Mapping\Annotations as KVS;
 use Doctrine\KeyValueStore\Storage\DoctrineCacheStorage;
-use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\Tests\KeyValueStoreTestCase;
 
 class InheritanceTest extends KeyValueStoreTestCase
@@ -11,24 +30,24 @@ class InheritanceTest extends KeyValueStoreTestCase
     private $manager;
     protected $storage;
 
-    public function setUp()
+    /**
+     * @dataProvider mappingDrivers
+     */
+    public function testInheritance($mappingDriver)
     {
-        $cache = new ArrayCache();
-        $storage = new DoctrineCacheStorage($cache);
-        $this->manager = $this->createManager($storage);
-    }
+        $cache         = new ArrayCache();
+        $storage       = new DoctrineCacheStorage($cache);
+        $this->manager = $this->createManager($storage, $mappingDriver);
 
-    public function testInheritance()
-    {
-        $parent = new ParentEntity;
-        $parent->id = 1;
-        $parent->foo = "foo";
+        $parent      = new ParentEntity;
+        $parent->id  = 1;
+        $parent->foo = 'foo';
         $this->manager->persist($parent);
 
-        $child = new ChildEntity;
-        $child->id = 2;
-        $child->foo = "bar";
-        $child->bar = "baz";
+        $child      = new ChildEntity;
+        $child->id  = 2;
+        $child->foo = 'bar';
+        $child->bar = 'baz';
 
         $this->manager->persist($child);
         $this->manager->flush();
@@ -45,6 +64,15 @@ class InheritanceTest extends KeyValueStoreTestCase
         $this->assertEquals('bar', $child->foo);
         $this->assertEquals('baz', $child->bar);
     }
+
+    public function mappingDrivers()
+    {
+        return [
+            ['annotation'],
+            ['yaml'],
+            ['xml'],
+        ];
+    }
 }
 
 /**

tests/Doctrine/Tests/KeyValueStore/Functional/PersistTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -13,41 +14,50 @@
  * 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 LGPL. For more information, see
+ * and is licensed under the MIT license. For more information, see
  * <http://www.doctrine-project.org>.
  */
 
 namespace Doctrine\Tests\KeyValueStore\Functional;
 
-use Doctrine\Tests\KeyValueStoreTestCase;
 use Doctrine\KeyValueStore\Mapping\Annotations as KVS;
+use Doctrine\Tests\KeyValueStoreTestCase;
 
 class PersistTest extends KeyValueStoreTestCase
 {
-    public function testPersistUnmappedThrowsException()
+    /**
+     * @dataProvider mappingDrivers
+     */
+    public function testPersistUnmappedThrowsException($mappingDriver)
     {
-        $manager = $this->createManager();
+        $manager = $this->createManager(null, $mappingDriver);
 
         $this->setExpectedException('InvalidArgumentException', 'stdClass is not a valid key-value-store entity.');
         $manager->persist(new \stdClass());
     }
 
-    public function testPersistWithoutIdThrowsException()
+    /**
+     * @dataProvider mappingDrivers
+     */
+    public function testPersistWithoutIdThrowsException($mappingDriver)
     {
-        $manager = $this->createManager();
+        $manager = $this->createManager(null, $mappingDriver);
         $persist = new PersistEntity();
 
         $this->setExpectedException('RuntimeException', 'Trying to persist entity that has no id.');
         $manager->persist($persist);
     }
 
-    public function testPersistKnownIdThrowsException()
+    /**
+     * @dataProvider mappingDrivers
+     */
+    public function testPersistKnownIdThrowsException($mappingDriver)
     {
-        $manager = $this->createManager();
-        $persist = new PersistEntity();
+        $manager     = $this->createManager(null, $mappingDriver);
+        $persist     = new PersistEntity();
         $persist->id = 1;
 
-        $persist2 = new PersistEntity();
+        $persist2     = new PersistEntity();
         $persist2->id = 1;
 
         $manager->persist($persist);
@@ -55,6 +65,15 @@ class PersistTest extends KeyValueStoreTestCase
         $this->setExpectedException('RuntimeException', 'Object with ID already exists.');
         $manager->persist($persist2);
     }
+
+    public function mappingDrivers()
+    {
+        return [
+            ['annotation'],
+            ['yaml'],
+            ['xml'],
+        ];
+    }
 }
 
 /**

tests/Doctrine/Tests/KeyValueStore/Functional/SingleBasicCrudTest.php

@@ -1,4 +1,23 @@
 <?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\Functional;
 
 use Doctrine\Common\Cache\ArrayCache;
@@ -11,23 +30,23 @@ class SingleBasicCrudTest extends BasicCrudTestCase
     protected function createStorage()
     {
         $this->cache = new ArrayCache();
-        $storage = new DoctrineCacheStorage($this->cache, false);
+        $storage     = new DoctrineCacheStorage($this->cache, false);
         return $storage;
     }
 
     public function assertKeyExists($id)
     {
-        $this->assertTrue($this->cache->contains("post-".$id));
+        $this->assertTrue($this->cache->contains('post-' . $id));
     }
 
     public function assertKeyNotExists($id)
     {
-        $this->assertFalse($this->cache->contains("post-".$id));
+        $this->assertFalse($this->cache->contains('post-' . $id));
     }
 
     public function populate($id, array $data)
     {
-        $this->cache->save("post-".$id, $data);
+        $this->cache->save('post-' . $id, $data);
     }
 
     public function find($id)
@@ -35,4 +54,3 @@ class SingleBasicCrudTest extends BasicCrudTestCase
         return $this->storage->find('post', $id);
     }
 }
-

tests/Doctrine/Tests/KeyValueStore/Functional/Storage/AzureSdkTableTest.php

@@ -1,11 +1,28 @@
 <?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\Functional\Storage;
 
-use Doctrine\Tests\KeyValueStoreTestCase;
-
-use Doctrine\KeyValueStore\Storage\AzureSdkTableStorage;
 use Doctrine\KeyValueStore\Query\RangeQuery;
-
+use Doctrine\KeyValueStore\Storage\AzureSdkTableStorage;
+use Doctrine\Tests\KeyValueStoreTestCase;
 use WindowsAzure\Common\ServicesBuilder;
 
 class AzureSdkTableTest extends KeyValueStoreTestCase
@@ -17,11 +34,11 @@ class AzureSdkTableTest extends KeyValueStoreTestCase
         parent::setUp();
 
         if (empty($GLOBALS['DOCTRINE_KEYVALUE_AZURE_NAME']) || empty($GLOBALS['DOCTRINE_KEYVALUE_AZURE_KEY'])) {
-            $this->markTestSkipped("Missing Azure credentials.");
+            $this->markTestSkipped('Missing Azure credentials.');
         }
 
         $connectionString = sprintf(
-            "DefaultEndpointsProtocol=http;AccountName=%s;AccountKey=%s",
+            'DefaultEndpointsProtocol=http;AccountName=%s;AccountKey=%s',
             $GLOBALS['DOCTRINE_KEYVALUE_AZURE_NAME'],
             $GLOBALS['DOCTRINE_KEYVALUE_AZURE_KEY']
         );
@@ -34,42 +51,42 @@ class AzureSdkTableTest extends KeyValueStoreTestCase
     {
         $storage = $this->storage;
 
-        $key = array("dist" => "sdktest", "range" => time());
-        $storage->insert("test", $key, array("foo" => "bar"));
-        $data = $storage->find("test", $key);
+        $key = ['dist' => 'sdktest', 'range' => time()];
+        $storage->insert('test', $key, ['foo' => 'bar']);
+        $data = $storage->find('test', $key);
 
         $this->assertInstanceOf('DateTime', $data['Timestamp']);
         $this->assertEquals('bar', $data['foo']);
         $this->assertEquals('sdktest', $data['dist']);
         $this->assertEquals($key['range'], $data['range']);
 
-        $storage->update("test", $key, array("foo" => "baz", "bar" => "baz"));
-        $data = $storage->find("test", $key);
+        $storage->update('test', $key, ['foo' => 'baz', 'bar' => 'baz']);
+        $data = $storage->find('test', $key);
 
         $this->assertEquals('baz', $data['foo']);
         $this->assertEquals('baz', $data['bar']);
 
-        $storage->delete("test", $key);
+        $storage->delete('test', $key);
 
         $this->setExpectedException("Doctrine\KeyValueStore\NotFoundException");
-        $storage->find("test", $key);
+        $storage->find('test', $key);
     }
 
     public function testTypes()
     {
         $storage = $this->storage;
 
-        $data = array(
-            "string" => "foo",
-            "date"   => new \DateTime("now"),
-            "int"    => 1234,
-            "float"  => 123.45,
-            "bool"   => false,
-        );
+        $data = [
+            'string' => 'foo',
+            'date'   => new \DateTime('now'),
+            'int'    => 1234,
+            'float'  => 123.45,
+            'bool'   => false,
+        ];
 
-        $key = array("dist" => "sdktest", "range" => time()+1);
-        $storage->insert("test", $key, $data);
-        $data = $storage->find("test", $key);
+        $key = ['dist' => 'sdktest', 'range' => time()+1];
+        $storage->insert('test', $key, $data);
+        $data = $storage->find('test', $key);
 
         $this->assertInstanceOf('DateTime', $data['date']);
         $this->assertInternalType('string', $data['string']);
@@ -83,11 +100,10 @@ class AzureSdkTableTest extends KeyValueStoreTestCase
         $rangeQuery = new RangeQuery($this->createManager(), 'test', 'sdktest');
         $rangeQuery->rangeLessThan(time());
 
-        $data = $this->storage->executeRangeQuery($rangeQuery, 'test', array('dist', 'range'), function($row) {
+        $data = $this->storage->executeRangeQuery($rangeQuery, 'test', ['dist', 'range'], function ($row) {
             return $row;
         });
 
         $this->assertTrue(count($data) > 0);
     }
 }
-

tests/Doctrine/Tests/KeyValueStore/Functional/Storage/CassandraTest.php

@@ -0,0 +1,117 @@
+<?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\Functional\Storage;
+
+use Cassandra;
+use Doctrine\KeyValueStore\Storage\CassandraStorage;
+
+/**
+ * @requires extension cassandra
+ */
+class CassandraTest extends \PHPUnit_Framework_TestCase
+{
+    private $session;
+    private $storage;
+
+    protected function setUp()
+    {
+        $cluster       = Cassandra::cluster()->build();
+        $this->session = $cluster->connect();
+
+        try {
+            $this->session->execute(new \Cassandra\SimpleStatement('DROP KEYSPACE doctrine'));
+        } catch (\Cassandra\Exception\RuntimeException $e) {
+            // Cannot drop non existing keyspace 'doctrine'.
+        }
+
+        $cql       = "CREATE KEYSPACE doctrine WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };";
+        $statement = new \Cassandra\SimpleStatement($cql);
+        $this->session->execute($statement);
+
+        $this->session->execute(new \Cassandra\SimpleStatement('USE doctrine'));
+
+        $cql = 'CREATE TABLE books (id int, author text, title text, PRIMARY KEY (id));';
+
+        $this->session->execute(new \Cassandra\SimpleStatement($cql));
+        $this->storage = new CassandraStorage($this->session);
+    }
+
+    public function testInsert()
+    {
+        $data = [
+            'author' => 'John Doe',
+            'title'  => 'example book',
+        ];
+
+        $this->storage->insert('books', ['id' => 1], $data);
+
+        $cql    = 'SELECT * FROM books WHERE id = 1';
+        $result = $this->session->execute(new \Cassandra\SimpleStatement($cql));
+        $rows   = iterator_to_array($result);
+
+        $this->assertEquals('1', $rows[0]['id']);
+        $this->assertEquals('John Doe', $rows[0]['author']);
+        $this->assertEquals('example book', $rows[0]['title']);
+    }
+
+    public function testFind()
+    {
+        $data = [
+            'author' => 'John Doe',
+            'title'  => 'example book',
+        ];
+
+        $this->storage->insert('books', ['id' => 2], $data);
+
+        $this->assertEquals($data, $this->storage->find('books', ['id' => 2]));
+    }
+
+    public function testUpdate()
+    {
+        $data = [
+            'author' => 'John Doe',
+            'title'  => 'example book',
+        ];
+
+        $this->storage->insert('books', ['id' => 3], $data);
+        $this->storage->update('books', ['id' => 3], ['author' => 'Jane Doe']);
+
+        $this->assertEquals(
+            ['author' => 'Jane Doe', 'title' => 'example book'],
+            $this->storage->find('books', ['id' => 3])
+        );
+    }
+
+    public function testDelete()
+    {
+        $data = [
+            'author' => 'John Doe',
+            'title'  => 'example book',
+        ];
+
+        $this->storage->insert('books', ['id' => 4], $data);
+        $this->storage->delete('books', ['id' => 4]);
+
+        $this->setExpectedException('Doctrine\KeyValueStore\NotFoundException');
+
+        $this->storage->find('books', ['id' => 4]);
+    }
+}

tests/Doctrine/Tests/KeyValueStore/Functional/Storage/WindowsAzureTableTest.php

@@ -1,11 +1,30 @@
 <?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\Functional\Storage;
 
-use Doctrine\Tests\KeyValueStoreTestCase;
-use Doctrine\KeyValueStore\Storage\WindowsAzureTableStorage;
+use Doctrine\KeyValueStore\Http\SocketClient;
 use Doctrine\KeyValueStore\Query\RangeQuery;
 use Doctrine\KeyValueStore\Storage\WindowsAzureTable\SharedKeyLiteAuthorization;
-use Doctrine\KeyValueStore\Http\SocketClient;
+use Doctrine\KeyValueStore\Storage\WindowsAzureTableStorage;
+use Doctrine\Tests\KeyValueStoreTestCase;
 
 class WindowsAzureTableTest extends KeyValueStoreTestCase
 {
@@ -16,7 +35,7 @@ class WindowsAzureTableTest extends KeyValueStoreTestCase
         parent::setUp();
 
         if (empty($GLOBALS['DOCTRINE_KEYVALUE_AZURE_NAME']) || empty($GLOBALS['DOCTRINE_KEYVALUE_AZURE_KEY'])) {
-            $this->markTestSkipped("Missing Azure credentials.");
+            $this->markTestSkipped('Missing Azure credentials.');
         }
 
         switch ($GLOBALS['DOCTRINE_KEYVALUE_AZURE_AUTHSCHEMA']) {
@@ -39,25 +58,25 @@ class WindowsAzureTableTest extends KeyValueStoreTestCase
     {
         $storage = $this->storage;
 
-        $key = array("dist" => "foo", "range" => time());
-        $storage->insert("test", $key, array("foo" => "bar"));
-        $data = $storage->find("test", $key);
+        $key = ['dist' => 'foo', 'range' => time()];
+        $storage->insert('test', $key, ['foo' => 'bar']);
+        $data = $storage->find('test', $key);
 
         $this->assertInstanceOf('DateTime', $data['Timestamp']);
         $this->assertEquals('bar', $data['foo']);
         $this->assertEquals('foo', $data['dist']);
         $this->assertEquals($key['range'], $data['range']);
 
-        $storage->update("test", $key, array("foo" => "baz", "bar" => "baz"));
-        $data = $storage->find("test", $key);
+        $storage->update('test', $key, ['foo' => 'baz', 'bar' => 'baz']);
+        $data = $storage->find('test', $key);
 
         $this->assertEquals('baz', $data['foo']);
         $this->assertEquals('baz', $data['bar']);
 
-        $storage->delete("test", $key);
+        $storage->delete('test', $key);
 
         $this->setExpectedException("Doctrine\KeyValueStore\NotFoundException");
-        $storage->find("test", $key);
+        $storage->find('test', $key);
     }
 
     public function testQueryRange()
@@ -65,11 +84,10 @@ class WindowsAzureTableTest extends KeyValueStoreTestCase
         $rangeQuery = new RangeQuery($this->createManager(), 'test', 'foo');
         $rangeQuery->rangeLessThan(time());
 
-        $data = $this->storage->executeRangeQuery($rangeQuery, 'test', array('dist', 'range'), function($row) {
+        $data = $this->storage->executeRangeQuery($rangeQuery, 'test', ['dist', 'range'], function ($row) {
             return $row;
         });
 
         $this->assertTrue(count($data) > 0);
     }
 }
-

tests/Doctrine/Tests/KeyValueStore/Mapping/ClassMetadataTest.php

@@ -1,8 +1,31 @@
 <?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\Mapping;
 
 use Doctrine\KeyValueStore\Mapping\ClassMetadata;
+use ReflectionClass;
 
+/**
+ * @coversDefaultClass \Doctrine\KeyValueStore\Mapping\ClassMetadata
+ */
 class ClassMetadataTest extends \PHPUnit_Framework_TestCase
 {
     private $metadata;
@@ -20,34 +43,147 @@ class ClassMetadataTest extends \PHPUnit_Framework_TestCase
 
     public function testIdentifier()
     {
-        $this->metadata->mapIdentifier("id");
+        $this->metadata->mapIdentifier('id');
         $this->assertFalse($this->metadata->isCompositeKey);
 
-        $this->metadata->mapIdentifier("id2");
+        $this->metadata->mapIdentifier('id2');
 
-        $this->assertEquals(array("id", "id2"), $this->metadata->identifier);
+        $this->assertEquals(['id', 'id2'], $this->metadata->identifier);
         $this->assertTrue($this->metadata->isCompositeKey);
     }
 
     public function testIdentifierfield()
     {
-        $this->metadata->mapIdentifier("id");
+        $this->metadata->mapIdentifier('id');
 
-        $this->assertEquals(array('id' => array('fieldName' => 'id', 'id' => true)), $this->metadata->fields);
+        $this->assertEquals(['id' => ['fieldName' => 'id', 'id' => true]], $this->metadata->fields);
     }
 
     public function testMapField()
     {
-        $this->metadata->mapField(array('fieldName' => 'metadata'));
-        $this->assertEquals(array('metadata' => array('fieldName' => 'metadata')), $this->metadata->fields);
+        $this->metadata->mapField(['fieldName' => 'metadata']);
+        $this->assertEquals(['metadata' => ['fieldName' => 'metadata']], $this->metadata->fields);
     }
 
     public function testSkipTransientColumns()
     {
         $this->metadata->skipTransientField('metadata');
-        $this->metadata->mapField(array('fieldName' => 'metadata'));
+        $this->metadata->mapField(['fieldName' => 'metadata']);
 
-        $this->assertEquals(array(), $this->metadata->fields);
+        $this->assertEquals([], $this->metadata->fields);
+    }
+
+    /**
+     * @covers ::getIdentifier
+     */
+    public function testGetIdentifier()
+    {
+        $identifier = $this->metadata->getIdentifier();
+
+        $this->assertInternalType('array', $identifier);
+
+        foreach ($identifier as $key => $value) {
+            $this->assertInternalType('integer', $key);
+            $this->assertInternalType('string', $value);
+        }
+    }
+
+    /**
+     * @covers ::getReflectionClass
+     */
+    public function testGetReflectionClass()
+    {
+        $reflectionClass = $this->metadata->getReflectionClass();
+
+        $this->assertInstanceOf(ReflectionClass::class, $reflectionClass);
+        $this->assertSame(__CLASS__, $reflectionClass->name);
+    }
+
+    /**
+     * @covers ::isIdentifier
+     */
+    public function testIsIdentifier()
+    {
+        $this->metadata->mapIdentifier('id');
+
+        $this->assertTrue($this->metadata->isIdentifier('id'));
+        $this->assertFalse($this->metadata->isIdentifier('test'));
+    }
+
+    /**
+     * @covers ::hasField
+     */
+    public function testHasField()
+    {
+        $this->metadata->mapField(['fieldName' => 'foo']);
+
+        $this->assertTrue($this->metadata->hasField('foo'));
+        $this->assertFalse($this->metadata->hasField('bar'));
+    }
+
+    /**
+     * @covers ::hasAssociation
+     */
+    public function testHasAssociation()
+    {
+        $this->assertFalse($this->metadata->hasAssociation(sha1(rand())));
+    }
+
+    /**
+     * @covers ::isSingleValuedAssociation
+     */
+    public function testIsSingleValuedAssociation()
+    {
+        $this->assertFalse($this->metadata->isSingleValuedAssociation(sha1(rand())));
+    }
+
+    /**
+     * @covers ::isCollectionValuedAssociation
+     */
+    public function testIsCollectionValuedAssociation()
+    {
+        $this->assertFalse($this->metadata->isCollectionValuedAssociation(sha1(rand())));
+    }
+
+    /**
+     * @covers ::getFieldNames
+     */
+    public function testGetFieldNames()
+    {
+        $this->metadata->mapField(['fieldName' => 'foo']);
+
+        $fieldNames = $this->metadata->getFieldNames();
+
+        $this->assertInternalType('array', $fieldNames);
+
+        foreach ($fieldNames as $key => $value) {
+            $this->assertInternalType('integer', $key);
+            $this->assertInternalType('string', $value);
+        }
+
+        $this->assertSame(['foo'], $fieldNames);
+    }
+
+    /**
+     * @covers ::getIdentifierFieldNames
+     */
+    public function testGetIdentifierFieldNames()
+    {
+        $identifierFieldNames = $this->metadata->getIdentifierFieldNames();
+
+        $this->assertInternalType('array', $identifierFieldNames);
+
+        foreach ($identifierFieldNames as $key => $value) {
+            $this->assertInternalType('integer', $key);
+            $this->assertInternalType('string', $value);
+        }
+    }
+
+    /**
+     * @covers ::isAssociationInverseSide
+     */
+    public function testIsAssociationInverseSide()
+    {
+        $this->assertFalse($this->metadata->isAssociationInverseSide(sha1(rand())));
     }
 }
-

tests/Doctrine/Tests/KeyValueStore/Query/RangeQueryTest.php

@@ -0,0 +1,250 @@
+<?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\Query;
+
+use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\KeyValueStore\EntityManager;
+use Doctrine\KeyValueStore\Query\RangeQuery;
+use Doctrine\KeyValueStore\Storage\DoctrineCacheStorage;
+use PHPUnit_Framework_TestCase;
+use ReflectionClass;
+use RuntimeException;
+
+/**
+ * @coversDefaultClass \Doctrine\KeyValueStore\Query\RangeQuery
+ */
+class RangeQueryTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var string
+     */
+    private $className;
+
+    /**
+     * @var string
+     */
+    private $partitionKey;
+
+    /**
+     * @var RangeQuery
+     */
+    protected $object;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->entityManager = $this
+            ->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->className    = sha1(rand());
+        $this->partitionKey = sha1(rand());
+
+        $this->object = new RangeQuery(
+            $this->entityManager,
+            $this->className,
+            $this->partitionKey
+        );
+    }
+
+    /**
+     * @covers ::setLimit
+     * @covers ::getLimit
+     */
+    public function testLimit()
+    {
+        $limit = rand();
+
+        $setterOutput = $this->object->setLimit($limit);
+
+        $this->assertInstanceOf(RangeQuery::class, $setterOutput);
+        $this->assertSame($limit, $this->object->getLimit());
+    }
+
+    /**
+     * @covers ::getClassName
+     */
+    public function testGetClassName()
+    {
+        $this->assertSame(
+            $this->className,
+            $this->object->getClassName()
+        );
+    }
+
+    /**
+     * @covers ::getPartitionKey
+     */
+    public function testGetPartitionKey()
+    {
+        $this->assertSame(
+            $this->partitionKey,
+            $this->object->getPartitionKey()
+        );
+    }
+
+    /**
+     * @covers ::getConditions
+     */
+    public function testGetConditions()
+    {
+        $reflectionClass = new ReflectionClass($this->object);
+        $constants       = $reflectionClass->getConstants();
+
+        $conditions = $this->object->getConditions();
+
+        $this->assertInternalType('array', $conditions);
+
+        foreach ($conditions as $condition) {
+            $this->assertArrayHasKey($condition[0], $constants);
+        }
+    }
+
+    /**
+     * @covers ::rangeEquals
+     * @depends testGetConditions
+     */
+    public function testRangeEquals()
+    {
+        $value = 'test';
+
+        $output = $this->object->rangeEquals($value);
+        $this->assertInstanceOf(RangeQuery::class, $output);
+
+        $conditions = $this->object->getConditions();
+        $this->assertArraySubset(
+            [[RangeQuery::CONDITION_EQ, $value]],
+            $conditions
+        );
+    }
+
+    /**
+     * @covers ::rangeNotEquals
+     * @depends testGetConditions
+     */
+    public function testRangeNotEquals()
+    {
+        $value = 'test';
+
+        $output = $this->object->rangeNotEquals($value);
+        $this->assertInstanceOf(RangeQuery::class, $output);
+
+        $conditions = $this->object->getConditions();
+        $this->assertArraySubset(
+            [[RangeQuery::CONDITION_NEQ, $value]],
+            $conditions
+        );
+    }
+
+    /**
+     * @covers ::rangeLessThan
+     * @depends testGetConditions
+     */
+    public function testRangeLessThan()
+    {
+        $value = 'test';
+
+        $output = $this->object->rangeLessThan($value);
+        $this->assertInstanceOf(RangeQuery::class, $output);
+
+        $conditions = $this->object->getConditions();
+        $this->assertArraySubset(
+            [[RangeQuery::CONDITION_LT, $value]],
+            $conditions
+        );
+    }
+
+    /**
+     * @covers ::rangeLessThanEquals
+     * @depends testGetConditions
+     */
+    public function testRangeLessThanEquals()
+    {
+        $value = 'test';
+
+        $output = $this->object->rangeLessThanEquals($value);
+        $this->assertInstanceOf(RangeQuery::class, $output);
+
+        $conditions = $this->object->getConditions();
+        $this->assertArraySubset(
+            [[RangeQuery::CONDITION_LE, $value]],
+            $conditions
+        );
+    }
+
+    /**
+     * @covers ::rangeGreaterThan
+     * @depends testGetConditions
+     */
+    public function testRangeGreaterThan()
+    {
+        $value = 'test';
+
+        $output = $this->object->rangeGreaterThan($value);
+        $this->assertInstanceOf(RangeQuery::class, $output);
+
+        $conditions = $this->object->getConditions();
+        $this->assertArraySubset(
+            [[RangeQuery::CONDITION_GT, $value]],
+            $conditions
+        );
+    }
+
+    /**
+     * @covers ::rangeGreaterThanEquals
+     * @depends testGetConditions
+     */
+    public function testRangeGreaterThanEquals()
+    {
+        $value = 'test';
+
+        $output = $this->object->rangeGreaterThanEquals($value);
+        $this->assertInstanceOf(RangeQuery::class, $output);
+
+        $conditions = $this->object->getConditions();
+        $this->assertArraySubset(
+            [[RangeQuery::CONDITION_GE, $value]],
+            $conditions
+        );
+    }
+
+    /**
+     * @covers ::execute
+     */
+    public function testWrongExecute()
+    {
+        $this->entityManager
+            ->method('unwrap')
+            ->willReturn(new DoctrineCacheStorage(new ArrayCache));
+
+        $this->setExpectedException(RuntimeException::class);
+        $this->object->execute();
+    }
+}

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

@@ -1,4 +1,23 @@
 <?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;
 
 abstract class AbstractStorageTestCase extends \PHPUnit_Framework_TestCase
@@ -20,19 +39,19 @@ abstract class AbstractStorageTestCase extends \PHPUnit_Framework_TestCase
 
     public function testInsertCompositeKey()
     {
-        if ( ! $this->storage->supportsCompositePrimaryKeys()) {
-            $this->markTestSkipped("Composite keys need to be supported for this test to run.");
+        if (! $this->storage->supportsCompositePrimaryKeys()) {
+            $this->markTestSkipped('Composite keys need to be supported for this test to run.');
         }
 
-        $key = array('dist' => 'foo', 'range' => 100);
-        $data = array(
-            'dist' => 'foo',
-            'range' => 100,
-            'name' => 'Test',
-            'value' => 1,
-            'amount' => 200.23,
-            'timestamp' => new \DateTime("2012-03-26 12:12:12")
-        );
+        $key  = ['dist' => 'foo', 'range' => 100];
+        $data = [
+            'dist'      => 'foo',
+            'range'     => 100,
+            'name'      => 'Test',
+            'value'     => 1,
+            'amount'    => 200.23,
+            'timestamp' => new \DateTime('2012-03-26 12:12:12'),
+        ];
 
         $this->mockInsertCompositeKey($key, $data);
         $this->storage->insert('stdClass', $key, $data);
@@ -40,19 +59,19 @@ abstract class AbstractStorageTestCase extends \PHPUnit_Framework_TestCase
 
     public function testUpdateCompositeKey()
     {
-        if ( ! $this->storage->supportsCompositePrimaryKeys()) {
-            $this->markTestSkipped("Composite keys need to be supported for this test to run.");
+        if (! $this->storage->supportsCompositePrimaryKeys()) {
+            $this->markTestSkipped('Composite keys need to be supported for this test to run.');
         }
 
-        $key = array('dist' => 'foo', 'range' => 100);
-        $data = array(
-            'dist' => 'foo',
-            'range' => 100,
-            'name' => 'Test',
-            'value' => 1,
-            'amount' => 200.23,
-            'timestamp' => new \DateTime("2012-03-26 12:12:12")
-        );
+        $key  = ['dist' => 'foo', 'range' => 100];
+        $data = [
+            'dist'      => 'foo',
+            'range'     => 100,
+            'name'      => 'Test',
+            'value'     => 1,
+            'amount'    => 200.23,
+            'timestamp' => new \DateTime('2012-03-26 12:12:12'),
+        ];
 
         $this->mockUpdateCompositeKey($key, $data);
         $this->storage->update('stdClass', $key, $data);
@@ -60,11 +79,11 @@ abstract class AbstractStorageTestCase extends \PHPUnit_Framework_TestCase
 
     public function testDeleteCompositeKey()
     {
-        if ( ! $this->storage->supportsCompositePrimaryKeys()) {
-            $this->markTestSkipped("Composite keys need to be supported for this test to run.");
+        if (! $this->storage->supportsCompositePrimaryKeys()) {
+            $this->markTestSkipped('Composite keys need to be supported for this test to run.');
         }
 
-        $key = array('dist' => 'foo', 'range' => 100);
+        $key = ['dist' => 'foo', 'range' => 100];
 
         $this->mockDeleteCompositeKey($key);
         $this->storage->delete('stdClass', $key);
@@ -72,29 +91,28 @@ abstract class AbstractStorageTestCase extends \PHPUnit_Framework_TestCase
 
     public function testFindCompositeKey()
     {
-        if ( ! $this->storage->supportsCompositePrimaryKeys()) {
-            $this->markTestSkipped("Composite keys need to be supported for this test to run.");
+        if (! $this->storage->supportsCompositePrimaryKeys()) {
+            $this->markTestSkipped('Composite keys need to be supported for this test to run.');
         }
 
-        $key = array('dist' => 'foo', 'range' => 100);
+        $key = ['dist' => 'foo', 'range' => 100];
 
         $this->mockFindCompositeKey($key);
         $data = $this->storage->find('stdClass', $key);
 
-        $this->assertEquals(array(
-            'dist' => 'foo',
-            'range' => '100',
-            'timestamp' => new \DateTime('2008-09-18 23:46:19', new \DateTimeZone("UTC")),
-            'name' => 'Test',
-            'value' => 23,
-            'amount' => 200.23,
-            'bool' => true,
-        ), $data);
+        $this->assertEquals([
+            'dist'      => 'foo',
+            'range'     => '100',
+            'timestamp' => new \DateTime('2008-09-18 23:46:19', new \DateTimeZone('UTC')),
+            'name'      => 'Test',
+            'value'     => 23,
+            'amount'    => 200.23,
+            'bool'      => true,
+        ], $data);
     }
 
-    abstract function mockInsertCompositeKey($key, $data);
-    abstract function mockUpdateCompositeKey($key, $data);
-    abstract function mockDeleteCompositeKey($key);
-    abstract function mockFindCompositeKey($key);
+    abstract public function mockInsertCompositeKey($key, $data);
+    abstract public function mockUpdateCompositeKey($key, $data);
+    abstract public function mockDeleteCompositeKey($key);
+    abstract public function mockFindCompositeKey($key);
 }
-

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

@@ -0,0 +1,102 @@
+<?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\ArrayStorage;
+use ReflectionProperty;
+
+/**
+ * @author Emanuele Minotto <minottoemanuele@gmail.com>
+ */
+class ArrayStorageTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ArrayStorage
+     */
+    private $storage;
+
+    protected function setup()
+    {
+        $this->storage = new ArrayStorage();
+    }
+
+    public function testSupportsPartialUpdates()
+    {
+        $this->assertFalse($this->storage->supportsPartialUpdates());
+    }
+
+    public function testSupportsCompositePrimaryKeys()
+    {
+        $this->assertFalse($this->storage->supportsCompositePrimaryKeys());
+    }
+
+    public function testRequiresCompositePrimaryKeys()
+    {
+        $this->assertFalse($this->storage->requiresCompositePrimaryKeys());
+    }
+
+    /**
+     * @dataProvider methodsProvider
+     */
+    public function testInsert($method)
+    {
+        $data = [
+            'author' => 'John Doe',
+            'title'  => 'example book',
+        ];
+
+        $this->storage->$method('foo', 'bar', $data);
+
+        $reflector = new ReflectionProperty(ArrayStorage::class, 'data');
+        $reflector->setAccessible(true);
+
+        $storedValue = $reflector->getValue($this->storage);
+
+        $this->assertEquals(
+            [
+                'foo' => [
+                    serialize('bar') => $data,
+                ],
+            ],
+            $storedValue
+        );
+
+        $this->storage->$method('foo', 'bar', $data);
+        $this->assertCount(1, $storedValue);
+        $this->assertCount(1, $storedValue['foo']);
+    }
+
+    /**
+     * @return array
+     */
+    public function methodsProvider()
+    {
+        return [
+            ['insert'],
+            ['update'],
+        ];
+    }
+
+    public function testGetName()
+    {
+        $this->assertEquals('array', $this->storage->getName());
+    }
+}

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

@@ -0,0 +1,177 @@
+<?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\CouchDbStorage;
+
+/**
+ * CouchDb storage testcase
+ *
+ * @author Emanuele Minotto <minottoemanuele@gmail.com>
+ *
+ * @covers \Doctrine\KeyValueStore\Storage\CouchDbStorage
+ */
+class CouchDbStorageTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $couchdb;
+
+    /**
+     * @var CouchDbStorage
+     */
+    private $storage;
+
+    protected function setUp()
+    {
+        $client = $this->getMockBuilder('\Doctrine\CouchDB\HTTP\StreamClient')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->couchdb = $this->getMockBuilder('\Doctrine\CouchDB\CouchDBClient')
+            ->setConstructorArgs([
+                $client,
+                'test',
+            ])
+            ->getMock();
+
+        $this->storage = new CouchDbStorage($this->couchdb);
+    }
+
+    public function testSupportsPartialUpdates()
+    {
+        $this->assertFalse($this->storage->supportsPartialUpdates());
+    }
+
+    public function testSupportsCompositePrimaryKeys()
+    {
+        $this->assertFalse($this->storage->supportsCompositePrimaryKeys());
+    }
+
+    public function testRequiresCompositePrimaryKeys()
+    {
+        $this->assertFalse($this->storage->requiresCompositePrimaryKeys());
+    }
+
+    public function testInsert()
+    {
+        $data = range(0, 10);
+
+        $storedDataset = null;
+
+        $this->couchdb->expects($this->once())
+            ->method('putDocument')
+            ->will($this->returnCallback(function (array $data, $id) use (&$storedDataset) {
+                $storedDataset = [$id, null];
+            }));
+
+        $storageName = rand();
+        $key         = sha1(rand());
+
+        $this->storage->insert($storageName, $key, $data);
+        $this->assertNotNull($storedDataset);
+
+        $this->assertSame([$storageName . '-' . $key, null], $storedDataset);
+    }
+
+    public function testUpdate()
+    {
+        $data = range(0, 10);
+
+        $storedDataset = null;
+
+        $this->couchdb->method('putDocument')
+            ->will($this->returnCallback(function (array $data, $id) use (&$storedDataset) {
+                $storedDataset = [$id, null];
+            }));
+
+        $storageName = rand();
+        $key         = sha1(rand());
+
+        $this->storage->insert($storageName, $key, $data);
+        $this->assertNotNull($storedDataset);
+
+        $this->assertSame([$storageName . '-' . $key, null], $storedDataset);
+
+        $data = range(0, 20);
+
+        $this->storage->insert($storageName, $key, $data);
+        $this->assertNotNull($storedDataset);
+
+        $this->assertSame([$storageName . '-' . $key, null], $storedDataset);
+    }
+
+    public function testDelete()
+    {
+        $storedDataset = [
+            'test-foobar' => [
+                'author' => 'John Doe',
+                'title'  => 'example book',
+            ],
+        ];
+
+        $this->couchdb->expects($this->once())
+             ->method('deleteDocument')
+             ->will($this->returnCallback(function ($key) use (&$storedDataset) {
+                    foreach ($storedDataset as $id => $row) {
+                        if ($id === $key) {
+                            unset($storedDataset[$key]);
+                        }
+                    }
+                }
+             ));
+
+        $this->storage->delete('test', 'foobar');
+
+        $this->assertCount(0, $storedDataset);
+    }
+
+    public function testFind()
+    {
+        $storedDataset = [
+            'test-foobar' => [
+                'author' => 'John Doe',
+                'title'  => 'example book',
+            ],
+        ];
+
+        $this->couchdb->expects($this->once())
+            ->method('findDocument')
+            ->will($this->returnCallback(function ($key) use (&$storedDataset) {
+                if (isset($storedDataset[$key])) {
+                    return $storedDataset[$key];
+                }
+
+                return;
+            }
+        ));
+
+        $data = $this->storage->find('test', 'foobar');
+
+        $this->assertEquals($storedDataset['test-foobar'], $data);
+    }
+
+    public function testGetName()
+    {
+        $this->assertEquals('couchdb', $this->storage->getName());
+    }
+}

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

@@ -1,5 +1,23 @@
 <?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\CouchbaseStorage;
@@ -8,6 +26,8 @@ use Doctrine\KeyValueStore\Storage\CouchbaseStorage;
  * Couchbase storage testcase
  *
  * @author Simon Schick <simonsimcity@gmail.com>
+ *
+ * @requires extension couchbase
  */
 class CouchbaseStorageTest extends \PHPUnit_Framework_TestCase
 {
@@ -23,9 +43,6 @@ class CouchbaseStorageTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-		if (!class_exists('\Couchbase'))
-			$this->markTestSkipped("The PHP extension 'couchbase' is not installed");
-
         $this->couchbase = $this->getMockBuilder('\Couchbase')
             ->disableOriginalConstructor()
             ->getMock();
@@ -50,57 +67,57 @@ class CouchbaseStorageTest extends \PHPUnit_Framework_TestCase
 
     public function testInsert()
     {
-        $data = array(
+        $data = [
             'author' => 'John Doe',
             'title'  => 'example book',
-        );
+        ];
 
-        $dbDataset = array();
+        $dbDataset = [];
 
         $this->couchbase->expects($this->once())
             ->method('add')
-            ->will($this->returnCallback(function($key, $data) use (&$dbDataset) {
-                $dbDataset[] = array('key' => $key, 'value' => $data);
+            ->will($this->returnCallback(function ($key, $data) use (&$dbDataset) {
+                $dbDataset[] = ['key' => $key, 'value' => $data];
             }));
 
         $this->storage->insert('', '1', $data);
         $this->assertCount(1, $dbDataset);
 
-        $this->assertEquals(array(array('key' => '1', 'value' => $data)), $dbDataset);
+        $this->assertEquals([['key' => '1', 'value' => $data]], $dbDataset);
     }
 
     public function testUpdate()
     {
-        $data = array(
+        $data = [
             'author' => 'John Doe',
             'title'  => 'example book',
-        );
+        ];
 
-        $dbDataset = array();
+        $dbDataset = [];
 
         $this->couchbase->expects($this->once())
             ->method('replace')
-            ->will($this->returnCallback(function($key, $data) use (&$dbDataset) {
+            ->will($this->returnCallback(function ($key, $data) use (&$dbDataset) {
                 $dbDataset[$key] = $data;
             }));
 
         $this->storage->update('', '1', $data);
 
-        $this->assertEquals(array('1' => $data), $dbDataset);
+        $this->assertEquals(['1' => $data], $dbDataset);
     }
 
     public function testDelete()
     {
-        $dataset = array(
-            'foobar' => array(
+        $dataset = [
+            'foobar' => [
                 'author' => 'John Doe',
                 'title'  => 'example book',
-            ),
-        );
+            ],
+        ];
 
         $this->couchbase->expects($this->once())
              ->method('delete')
-             ->will($this->returnCallback(function($key) use (&$dataset) {
+             ->will($this->returnCallback(function ($key) use (&$dataset) {
                     foreach ($dataset as $id => $row) {
                         if ($id === $key) {
                             unset($dataset[$key]);
@@ -116,20 +133,20 @@ class CouchbaseStorageTest extends \PHPUnit_Framework_TestCase
 
     public function testFind()
     {
-        $dataset = array(
-            'foobar' => array(
+        $dataset = [
+            'foobar' => [
                 'author' => 'John Doe',
                 'title'  => 'example book',
-            ),
-        );
+            ],
+        ];
 
         $this->couchbase->expects($this->once())
             ->method('get')
-            ->will($this->returnCallback(function($key) use (&$dataset) {
+            ->will($this->returnCallback(function ($key) use (&$dataset) {
                 if (isset($dataset[$key])) {
                     return $dataset[$key];
                 }
-                return null;
+                return;
             }
         ));
 

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

@@ -0,0 +1,157 @@
+<?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/MongoDbStorageTest.php

@@ -1,144 +1,145 @@
 <?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\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
  */
 class MongoDbStorageTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var Client
+     */
+    private $client;
+
+    /**
+     * @var MongoDbStorage
+     */
+    private $storage;
+
     protected function setUp()
     {
-        if ( ! extension_loaded('mongodb')) {
-            $this->markTestSkipped('MongoDB Extension is not installed.');
-        }
-
-        $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, array(
-            'collection' => 'test',
-            'database' => 'test'
-        ));
+        $this->client = new Client();
+        $this->storage = new MongoDbStorage($this->client->test);
     }
 
     public function testInsert()
     {
-        $data = array(
+        $data = [
             'author' => 'John Doe',
             'title'  => 'example book',
-        );
+        ];
 
-        $dbDataset = array();
+        $this->storage->insert('mongodb', 'testInsert', $data);
 
-        $this->collection->expects($this->once())
-            ->method('insert')
-            ->will($this->returnCallback(function($data) use (&$dbDataset) {
-                $dbDataset[] = $data;
-            }));
+        $result = $this->client
+            ->test
+            ->mongodb
+            ->findOne([
+                'key' => 'testInsert',
+            ]);
 
-        $this->storage->insert('mongodb', '1', $data);
-        $this->assertCount(1, $dbDataset);
-
-        $this->assertEquals(array(array('key' => '1', 'value' => $data)), $dbDataset);
+        $this->assertSame($data, $result['value']->getArrayCopy());
     }
 
+    /**
+     * @depends testInsert
+     */
     public function testUpdate()
     {
-        $data = array(
+        $data = [
             'author' => 'John Doe',
             'title'  => 'example book',
-        );
+        ];
 
-        $dbDataset = array();
+        $this->storage->insert('mongodb', 'testUpdate', [
+            'foo' => 'bar',
+        ]);
+        $this->storage->update('mongodb', 'testUpdate', $data);
 
-        $this->collection->expects($this->once())
-            ->method('update')
-            ->will($this->returnCallback(function($citeria, $data) use (&$dbDataset) {
-                $dbDataset = array($citeria, $data);
-            }));
+        $result = $this->client
+            ->test
+            ->mongodb
+            ->findOne([
+                'key' => 'testUpdate',
+            ]);
 
-        $this->storage->update('mongodb', '1', $data);
-
-        $this->assertEquals(array('key' => '1'), $dbDataset[0]);
-        $this->assertEquals(array('key' => '1', 'value' => $data), $dbDataset[1]);
+        $this->assertSame($data, $result['value']->getArrayCopy());
     }
 
+    /**
+     * @depends testInsert
+     */
     public function testDelete()
     {
-        $dataset = array(
-            array(
-                'key' => 'foobar',
-                'value' => array(
-                    'author' => 'John Doe',
-                    'title'  => 'example book',
-                ),
-            ),
-        );
+        $this->storage->insert('mongodb', 'testDelete', [
+            'foo' => 'bar',
+        ]);
 
-        $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]);
-                        }
-                    }
-                }
-             ));
+        $this->storage->delete('mongodb', 'testDelete');
 
-        $this->storage->delete('test', 'foobar');
+        $result = $this->client
+            ->test
+            ->mongodb
+            ->findOne([
+                'key' => 'testDelete',
+            ]);
 
-        $this->assertCount(0, $dataset);
+        $this->assertNull($result);
     }
 
+    /**
+     * @depends testInsert
+     */
     public function testFind()
     {
-        $dataset = array(
-            array(
-                'key' => 'foobar',
-                'value' => array(
-                    'author' => 'John Doe',
-                    'title'  => 'example book',
-                ),
-            ),
-        );
+        $dataset = [
+            'author' => 'John Doe',
+            'title'  => 'example book',
+        ];
 
-        $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;
-                    }
-                }
-            }
-        ));
+        $this->storage->insert('mongodb', 'testFind', $dataset);
 
-        $data = $this->storage->find('test', 'foobar');
+        $data = $this->storage->find('mongodb', 'testFind');
 
-        $this->assertEquals($dataset[0]['value'], $data);
+        $this->assertEquals($dataset, $data);
+    }
+
+    public function testFindWithNotExistKey()
+    {
+        $this->setExpectedException(NotFoundException::class);
+        $this->storage->find('mongodb', 'not-existing-key');
     }
 
     public function testGetName()
     {
-        $this->storage->initialize();
-
         $this->assertEquals('mongodb', $this->storage->getName());
     }
 }

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

@@ -1,11 +1,31 @@
 <?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\RedisStorage;
 
 /**
  * @author Marcel Araujo <admin@marcelaraujo.me>
+ *
+ * @requires extension redis
  */
 class RedisStorageTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,10 +41,6 @@ class RedisStorageTest extends \PHPUnit_Framework_TestCase
 
     protected function setup()
     {
-        if ( ! extension_loaded('redis')) {
-            $this->markTestSkipped('Redis Extension is not installed.');
-        }
-
         $this->redis = $this->getMockBuilder('\Redis')
             ->disableOriginalConstructor()
             ->getMock();
@@ -32,7 +48,7 @@ class RedisStorageTest extends \PHPUnit_Framework_TestCase
         $this->redis->expects($this->any())
             ->method('connect')
             ->with('127.0.0.1', '6379')
-            ->will($this->returnValue(TRUE));
+            ->will($this->returnValue(true));
 
         $this->storage = new RedisStorage($this->redis);
     }
@@ -54,46 +70,44 @@ class RedisStorageTest extends \PHPUnit_Framework_TestCase
 
     public function testInsert()
     {
-        $data = array(
+        $data = [
             'author' => 'John Doe',
             'title'  => 'example book',
-        );
+        ];
 
-        $dbDataset = array();
+        $dbDataset = [];
 
         $this->redis->expects($this->once())
             ->method('set')
-            ->will($this->returnCallback(function($key, $data) use (&$dbDataset) {
-                $dbDataset[] = array('key' => $key, 'value' => $data);
+            ->will($this->returnCallback(function ($key, $data) use (&$dbDataset) {
+                $dbDataset[] = ['key' => $key, 'value' => $data];
             }));
 
         $this->storage->insert('redis', '1', $data);
 
         $this->assertCount(1, $dbDataset);
-        $this->assertEquals(array(array('key' => $this->storage->getKeyName('1'), 'value' => json_encode($data))), $dbDataset);
+        $this->assertEquals([['key' => $this->storage->getKeyName('1'), 'value' => json_encode($data)]], $dbDataset);
     }
 
     public function testUpdate()
     {
-
-        $data = array(
+        $data = [
             'author' => 'John Doe Updated',
             'title'  => 'example book updated',
-        );
+        ];
 
-        $dbDataset = array();
+        $dbDataset = [];
 
         $this->redis->expects($this->once())
             ->method('set')
-            ->will($this->returnCallback(function($key, $data) use (&$dbDataset) {
-                $dbDataset[] = array('key' => $key, 'value' => $data);
+            ->will($this->returnCallback(function ($key, $data) use (&$dbDataset) {
+                $dbDataset[] = ['key' => $key, 'value' => $data];
             }));
 
+        $this->storage->update('redis', '1', $data);
 
-         $this->storage->update('redis', '1', $data);
-
-         $this->assertCount(1, $dbDataset);
-         $this->assertEquals(array(array('key' => $this->storage->getKeyName('1'), 'value' => json_encode($data))), $dbDataset);
+        $this->assertCount(1, $dbDataset);
+        $this->assertEquals([['key' => $this->storage->getKeyName('1'), 'value' => json_encode($data)]], $dbDataset);
     }
 
     public function testGetName()

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

@@ -1,32 +1,65 @@
 <?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\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;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $riak;
-
-    protected function setup()
+    protected function setUp()
     {
-        $this->riak = $this->getMockBuilder('Riak\\Client')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $dns = getenv('RIAK_DNS');
 
+        if (empty($dns)) {
+            $this->markTestSkipped('Missing Riak DNS');
+        }
 
-        $this->storage = new RiakStorage($this->riak);
+        $this->client = (new RiakClientBuilder())
+            ->withNodeUri($dns)
+            ->build();
+
+        $this->storage = new RiakStorage($this->client);
     }
 
     public function testSupportsPartialUpdates()
@@ -46,188 +79,124 @@ class RiakStorageTest extends \PHPUnit_Framework_TestCase
 
     public function testInsert()
     {
-        $bucket = $this->getMockBuilder('Riak\Bucket')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $data = [
+            'title' => 'Riak test',
+        ];
 
-        $this->riak->expects($this->once())
-            ->method('bucket')
-            ->will($this->returnValue($bucket));
+        $this->storage->insert('riak-test', 'foobar', $data);
 
-        $objectMock = $this->getMockBuilder('Riak\Object')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $location = $this->getRiakLocation();
 
-        $objectMock->expects($this->once())
-            ->method('store');
+        $fetch = FetchValue::builder($location)->build();
 
+        $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(array('title' => 'Riak test'), $data);
-                return $objectMock;
-            }));
-
-        $this->storage->insert('riak-test', 'foobar', array('title' => 'Riak test'));
-    }
-
-    public function testUpdate()
-    {
-        $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')
-             ->will($this->returnValue($objectMock));
-
-
-        $that = $this;
-        $objectMock->expects($this->once())
-            ->method('setData')
-            ->will($this->returnCallback(function($data) use ($that) {
-                $that->assertEquals(array('title' => 'Riak cookbook'), $data);
-            }));
-
-        $objectMock->expects($this->once())
-            ->method('store');
-
-        $this->storage->update('riak-test', 'foobar', array('title' => 'Riak cookbook'));
-    }
-
-    public function testDelete()
-    {
-        $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');
-    }
-
-    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');
-    }
-
-    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(array('title' => 'Riak Test')));
-
-        $this->assertEquals(array('title' => 'Riak Test'), $this->storage->find('riaktest', 'foobar'));
+        $this->assertSame($data, json_decode($json, true));
     }
 
     /**
-     * @expectedException Doctrine\KeyValueStore\NotFoundException
+     * @depends testInsert
      */
+    public function testUpdate()
+    {
+        $data = [
+            'title' => 'Riak update',
+        ];
+
+        $this->storage->insert('riak-test', 'foobar', [
+            'title' => 'Riak insert',
+        ]);
+
+        $location = $this->getRiakLocation();
+
+        $this->assertTotalBucketKeys(1, $location);
+
+        $this->storage->update('riak-test', 'foobar', $data);
+
+        $fetch = FetchValue::builder($location)->build();
+
+        $json = (string) $this->client
+            ->execute($fetch)
+            ->getValue()
+            ->getValue();
+
+        $this->assertSame($data, json_decode($json, true));
+        $this->assertTotalBucketKeys(1, $location);
+    }
+
+    /**
+     * @depends testInsert
+     */
+    public function testDelete()
+    {
+        $this->testInsert();
+
+        $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()
+    {
+        $this->storage->delete('riak-test', 'foobar');
+        $this->storage->delete('riak-test', 'foobar');
+    }
+
+    /**
+     * @depends testInsert
+     */
+    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()
     {
-        $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');
+        $this->setExpectedException(NotFoundException::class);
+        $this->storage->find('riak-test', 'foobar-1');
     }
 
     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/WindowsAzureTable/SharedKeyLiteTest.php

@@ -1,5 +1,23 @@
 <?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\WindowsAzureTable;
 
 use Doctrine\KeyValueStore\Storage\WindowsAzureTable\SharedKeyLiteAuthorization;
@@ -11,31 +29,30 @@ class SharedKeyLiteTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->auth = new SharedKeyLiteAuthorization(
-            "testing",
-            "abcdefg"
+            'testing',
+            'abcdefg'
         );
     }
 
     public function testKeyGeneration1()
     {
-        $authorization = $this->auth->signRequest('GET', '/', '', '', array(
-            "x-ms-date" => "Wed, 29 Apr 2009 13:12:47 GMT"
-        ));
+        $authorization = $this->auth->signRequest('GET', '/', '', '', [
+            'x-ms-date' => 'Wed, 29 Apr 2009 13:12:47 GMT',
+        ]);
         $this->assertEquals(
-            "Authorization: SharedKeyLite testing:vZdOn/j0gW5FG0kAUG9NhSBO9eBjZqfe6RwALPYUtqU=",
+            'Authorization: SharedKeyLite testing:vZdOn/j0gW5FG0kAUG9NhSBO9eBjZqfe6RwALPYUtqU=',
             $authorization
         );
     }
 
     public function testKeyGeneration2()
     {
-        $authorization = $this->auth->signRequest('GET', '/test', '', '', array(
-            "x-ms-date" => "Wed, 29 Apr 2009 13:12:47 GMT"
-        ));
+        $authorization = $this->auth->signRequest('GET', '/test', '', '', [
+            'x-ms-date' => 'Wed, 29 Apr 2009 13:12:47 GMT',
+        ]);
         $this->assertEquals(
-            "Authorization: SharedKeyLite testing:HJTSiRDtMsQVsFVispSHkcODeFykLO+WEuOepwmh51o=",
+            'Authorization: SharedKeyLite testing:HJTSiRDtMsQVsFVispSHkcODeFykLO+WEuOepwmh51o=',
             $authorization
         );
     }
 }
-

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

@@ -1,10 +1,29 @@
 <?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\WindowsAzureTable\SharedKeyAuthorization;
-use Doctrine\KeyValueStore\Storage\WindowsAzureTableStorage;
+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
 {
@@ -12,8 +31,14 @@ class WindowsAzureTableStorageTest extends AbstractStorageTestCase
 
     protected function createStorage()
     {
-        $this->client = $this->getMock('Doctrine\KeyValueStore\Http\Client');
-        $auth = $this->getMock('Doctrine\KeyValueStore\Storage\WindowsAzureTable\AuthorizationSchema');
+        $this->client = $this
+            ->getMockBuilder(Client::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $auth = $this
+            ->getMockBuilder(AuthorizationSchema::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $auth->expects($this->any())->method('signRequest')->will($this->returnValue('Authorization: SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM='));
 
         $storage = new WindowsAzureTableStorage(
@@ -25,13 +50,13 @@ class WindowsAzureTableStorageTest extends AbstractStorageTestCase
 
     public function mockInsertCompositeKey($key, $data)
     {
-        $expectedHeaders = array(
-            'Content-Type' => 'application/atom+xml',
-            'Content-Length' => 617,
-            'x-ms-date' => 'Mon, 26 Mar 2012 10:10:10 GMT',
-            'Date' => 'Mon, 26 Mar 2012 10:10:10 GMT',
-            'Authorization' => 'SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM=',
-        );
+        $expectedHeaders = [
+            'Content-Type'   => 'application/atom+xml',
+            'Content-Length' => 620,
+            'x-ms-date'      => 'Mon, 26 Mar 2012 10:10:10 GMT',
+            'Date'           => 'Mon, 26 Mar 2012 10:10:10 GMT',
+            'Authorization'  => 'SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM=',
+        ];
 
         $this->client->expects($this->at(0))
                      ->method('request')
@@ -50,7 +75,7 @@ class WindowsAzureTableStorageTest extends AbstractStorageTestCase
   <content type="application/xml">
     
   <m:properties>
-    <d:PartitionKey>foo</d:PartitionKey><d:RowKey>100</d:RowKey><d:name>Test</d:name><d:value>1</d:value><d:amount>200.23</d:amount><d:timestamp>2012-03-26T12:12:12+02:00</d:timestamp></m:properties></content>
+    <d:PartitionKey>foo</d:PartitionKey><d:RowKey>100</d:RowKey><d:name>Test</d:name><d:value>1</d:value><d:amount>200.23</d:amount><d:timestamp>2012-03-26T12:12:12.0000000Z</d:timestamp></m:properties></content>
 </entry>
 
 XML
@@ -80,7 +105,7 @@ XML
   </content>
 </entry>
 XML
-, array()
+, []
 
                      ))
         );
@@ -88,20 +113,20 @@ XML
 
     public function mockUpdateCompositeKey($key, $data)
     {
-        $expectedHeaders = array(
-            'Content-Type' => 'application/atom+xml',
-            'Content-Length' => 704,
-            'x-ms-date' => 'Mon, 26 Mar 2012 10:10:10 GMT',
-            'Date' => 'Mon, 26 Mar 2012 10:10:10 GMT',
-            'If-Match' => '*',
-            'Authorization' => 'SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM=',
-        );
+        $expectedHeaders = [
+            'Content-Type'   => 'application/atom+xml',
+            'Content-Length' => 707,
+            'x-ms-date'      => 'Mon, 26 Mar 2012 10:10:10 GMT',
+            'Date'           => 'Mon, 26 Mar 2012 10:10:10 GMT',
+            'If-Match'       => '*',
+            'Authorization'  => 'SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM=',
+        ];
 
         $this->client->expects($this->at(0))
                      ->method('request')
                      ->with(
                         $this->equalTo('PUT'),
-                        $this->equalTo("https://teststore.table.core.windows.net/stdClass". rawurlencode("(PartitionKey='foo', RowKey='100')")),
+                        $this->equalTo('https://teststore.table.core.windows.net/stdClass' . rawurlencode("(PartitionKey='foo', RowKey='100')")),
                         $this->equalTo(<<<XML
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom">
@@ -114,53 +139,52 @@ XML
   <content type="application/xml">
     
   <m:properties>
-    <d:PartitionKey>foo</d:PartitionKey><d:RowKey>100</d:RowKey><d:name>Test</d:name><d:value>1</d:value><d:amount>200.23</d:amount><d:timestamp>2012-03-26T12:12:12+02:00</d:timestamp></m:properties></content>
+    <d:PartitionKey>foo</d:PartitionKey><d:RowKey>100</d:RowKey><d:name>Test</d:name><d:value>1</d:value><d:amount>200.23</d:amount><d:timestamp>2012-03-26T12:12:12.0000000Z</d:timestamp></m:properties></content>
 </entry>
 
 XML
                         ),
                         $this->equalTo($expectedHeaders))
-                     ->will($this->returnValue(new Response(204, "", array()))
+                     ->will($this->returnValue(new Response(204, '', []))
         );
-
     }
 
     public function mockDeleteCompositeKey($key)
     {
-        $expectedHeaders = array(
-            'Content-Type' => 'application/atom+xml',
+        $expectedHeaders = [
+            'Content-Type'   => 'application/atom+xml',
             'Content-Length' => 0,
-            'x-ms-date' => 'Mon, 26 Mar 2012 10:10:10 GMT',
-            'Date' => 'Mon, 26 Mar 2012 10:10:10 GMT',
-            'If-Match' => '*',
-            'Authorization' => 'SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM=',
-        );
+            'x-ms-date'      => 'Mon, 26 Mar 2012 10:10:10 GMT',
+            'Date'           => 'Mon, 26 Mar 2012 10:10:10 GMT',
+            'If-Match'       => '*',
+            'Authorization'  => 'SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM=',
+        ];
 
         $this->client->expects($this->at(0))
                      ->method('request')
                      ->with(
                         $this->equalTo('DELETE'),
-                        $this->equalTo("https://teststore.table.core.windows.net/stdClass". rawurlencode("(PartitionKey='foo', RowKey='100')")),
+                        $this->equalTo('https://teststore.table.core.windows.net/stdClass' . rawurlencode("(PartitionKey='foo', RowKey='100')")),
                         $this->equalTo(''),
                         $this->equalTo($expectedHeaders)
-                     )->will($this->returnValue(new Response(204, "", array())));
+                     )->will($this->returnValue(new Response(204, '', [])));
     }
 
     public function mockFindCompositeKey($key)
     {
-        $expectedHeaders = array(
-            'Content-Type' => 'application/atom+xml',
+        $expectedHeaders = [
+            'Content-Type'   => 'application/atom+xml',
             'Content-Length' => 0,
-            'x-ms-date' => 'Mon, 26 Mar 2012 10:10:10 GMT',
-            'Date' => 'Mon, 26 Mar 2012 10:10:10 GMT',
-            'Authorization' => 'SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM=',
-        );
+            'x-ms-date'      => 'Mon, 26 Mar 2012 10:10:10 GMT',
+            'Date'           => 'Mon, 26 Mar 2012 10:10:10 GMT',
+            'Authorization'  => 'SharedKeyLite testaccount1:uay+rilMVayH/SVI8X+a3fL8k/NxCnIePdyZSkqvydM=',
+        ];
 
         $this->client->expects($this->at(0))
                      ->method('request')
                      ->with(
                         $this->equalTo('GET'),
-                        $this->equalTo("https://teststore.table.core.windows.net/stdClass". rawurlencode("(PartitionKey='foo', RowKey='100')")),
+                        $this->equalTo('https://teststore.table.core.windows.net/stdClass' . rawurlencode("(PartitionKey='foo', RowKey='100')")),
                         $this->equalTo(''),
                         $this->equalTo($expectedHeaders)
                      )->will($this->returnValue(
@@ -188,11 +212,9 @@ XML
   </content>
 </entry>
 XML
-, array()
+, []
 
                      ))
         );
-
     }
 }
-

tests/Doctrine/Tests/KeyValueStoreTestCase.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -13,27 +14,41 @@
  * 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 LGPL. For more information, see
+ * and is licensed under the MIT license. For more information, see
  * <http://www.doctrine-project.org>.
  */
 
 namespace Doctrine\Tests;
 
-use Doctrine\KeyValueStore\EntityManager;
-use Doctrine\KeyValueStore\Configuration;
-use Doctrine\KeyValueStore\Mapping\AnnotationDriver;
-use Doctrine\KeyValueStore\Storage\DoctrineCacheStorage;
 use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\KeyValueStore\Configuration;
+use Doctrine\KeyValueStore\EntityManager;
+use Doctrine\KeyValueStore\Mapping;
+use Doctrine\KeyValueStore\Storage\DoctrineCacheStorage;
 
 abstract class KeyValueStoreTestCase extends \PHPUnit_Framework_TestCase
 {
-    public function createManager($storage = null)
+    public function createManager($storage = null, $driver = 'annotation')
     {
-        $cache = new ArrayCache;
+        $cache   = new ArrayCache;
         $storage = $storage ?: new DoctrineCacheStorage($cache);
 
-        $reader = new \Doctrine\Common\Annotations\AnnotationReader();
-        $metadata = new AnnotationDriver($reader);
+        switch ($driver) {
+            case 'annotation':
+                $reader   = new \Doctrine\Common\Annotations\AnnotationReader();
+                $metadata = new Mapping\AnnotationDriver($reader);
+
+                break;
+            case 'yaml':
+                $metadata = new Mapping\YamlDriver(__DIR__ . '/fixtures/yaml');
+
+                break;
+            case 'xml':
+                $metadata = new Mapping\XmlDriver(__DIR__ . '/fixtures/xml');
+
+                break;
+        }
+
         $config = new Configuration();
         $config->setMappingDriverImpl($metadata);
         $config->setMetadataCache($cache);
@@ -41,4 +56,3 @@ abstract class KeyValueStoreTestCase extends \PHPUnit_Framework_TestCase
         return new EntityManager($storage, $config);
     }
 }
-

tests/Doctrine/Tests/fixtures/xml/Doctrine.Tests.KeyValueStore.Functional.ChildEntity.dcm.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                          http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+	<entity name="Doctrine\Tests\KeyValueStore\Functional\ChildEntity">
+		<id>id</id>
+	</entity>
+</doctrine-mapping>

tests/Doctrine/Tests/fixtures/xml/Doctrine.Tests.KeyValueStore.Functional.ParentEntity.dcm.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                          http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+	<entity name="Doctrine\Tests\KeyValueStore\Functional\ParentEntity">
+		<id>id</id>
+	</entity>
+</doctrine-mapping>

tests/Doctrine/Tests/fixtures/xml/Doctrine.Tests.KeyValueStore.Functional.PersistEntity.dcm.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                          http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+	<entity name="Doctrine\Tests\KeyValueStore\Functional\PersistEntity">
+		<id>id</id>
+	</entity>
+</doctrine-mapping>

tests/Doctrine/Tests/fixtures/xml/Doctrine.Tests.KeyValueStore.Functional.Post.dcm.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                          http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+	<entity name="Doctrine\Tests\KeyValueStore\Functional\Post" storage-name="post">
+		<id>id</id>
+	</entity>
+</doctrine-mapping>

tests/Doctrine/Tests/fixtures/yaml/Doctrine.Tests.KeyValueStore.Functional.ChildEntity.dcm.yml

@@ -0,0 +1,3 @@
+Doctrine\Tests\KeyValueStore\Functional\ChildEntity:
+  id:
+  - id

tests/Doctrine/Tests/fixtures/yaml/Doctrine.Tests.KeyValueStore.Functional.ParentEntity.dcm.yml

@@ -0,0 +1,3 @@
+Doctrine\Tests\KeyValueStore\Functional\ParentEntity:
+  id:
+  - id

tests/Doctrine/Tests/fixtures/yaml/Doctrine.Tests.KeyValueStore.Functional.PersistEntity.dcm.yml

@@ -0,0 +1,3 @@
+Doctrine\Tests\KeyValueStore\Functional\PersistEntity:
+  id:
+  - id

tests/Doctrine/Tests/fixtures/yaml/Doctrine.Tests.KeyValueStore.Functional.Post.dcm.yml

@@ -0,0 +1,4 @@
+Doctrine\Tests\KeyValueStore\Functional\Post:
+  storageName: post
+  id:
+  - id

tests/bootstrap.php

@@ -1,6 +1,24 @@
 <?php
 
-if (!@include __DIR__ . '/../vendor/autoload.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>.
+ */
+
+if (! @include __DIR__ . '/../vendor/autoload.php') {
     die(<<<'EOT'
 You must set up the project dependencies, run the following commands:
 wget http://getcomposer.org/composer.phar
@@ -12,7 +30,3 @@ EOT
 \Doctrine\Common\Annotations\AnnotationRegistry::registerFile(__DIR__ . '/../lib/Doctrine/KeyValueStore/Mapping/Annotations/Entity.php');
 \Doctrine\Common\Annotations\AnnotationRegistry::registerFile(__DIR__ . '/../lib/Doctrine/KeyValueStore/Mapping/Annotations/Id.php');
 \Doctrine\Common\Annotations\AnnotationRegistry::registerFile(__DIR__ . '/../lib/Doctrine/KeyValueStore/Mapping/Annotations/Transient.php');
-
-$loader = new \Doctrine\Common\ClassLoader("Doctrine\Tests", __DIR__);
-$loader->register();
-

tests/travis.sh

@@ -0,0 +1,11 @@
+# Cassandra installation
+sudo sh -c "echo 'JVM_OPTS=\"\${JVM_OPTS} -Djava.net.preferIPv4Stack=false\"' >> /usr/local/cassandra/conf/cassandra-env.sh"
+sudo service cassandra start
+sudo apt-add-repository -y ppa:linuxjedi/ppa
+sudo apt-get update
+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*||"`
+# PECL extensions
+echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini