diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DoctrineBundle] BC break - Load metadata files in Resources/config/doctrine/metadata/orm/

Browse Source
This commit is contained in:
ornicar 2010-09-02 21:20:28 -07:00 committed by Fabien Potencier
parent fb24b291c8
commit eaaf447374
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
View File

@ -227,7 +227,7 @@ class DoctrineExtension extends Extension
$container->setParameter('doctrine.orm.'.$key, $config[$key]);
}
}
$container->setParameter('doctrine.orm.metadata_driver.mapping_dirs', $this->findBundleSubpaths('Resources/config/doctrine/metadata', $container));
$container->setParameter('doctrine.orm.metadata_driver.mapping_dirs', $this->findBundleSubpaths('Resources/config/doctrine/metadata/orm', $container));
$container->setParameter('doctrine.orm.metadata_driver.entity_dirs', $this->findBundleSubpaths('Entity', $container));
}
@ -487,9 +487,9 @@ class DoctrineExtension extends Extension
}
$container->addResource(new FileResource($resource));
if (count(glob($dir.'/Resources/config/doctrine/metadata/*.xml'))) {
if (count(glob($dir.'/Resources/config/doctrine/metadata/orm/*.xml'))) {
return 'xml';
} elseif (count(glob($dir.'/Resources/config/doctrine/metadata/*.yml'))) {
} elseif (count(glob($dir.'/Resources/config/doctrine/metadata/orm/*.yml'))) {
return 'yml';
}
@ -532,4 +532,4 @@ class DoctrineExtension extends Extension
{
return 'doctrine';
}
}
}