From 13ad526833d841fdd3182ff97db1923441a37c2f Mon Sep 17 00:00:00 2001 From: jwage Date: Thu, 11 Mar 2010 14:49:44 +0000 Subject: [PATCH] [2.0] Fixing issue with comparing paths when they are not the realpath --- lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php b/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php index ffcbf817c..11fd17d4d 100644 --- a/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php +++ b/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php @@ -239,7 +239,10 @@ class ConvertMappingTask extends AbstractTask $em = $this->getConfiguration()->getAttribute('em'); 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') { + $source = realpath($source); $em = $this->getConfiguration()->getAttribute('em'); $metadataDriverImpl = $em->getConfiguration()->getMetadataDriverImpl(); if ($metadataDriverImpl instanceof \Doctrine\ORM\Mapping\Driver\DriverChain) {