[DoctrineBundle] fix mapping dirs
This commit is contained in:
parent
eaaf447374
commit
b9a7b7e51a
@ -75,7 +75,7 @@ EOT
|
||||
if ($type === 'annotation') {
|
||||
$destPath .= '/Entity';
|
||||
} else {
|
||||
$destPath .= '/Resources/config/doctrine/metadata';
|
||||
$destPath .= '/Resources/config/doctrine/metadata/orm';
|
||||
}
|
||||
|
||||
// adjust so file naming works
|
||||
|
@ -113,7 +113,7 @@ EOT
|
||||
$exporter->setEntityGenerator($this->getEntityGenerator());
|
||||
} else {
|
||||
$mappingType = $mappingType == 'yaml' ? 'yml' : $mappingType;
|
||||
$path = $dirs[$namespace].'/'.$bundle.'/Resources/config/doctrine/metadata/'.str_replace('\\', '.', $fullEntityClassName).'.dcm.'.$mappingType;
|
||||
$path = $dirs[$namespace].'/'.$bundle.'/Resources/config/doctrine/metadata/orm/'.str_replace('\\', '.', $fullEntityClassName).'.dcm.'.$mappingType;
|
||||
}
|
||||
|
||||
$code = $exporter->exportClassMetadata($class);
|
||||
|
@ -73,7 +73,7 @@ EOT
|
||||
if ($type === 'annotation') {
|
||||
$destPath .= '/Entity';
|
||||
} else {
|
||||
$destPath .= '/Resources/config/doctrine/metadata';
|
||||
$destPath .= '/Resources/config/doctrine/metadata/orm';
|
||||
}
|
||||
if ($type === 'yaml') {
|
||||
$type = 'yml';
|
||||
|
@ -481,7 +481,7 @@ class DoctrineExtension extends Extension
|
||||
static protected function detectMetadataDriver($dir, ContainerBuilder $container)
|
||||
{
|
||||
// add the closest existing directory as a resource
|
||||
$resource = $dir.'/Resources/config/doctrine/metadata';
|
||||
$resource = $dir.'/Resources/config/doctrine/metadata/orm';
|
||||
while (!is_dir($resource)) {
|
||||
$resource = dirname($resource);
|
||||
}
|
||||
|
@ -339,7 +339,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
||||
$loader->dbalLoad(array(), $container);
|
||||
$loader->ormLoad(array(), $container);
|
||||
|
||||
$this->assertEquals(array(__DIR__.'/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata'), $container->getParameter('doctrine.orm.metadata_driver.mapping_dirs'));
|
||||
$this->assertEquals(array(__DIR__.'/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata/orm'), $container->getParameter('doctrine.orm.metadata_driver.mapping_dirs'));
|
||||
$this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.xml_mapping_dirs'));
|
||||
$this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.yml_mapping_dirs'));
|
||||
$this->assertEquals(array(__DIR__.'/Fixtures/Bundles/YamlBundle/Entity'), $container->getParameter('doctrine.orm.metadata_driver.entity_dirs'));
|
||||
@ -357,7 +357,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
|
||||
$loader->dbalLoad(array(), $container);
|
||||
$loader->ormLoad(array(), $container);
|
||||
|
||||
$this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata'), $container->getParameter('doctrine.orm.metadata_driver.mapping_dirs'));
|
||||
$this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata/orm'), $container->getParameter('doctrine.orm.metadata_driver.mapping_dirs'));
|
||||
$this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.xml_mapping_dirs'));
|
||||
$this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.yml_mapping_dirs'));
|
||||
$this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Entity'), $container->getParameter('doctrine.orm.metadata_driver.entity_dirs'));
|
||||
|
Reference in New Issue
Block a user