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

#1130 DDC-3300 - minor refactoring (else removal, spacing)

Browse source
This commit is contained in:
Marco Pivetta 2015-01-15 03:05:27 +01:00
parent 786c34faa5
commit 8579baf28c
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View file

@ -2745,15 +2745,18 @@ class ClassMetadataInfo implements ClassMetadata
$className = ltrim($className, '\\'); $className = ltrim($className, '\\');
$this->discriminatorMap[$name] = $className; $this->discriminatorMap[$name] = $className;
if ($this->name == $className) { if ($this->name === $className) {
$this->discriminatorValue = $name; $this->discriminatorValue = $name;
} else {
if ( ! class_exists($className) && ! interface_exists($className)) { return;
throw MappingException::invalidClassInDiscriminatorMap($className, $this->name); }
}
if (is_subclass_of($className, $this->name) && ! in_array($className, $this->subClasses)) { if ( ! (class_exists($className) || interface_exists($className))) {
$this->subClasses[] = $className; throw MappingException::invalidClassInDiscriminatorMap($className, $this->name);
} }
if (is_subclass_of($className, $this->name) && ! in_array($className, $this->subClasses)) {
$this->subClasses[] = $className;
} }
} }