RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 15:16:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #481 from beejeebus/master

Browse Source 
check for false as a return value from get_parent_class(), not null
This commit is contained in:
Guilherme Blanco 2012-10-21 20:54:22 -07:00
commit 9d0b254407
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ class MappingException extends \Doctrine\ORM\ORMException
public static function identifierRequired($entityName) public static function identifierRequired($entityName)
{ {
if (null !== ($parent = get_parent_class($entityName))) { if (false !== ($parent = get_parent_class($entityName))) {
return new self(sprintf( return new self(sprintf(
'No identifier/primary key specified for Entity "%s" sub class of "%s". Every Entity must have an identifier/primary key.', 'No identifier/primary key specified for Entity "%s" sub class of "%s". Every Entity must have an identifier/primary key.',
$entityName, $parent $entityName, $parent
@ -206,7 +206,7 @@ class MappingException extends \Doctrine\ORM\ORMException
public static function classIsNotAValidEntityOrMappedSuperClass($className) public static function classIsNotAValidEntityOrMappedSuperClass($className)
{ {
if (null !== ($parent = get_parent_class($className))) { if (false !== ($parent = get_parent_class($className))) {
return new self(sprintf( return new self(sprintf(
'Class "%s" sub class of "%s" is not a valid entity or mapped super class.', 'Class "%s" sub class of "%s" is not a valid entity or mapped super class.',
$className, $parent $className, $parent