Skip to content

D
doctrine-dbal
Commit 13ad5268 authored by jwage's avatar jwage
Browse files
Options

[2.0] Fixing issue with comparing paths when they are not the realpath

parent 757a9529
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php
View file @ 13ad5268
...@@ -239,7 +239,10 @@ class ConvertMappingTask extends AbstractTask ...@@ -239,7 +239,10 @@ class ConvertMappingTask extends AbstractTask
$em = $this->getConfiguration()->getAttribute('em'); $em = $this->getConfiguration()->getAttribute('em');
return $em->getConnection()->getSchemaManager(); return $em->getConnection()->getSchemaManager();
// If source is annotation then lets try and find the existing annotation
// driver for the source instead of re-creating a new instance
} else if ($type == 'annotation') { } else if ($type == 'annotation') {
$source = realpath($source);
$em = $this->getConfiguration()->getAttribute('em'); $em = $this->getConfiguration()->getAttribute('em');
$metadataDriverImpl = $em->getConfiguration()->getMetadataDriverImpl(); $metadataDriverImpl = $em->getConfiguration()->getMetadataDriverImpl();
if ($metadataDriverImpl instanceof \Doctrine\ORM\Mapping\Driver\DriverChain) { if ($metadataDriverImpl instanceof \Doctrine\ORM\Mapping\Driver\DriverChain) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment