Fixing MongoDB ODM version (using latest master) and pushing composer.json into the module

Author: Ocramius

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "vendor/mongodb-odm"]
 	path = vendor/mongodb-odm
 	url = git://github.com/doctrine/mongodb-odm.git
+[submodule "vendor/mongodb"]
+	path = vendor/mongodb
+	url = git://github.com/doctrine/mongodb.git

Module.php

@@ -52,22 +52,18 @@ public function modulesLoaded($e)
             } else {
                 // Trying to load DoctrineAnnotations.php without knowing its location
                 $annotationReflection = new \ReflectionClass('Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver');
-                $libfile = dirname($annotationReflection->getFileName()) . '/DoctrineAnnotations.php';
+                $libfile = dirname($annotationReflection->getFileName()) . '/../Annotations/DoctrineAnnotations.php';
             }
 
             if (!$libfile) {
-                throw new RuntimeException(
-                    'Failed to load annotation mappings - check the "annotation_file" setting'
-                );
+                throw new RuntimeException('Failed to load annotation mappings - check the "annotation_file" setting');
             }
 
             AnnotationRegistry::registerFile($libfile);
         }
 
-        if (!class_exists('Doctrine\ODM\MongoDB\Mapping\Document', true)) {
-            throw new \Exception('
-                Doctrine could not be autoloaded - ensure it is in the correct path.
-            ');
+        if (!class_exists('Doctrine\ODM\MongoDB\Mapping\Annotations\Document', true)) {
+            throw new \Exception('Doctrine could not be autoloaded - ensure it is in the correct path.');
         }
     }