Update Metadata infrastructure to the latest doctrine libraries

composer.json

@@ -16,8 +16,11 @@
         "symfony/console": ">=2.0"
     },
     "minimum-stability": "dev",
+    "require-dev": {
+        "symfony/yaml": ">=2.0.0,<2.2.0-dev"
+    },
     "suggest": {
-        "symfony/yaml": ">=2.0"
+        "symfony/yaml": ">=2.0.0,<2.2.0-dev"
     },
     "autoload": {
         "psr-0": {

lib/Doctrine/ODM/CouchDB/Configuration.php

@@ -23,7 +23,7 @@
 use Doctrine\CouchDB\HTTP\Client;
 use Doctrine\CouchDB\HTTP\SocketClient;
 use Doctrine\CouchDB\HTTP\LoggingClient;
-use Doctrine\ODM\CouchDB\Mapping\Driver\Driver;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\ODM\CouchDB\Mapping\MetadataResolver\MetadataResolver;
 use Doctrine\ODM\CouchDB\Mapping\MetadataResolver\DoctrineResolver;
 
@@ -144,11 +144,11 @@ public function setDocumentNamespaces(array $documentNamespaces)
     /**
      * Sets the cache driver implementation that is used for metadata caching.
      *
-     * @param Driver $driverImpl
+     * @param MappingDriver $driverImpl
      * @todo Force parameter to be a Closure to ensure lazy evaluation
      *       (as soon as a metadata cache is in effect, the driver never needs to initialize).
      */
-    public function setMetadataDriverImpl(Driver $driverImpl)
+    public function setMetadataDriverImpl(MappingDriver $driverImpl)
     {
         $this->attributes['metadataDriverImpl'] = $driverImpl;
     }

lib/Doctrine/ODM/CouchDB/Mapping/ClassMetadata.php

@@ -2,7 +2,9 @@
 
 namespace Doctrine\ODM\CouchDB\Mapping;
 
-use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata AS IClassMetadata,
+    ReflectionClass,
+    ReflectionProperty;
 
 /**
  * Metadata class
@@ -67,6 +69,7 @@ public function deriveChildMetadata($childName)
         $cm->reflClass = new \ReflectionClass($childName);
         $cm->name = $cm->reflClass->getName();
         $cm->namespace = $cm->reflClass->getNamespaceName();
+
         if ($this->isMappedSuperclass) {
             $cm->rootDocumentName = $cm->name;
         }
@@ -296,14 +299,14 @@ public function getIdentifierValue($document)
     {
         return (string) $this->reflFields[$this->identifier]->getValue($document);
     }
-    
+
     /**
      * Get identifier values of this document.
-     * 
+     *
      * Since CouchDB only allows exactly one identifier field this is a proxy
      * to {@see getIdentifierValue()} and returns an array with the identifier
      * field as a key.
-     * 
+     *
      * @param object $document
      * @return array
      */