Merge pull request #63 from holtkamp/patch-fix-odm-annotations-reader

Fix ODM annotations reader

Author: guilhermeblanco

library/Bisna/Doctrine/Container.php

@@ -759,14 +759,14 @@ private function startORMEntityManager(array $config = array())
      * Initialize ODM Configuration.
      *
      * @param array $config ODM DocumentManager configuration.
-     * @return Doctrine\ODM\MongoDb\Configuration
+     * @return Doctrine\ODM\MongoDB\Configuration
      */
     private function startODMConfiguration(array $config = array())
     {
         $configClass = $config['configurationClass'];
         $configuration = new $configClass();
 
-        $configuration = new \Doctrine\ODM\MongoDb\Configuration();
+        $configuration = new \Doctrine\ODM\MongoDB\Configuration();
 
         // Entity Namespaces configuration
         foreach ($config['documentNamespaces'] as $alias => $namespace) {
@@ -874,7 +874,7 @@ private function startODMMetadata(array $config = array())
 
         // Default metadata driver configuration
         $defaultMetadataDriver = array(
-            'adapterClass'               => 'Doctrine\ODM\MongoDb\Mapping\Driver\AnnotationDriver',
+            'adapterClass'               => 'Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver',
             'mappingNamespace'           => '',
             'mappingDirs'                => array(),
             'annotationReaderClass'      => 'Doctrine\Common\Annotations\AnnotationReader',
@@ -890,6 +890,10 @@ private function startODMMetadata(array $config = array())
         foreach ($config['drivers'] as $driver) {
             $driver = array_replace_recursive($defaultMetadataDriver, $driver);
 
+            if (method_exists($driver['adapterClass'], 'registerAnnotationClasses')) {
+                $driver['adapterClass']::registerAnnotationClasses();
+            }
+            
             $reflClass = new \ReflectionClass($driver['adapterClass']);
             $nestedDriver = null;