From b2fe3820fcda3496f91cf43218cc4e3e1049579f Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 10 Apr 2010 12:31:48 +0200 Subject: [PATCH] DDC-502, DDC-507 - Changes to how Annotation Metadata Driver is handled in SchemaTool Command, Specifiying Mapping paths is now required for this to work. --- .../Tools/Console/Command/SchemaTool/AbstractCommand.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php index 017d7b636..12712383f 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php @@ -27,7 +27,8 @@ use Symfony\Components\Console\Input\InputArgument, Symfony\Components\Console\Output\OutputInterface, Symfony\Components\Console\Command\Command, Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper, - Doctrine\ORM\Tools\SchemaTool; + Doctrine\ORM\Tools\SchemaTool, + Doctrine\ORM\Mapping\Driver\AbstractFileDriver; abstract class AbstractCommand extends Command { @@ -51,7 +52,11 @@ abstract class AbstractCommand extends Command $reader = new \Doctrine\ORM\Tools\ClassMetadataReader(); $reader->setEntityManager($em); - $reader->addMappingSource($em->getConfiguration()->getMetadataDriverImpl()); + + $metadataDriver = $em->getConfiguration()->getMetadataDriverImpl(); + if ($metadataDriver instanceof AbstractFileDriver) { + $reader->addMappingSource($metadataDriver); + } // Process source directories if ($emHelper->hasAdditionalMappingPathInformation()) {