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

Merge pull request #173 from jaikdean/master

Browse Source 
Fixed a couple of typos of 'discriminator'
This commit is contained in:
Benjamin Eberlei 2011-10-24 03:41:19 -07:00
commit 0cdf1e042c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -318,7 +318,7 @@ class ClassMetadataInfo implements ClassMetadata
public $discriminatorMap = array();
/**
* READ-ONLY: The definition of the descriminator column used in JOINED and SINGLE_TABLE
* READ-ONLY: The definition of the discriminator column used in JOINED and SINGLE_TABLE
* inheritance mappings.
*
* @var array

2
lib/Doctrine/ORM/Mapping/MappingException.php
View File

@ -288,7 +288,7 @@ class MappingException extends \Doctrine\ORM\ORMException
public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName)
{
return new self(
"Entity '" . $className . "' has to be part of the descriminator map of '" . $rootClassName . "' " .
"Entity '" . $className . "' has to be part of the discriminator map of '" . $rootClassName . "' " .
"to be properly mapped in the inheritance hierachy. Alternatively you can make '".$className."' an abstract class " .
"to avoid this exception from occuring."
);

2
tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
View File

@ -114,7 +114,7 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
*/
public function testUnmappedEntityInHierachy()
{
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' has to be part of the descriminator map of 'Doctrine\Tests\ORM\Mapping\HierachyBase' to be properly mapped in the inheritance hierachy. Alternatively you can make 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' an abstract class to avoid this exception from occuring.");
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' has to be part of the discriminator map of 'Doctrine\Tests\ORM\Mapping\HierachyBase' to be properly mapped in the inheritance hierachy. Alternatively you can make 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' an abstract class to avoid this exception from occuring.");
$class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyE');
}