[DoctrineBundle] BC break - Load metadata files in Resources/config/doctrine/metadata/orm/
This commit is contained in:
parent
fb24b291c8
commit
eaaf447374
@ -227,7 +227,7 @@ class DoctrineExtension extends Extension
|
|||||||
$container->setParameter('doctrine.orm.'.$key, $config[$key]);
|
$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));
|
$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));
|
$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';
|
return 'xml';
|
||||||
} elseif (count(glob($dir.'/Resources/config/doctrine/metadata/*.yml'))) {
|
} elseif (count(glob($dir.'/Resources/config/doctrine/metadata/orm/*.yml'))) {
|
||||||
return 'yml';
|
return 'yml';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user