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

Merge remote branch 'stof/doctrine_mapping'

Browse Source 
* stof/doctrine_mapping:
  [DoctrineBundle] Removed orm reference in DoctrineAbstractBundle
This commit is contained in:
Fabien Potencier 2011-05-06 22:12:30 +02:00
commit 8043230bd6
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
View File

@ -263,11 +263,12 @@ abstract class AbstractDoctrineExtension extends Extension
}
$container->addResource(new FileResource($resource));
if (($files = glob($dir.'/'.$configPath.'/*.orm.xml')) && count($files)) {
$extension = $this->getMappingResourceExtension();
if (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.xml')) && count($files)) {
return 'xml';
} elseif (($files = glob($dir.'/'.$configPath.'/*.orm.yml')) && count($files)) {
} elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.yml')) && count($files)) {
return 'yml';
} elseif (($files = glob($dir.'/'.$configPath.'/*.orm.php')) && count($files)) {
} elseif (($files = glob($dir.'/'.$configPath.'/*.'.$extension.'.php')) && count($files)) {
return 'php';
}
@ -306,4 +307,11 @@ abstract class AbstractDoctrineExtension extends Extension
* @return string
*/
abstract protected function getMappingResourceConfigDirectory();
/**
* Extension used by the mapping files.
*
* @return string
*/
abstract protected function getMappingResourceExtension();
}

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

@ -318,6 +318,11 @@ class DoctrineExtension extends AbstractDoctrineExtension
return 'Resources/config/doctrine';
}
protected function getMappingResourceExtension()
{
return 'orm';
}
/**
* Loads a configured entity managers cache drivers.
*