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

Merge branch 'master' of github.com:doctrine/doctrine2

Browse source
This commit is contained in:
Benjamin Eberlei 2011-08-06 18:15:00 +02:00
commit 15c877b8e8
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
/** /**
* Gets the namespace where proxy classes reside. * Gets the namespace where proxy classes reside.
* *
* @return string * @return string
*/ */
public function getProxyNamespace() public function getProxyNamespace()
@ -96,7 +96,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
/** /**
* Sets the namespace where proxy classes reside. * Sets the namespace where proxy classes reside.
* *
* @param string $ns * @param string $ns
*/ */
public function setProxyNamespace($ns) public function setProxyNamespace($ns)
@ -118,22 +118,23 @@ class Configuration extends \Doctrine\DBAL\Configuration
/** /**
* Add a new default annotation driver with a correctly configured annotation reader. * Add a new default annotation driver with a correctly configured annotation reader.
* *
* @param array $paths * @param array $paths
* @return Mapping\Driver\AnnotationDriver * @return Mapping\Driver\AnnotationDriver
*/ */
public function newDefaultAnnotationDriver($paths = array()) public function newDefaultAnnotationDriver($paths = array())
{ {
if (version_compare(\Doctrine\Common\Version::VERSION, '3.0.0-DEV', '>=')) { if (version_compare(\Doctrine\Common\Version::VERSION, '2.2.0-DEV', '>=')) {
// Register the ORM Annotations in the AnnotationRegistry // Register the ORM Annotations in the AnnotationRegistry
AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php'); AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
$reader = new AnnotationReader(); $reader = new \Doctrine\Common\Annotations\SimpleAnnotationReader();
$reader->addNamespace('Doctrine\ORM\Mapping');
$reader = new \Doctrine\Common\Annotations\CachedReader($reader, new ArrayCache()); $reader = new \Doctrine\Common\Annotations\CachedReader($reader, new ArrayCache());
} else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-DEV', '>=')) { } else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-DEV', '>=')) {
// Register the ORM Annotations in the AnnotationRegistry // Register the ORM Annotations in the AnnotationRegistry
AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php'); AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php');
$reader = new AnnotationReader(); $reader = new AnnotationReader();
$reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\');
$reader->setIgnoreNotImportedAnnotations(true); $reader->setIgnoreNotImportedAnnotations(true);
@ -162,7 +163,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
/** /**
* Resolves a registered namespace alias to the full namespace. * Resolves a registered namespace alias to the full namespace.
* *
* @param string $entityNamespaceAlias * @param string $entityNamespaceAlias
* @return string * @return string
* @throws MappingException * @throws MappingException
*/ */
@ -185,10 +186,10 @@ class Configuration extends \Doctrine\DBAL\Configuration
{ {
$this->_attributes['entityNamespaces'] = $entityNamespaces; $this->_attributes['entityNamespaces'] = $entityNamespaces;
} }
/** /**
* Retrieves the list of registered entity namespace aliases. * Retrieves the list of registered entity namespace aliases.
* *
* @return array * @return array
*/ */
public function getEntityNamespaces() public function getEntityNamespaces()
@ -360,7 +361,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
/** /**
* Gets the implementation class name of a registered custom string DQL function. * Gets the implementation class name of a registered custom string DQL function.
* *
* @param string $name * @param string $name
* @return string * @return string
*/ */
@ -403,7 +404,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
/** /**
* Gets the implementation class name of a registered custom numeric DQL function. * Gets the implementation class name of a registered custom numeric DQL function.
* *
* @param string $name * @param string $name
* @return string * @return string
*/ */
@ -446,7 +447,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
/** /**
* Gets the implementation class name of a registered custom date/time DQL function. * Gets the implementation class name of a registered custom date/time DQL function.
* *
* @param string $name * @param string $name
* @return string * @return string
*/ */
@ -497,7 +498,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
/** /**
* Set a class metadata factory. * Set a class metadata factory.
* *
* @param string $cmf * @param string $cmf
*/ */
public function setClassMetadataFactoryName($cmfName) public function setClassMetadataFactoryName($cmfName)