RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

DDC-510 - Moved AnnotationDriver Factory Method onto Configuration instance

Browse source
This commit is contained in:
Benjamin Eberlei 2010-04-11 11:06:54 +02:00
parent 45cd2afd27
commit 317e84d8d7
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/Doctrine/ORM/Configuration.php
View file

@ -130,6 +130,20 @@ class Configuration extends \Doctrine\DBAL\Configuration
$this->_attributes['metadataDriverImpl'] = $driverImpl; $this->_attributes['metadataDriverImpl'] = $driverImpl;
} }
/**
* Add a new default annotation driver with a correctly configured annotation reader.
*
* @param array $paths
* @return Mapping\Driver\AnnotationDriver
*/
public function newDefaultAnnotationDriver($paths = array())
{
$reader = new \Doctrine\Common\Annotations\AnnotationReader();
$reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\');
return new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, (array)$paths);
}
/** /**
* Adds a namespace under a certain alias. * Adds a namespace under a certain alias.
* *

3
tests/Doctrine/Tests/OrmFunctionalTestCase.php
View file

@ -235,8 +235,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
$config->setProxyDir(__DIR__ . '/Proxies'); $config->setProxyDir(__DIR__ . '/Proxies');
$config->setProxyNamespace('Doctrine\Tests\Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies');
$driverImpl = \Doctrine\ORM\Mapping\Driver\AnnotationDriver::create(); $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver());
$config->setMetadataDriverImpl($driverImpl);
$conn = $this->sharedFixture['conn']; $conn = $this->sharedFixture['conn'];
$conn->getConfiguration()->setSQLLogger($this->_sqlLoggerStack); $conn->getConfiguration()->setSQLLogger($this->_sqlLoggerStack);

5
tests/Doctrine/Tests/OrmTestCase.php
View file

@ -30,9 +30,8 @@ abstract class OrmTestCase extends DoctrineTestCase
} else { } else {
$config->setMetadataCacheImpl(new \Doctrine\Common\Cache\ArrayCache); $config->setMetadataCacheImpl(new \Doctrine\Common\Cache\ArrayCache);
} }
$driverImpl = \Doctrine\ORM\Mapping\Driver\AnnotationDriver::create(); $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver());
$config->setMetadataDriverImpl($driverImpl);
$config->setQueryCacheImpl(self::getSharedQueryCacheImpl()); $config->setQueryCacheImpl(self::getSharedQueryCacheImpl());
$config->setProxyDir(__DIR__ . '/Proxies'); $config->setProxyDir(__DIR__ . '/Proxies');