RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-12 22:36:02 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fixing ClassMetadataExporterTask to use existing configured annotation driver for given path instead of re-creating it

Browse Source
This commit is contained in:
jwage 2010-02-26 01:28:09 +00:00
parent c8ef304bcc
commit 61a4a35694
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php
View File

@ -215,13 +215,13 @@ class ConvertMappingTask extends AbstractTask
// Check if it has a class definition in it for annotations
if (preg_match("/class (.*)/", $contents)) {
return 'annotation';
return 'annotation';
// Otherwise lets determine the type based on the extension of the
// first file in the directory (yml, xml, etc)
} else {
$info = pathinfo($files[0]);
return $info['extension'];
$info = pathinfo($files[0]);
return $info['extension'];
}
// Nothing special for database
} else if ($source == 'database') {
@ -237,6 +237,21 @@ class ConvertMappingTask extends AbstractTask
$em = $this->getConfiguration()->getAttribute('em');
return $em->getConnection()->getSchemaManager();
} else if ($type == 'annotation') {
$em = $this->getConfiguration()->getAttribute('em');
$metadataDriverImpl = $em->getConfiguration()->getMetadataDriverImpl();
if ($metadataDriverImpl instanceof \Doctrine\ORM\Mapping\Driver\DriverChain) {
foreach ($metadataDriverImpl->getDrivers() as $namespace => $driver) {
if ($driver instanceof \Doctrine\ORM\Mapping\Driver\AnnotationDriver) {
$paths = $driver->getPaths();
if (in_array($source, $paths)) {
return $driver;
}
}
}
} else if ($metadataDriverImpl instanceof \Doctrine\ORM\Mapping\Driver\AnnotationDriver) {
return $metadataDriverImpl;
}
} else {
return $source;
}

6
lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php
View File

@ -105,10 +105,14 @@ class ClassMetadataExporter
*/
public function getMappingDriver($type, $source = null)
{
if ($source instanceof \Doctrine\ORM\Mapping\Driver\Driver) {
return $source;
}
if ( ! isset($this->_mappingDrivers[$type])) {
return false;
}
$class = $this->_mappingDrivers[$type];
if (is_subclass_of($class, 'Doctrine\ORM\Mapping\Driver\AbstractFileDriver')) {