[DoctrineMongoDBBundle] fix mapping dirs

symfony · Sep 10, 2010 · c537fb9 · c537fb9
1 parent b9a7b7e
commit c537fb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
@@ -332,7 +332,7 @@ protected function findBundleSubpaths($path, ContainerBuilder $container)
     static protected function detectMetadataDriver($dir, ContainerBuilder $container)
     {
         // add the closest existing directory as a resource
-        $resource = $dir.'/Resources/config/doctrine/metadata';
+        $resource = $dir.'/Resources/config/doctrine/metadata/mongodb';
         while (!is_dir($resource)) {
             $resource = dirname($resource);
         }

diff --git a/...y/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php b/...y/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
@@ -215,7 +215,7 @@ public function testYamlBundleMappingDetection()
 
         $loader->mongodbLoad(array(), $container);
 
-        $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata'), $container->getParameter('doctrine.odm.mongodb.mapping_dirs'));
+        $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata/mongodb'), $container->getParameter('doctrine.odm.mongodb.mapping_dirs'));
         $this->assertEquals('%doctrine.odm.mongodb.mapping_dirs%', $container->getParameter('doctrine.odm.mongodb.xml_mapping_dirs'));
         $this->assertEquals('%doctrine.odm.mongodb.mapping_dirs%', $container->getParameter('doctrine.odm.mongodb.yml_mapping_dirs'));
         $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/YamlBundle/Document'), $container->getParameter('doctrine.odm.mongodb.document_dirs'));
@@ -232,7 +232,7 @@ public function testXmlBundleMappingDetection()
 
         $loader->mongodbLoad(array(), $container);
 
-        $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata'), $container->getParameter('doctrine.odm.mongodb.mapping_dirs'));
+        $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata/mongodb'), $container->getParameter('doctrine.odm.mongodb.mapping_dirs'));
         $this->assertEquals('%doctrine.odm.mongodb.mapping_dirs%', $container->getParameter('doctrine.odm.mongodb.xml_mapping_dirs'));
         $this->assertEquals('%doctrine.odm.mongodb.mapping_dirs%', $container->getParameter('doctrine.odm.mongodb.yml_mapping_dirs'));
         $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Document'), $container->getParameter('doctrine.odm.mongodb.document_dirs'));