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

[DoctrineAbstractBundle] Removed obsolete code as the normalization is now done by the Configuration classes

Browse Source
This commit is contained in:
Christophe Coevoet 2011-03-10 10:53:50 +01:00
parent e3e60f1a68
commit 25521e7e86
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,19 +43,7 @@ abstract class AbstractDoctrineExtension extends Extension
protected function loadMappingInformation(array $objectManager, $container) protected function loadMappingInformation(array $objectManager, $container)
{ {
if (isset($objectManager['mappings'])) { if (isset($objectManager['mappings'])) {
// fix inconsistency between yaml and xml naming
if (isset($objectManager['mappings']['mapping'])) {
if (isset($objectManager['mappings']['mapping'][0])) {
$objectManager['mappings'] = $objectManager['mappings']['mapping'];
} else {
$objectManager['mappings'] = array($objectManager['mappings']['mapping']);
}
}
foreach ($objectManager['mappings'] as $mappingName => $mappingConfig) { foreach ($objectManager['mappings'] as $mappingName => $mappingConfig) {
if (is_string($mappingConfig)) {
$mappingConfig = array('type' => $mappingConfig);
}
if (!isset($mappingConfig['dir'])) { if (!isset($mappingConfig['dir'])) {
$mappingConfig['dir'] = false; $mappingConfig['dir'] = false;
} }
@ -75,12 +63,6 @@ abstract class AbstractDoctrineExtension extends Extension
$mappingConfig['is_bundle'] = !file_exists($mappingConfig['dir']); $mappingConfig['is_bundle'] = !file_exists($mappingConfig['dir']);
} }
if (isset($mappingConfig['name'])) {
$mappingName = $mappingConfig['name'];
} else if ($mappingConfig === null) {
$mappingConfig = array();
}
if ($mappingConfig['is_bundle']) { if ($mappingConfig['is_bundle']) {
$bundle = null; $bundle = null;
foreach ($container->getParameter('kernel.bundles') as $name => $class) { foreach ($container->getParameter('kernel.bundles') as $name => $class) {