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

[DoctrineBundle] cleaned up code

Browse Source
This commit is contained in:
Fabien Potencier 2011-04-27 10:50:56 +02:00
parent 03511dea5c
commit 7395069b60
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,21 +44,14 @@ abstract class AbstractDoctrineExtension extends Extension
{ {
if (isset($objectManager['mappings'])) { if (isset($objectManager['mappings'])) {
foreach ($objectManager['mappings'] as $mappingName => $mappingConfig) { foreach ($objectManager['mappings'] as $mappingName => $mappingConfig) {
if (!isset($mappingConfig['dir'])) { $mappingConfig = array_replace(array(
$mappingConfig['dir'] = false; 'dir' => false,
} 'type' => false,
if (!isset($mappingConfig['type'])) { 'prefix' => false,
$mappingConfig['type'] = false; ), $mappingConfig);
}
if (!isset($mappingConfig['prefix'])) {
$mappingConfig['prefix'] = false;
}
$mappingConfig['dir'] = $container->getParameterBag()->resolveValue($mappingConfig['dir']); $mappingConfig['dir'] = $container->getParameterBag()->resolveValue($mappingConfig['dir']);
// a bundle configuration is detected by realizing that the specified dir is not absolute and existing // a bundle configuration is detected by realizing that the specified dir is not absolute and existing
if (isset($mappingConfig['is-bundle'])) {
$mappingConfig['is_bundle'] = $mappingConfig['is-bundle'];
}
if (!isset($mappingConfig['is_bundle'])) { if (!isset($mappingConfig['is_bundle'])) {
$mappingConfig['is_bundle'] = !file_exists($mappingConfig['dir']); $mappingConfig['is_bundle'] = !file_exists($mappingConfig['dir']);
} }