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

[DoctrineBundle] fix mapping dirs

Browse Source
This commit is contained in:
ornicar 2010-09-03 09:25:31 -07:00 committed by Fabien Potencier
parent eaaf447374
commit b9a7b7e51a
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php
View File

@ -75,7 +75,7 @@ EOT
if ($type === 'annotation') { if ($type === 'annotation') {
$destPath .= '/Entity'; $destPath .= '/Entity';
} else { } else {
$destPath .= '/Resources/config/doctrine/metadata'; $destPath .= '/Resources/config/doctrine/metadata/orm';
} }
// adjust so file naming works // adjust so file naming works

4
src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php
View File

@ -113,7 +113,7 @@ EOT
$exporter->setEntityGenerator($this->getEntityGenerator()); $exporter->setEntityGenerator($this->getEntityGenerator());
} else { } else {
$mappingType = $mappingType == 'yaml' ? 'yml' : $mappingType; $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); $code = $exporter->exportClassMetadata($class);
@ -126,4 +126,4 @@ EOT
$output->writeln(sprintf(' > generating <comment>%s</comment>', $fullEntityClassName)); $output->writeln(sprintf(' > generating <comment>%s</comment>', $fullEntityClassName));
file_put_contents($path, $code); file_put_contents($path, $code);
} }
} }

4
src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php
View File

@ -73,7 +73,7 @@ EOT
if ($type === 'annotation') { if ($type === 'annotation') {
$destPath .= '/Entity'; $destPath .= '/Entity';
} else { } else {
$destPath .= '/Resources/config/doctrine/metadata'; $destPath .= '/Resources/config/doctrine/metadata/orm';
} }
if ($type === 'yaml') { if ($type === 'yaml') {
$type = 'yml'; $type = 'yml';
@ -116,4 +116,4 @@ EOT
$output->writeln('Database does not have any mapping information.'.PHP_EOL, 'ERROR'); $output->writeln('Database does not have any mapping information.'.PHP_EOL, 'ERROR');
} }
} }
} }

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

@ -481,7 +481,7 @@ class DoctrineExtension extends Extension
static protected function detectMetadataDriver($dir, ContainerBuilder $container) static protected function detectMetadataDriver($dir, ContainerBuilder $container)
{ {
// add the closest existing directory as a resource // 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)) { while (!is_dir($resource)) {
$resource = dirname($resource); $resource = dirname($resource);
} }

4
src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
View File

@ -339,7 +339,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
$loader->dbalLoad(array(), $container); $loader->dbalLoad(array(), $container);
$loader->ormLoad(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.xml_mapping_dirs'));
$this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.yml_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')); $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->dbalLoad(array(), $container);
$loader->ormLoad(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.xml_mapping_dirs'));
$this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.yml_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')); $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Entity'), $container->getParameter('doctrine.orm.metadata_driver.entity_dirs'));