RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-20 07:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Stoffing and including changes of doctrine/common#138

Browse Source
This commit is contained in:
Marco Pivetta 2012-06-10 23:52:48 +02:00
parent f6381d7b76
commit 97d7cae012
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
View File

@ -65,7 +65,6 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
/** /**
* @param EntityManager $em * @param EntityManager $em
* @return void
*/ */
public function setEntityManager(EntityManager $em) public function setEntityManager(EntityManager $em)
{ {
@ -144,15 +143,15 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
$class->containsForeignIdentifier = true; $class->containsForeignIdentifier = true;
} }
if ($parent && !empty ($parent->namedQueries)) { if ($parent && !empty($parent->namedQueries)) {
$this->addInheritedNamedQueries($class, $parent); $this->addInheritedNamedQueries($class, $parent);
} }
if ($parent && !empty ($parent->namedNativeQueries)) { if ($parent && !empty($parent->namedNativeQueries)) {
$this->addInheritedNamedNativeQueries($class, $parent); $this->addInheritedNamedNativeQueries($class, $parent);
} }
if ($parent && !empty ($parent->sqlResultSetMappings)) { if ($parent && !empty($parent->sqlResultSetMappings)) {
$this->addInheritedSqlResultSetMappings($class, $parent); $this->addInheritedSqlResultSetMappings($class, $parent);
} }
@ -177,7 +176,6 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
* @param ClassMetadata $class * @param ClassMetadata $class
* @param $parent * @param $parent
* @throws MappingException * @throws MappingException
* @return void
*/ */
protected function validateRuntimeMetadata($class, $parent) protected function validateRuntimeMetadata($class, $parent)
{ {
@ -229,7 +227,6 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
* *
* @param \Doctrine\ORM\Mapping\ClassMetadata $class * @param \Doctrine\ORM\Mapping\ClassMetadata $class
* @throws MappingException * @throws MappingException
* @return void
*/ */
private function addDefaultDiscriminatorMap(ClassMetadata $class) private function addDefaultDiscriminatorMap(ClassMetadata $class)
{ {
@ -301,7 +298,6 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
* @param \Doctrine\ORM\Mapping\ClassMetadata $subClass * @param \Doctrine\ORM\Mapping\ClassMetadata $subClass
* @param \Doctrine\ORM\Mapping\ClassMetadata $parentClass * @param \Doctrine\ORM\Mapping\ClassMetadata $parentClass
* @throws MappingException * @throws MappingException
* @return void
*/ */
private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $parentClass) private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $parentClass)
{ {
@ -401,7 +397,6 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
* *
* @param ClassMetadataInfo $class * @param ClassMetadataInfo $class
* @throws ORMException * @throws ORMException
* @return void
*/ */
private function completeIdGeneratorMapping(ClassMetadataInfo $class) private function completeIdGeneratorMapping(ClassMetadataInfo $class)
{ {
@ -498,26 +493,6 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
} }
} }
/**
* {@inheritDoc}
*
* @todo remove after doctrine/common#138 is merged
*/
public function isTransient($class)
{
if ( ! $this->initialized) {
$this->initialize();
}
// Check for namespace alias
if (strpos($class, ':') !== false) {
list($namespaceAlias, $simpleClassName) = explode(':', $class);
$class = $this->getFqcnFromAlias($namespaceAlias, $simpleClassName);
}
return $this->driver->isTransient($class);
}
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */