RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-06 15:29:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'schmittjoh/betterExMessage'

Browse Source
This commit is contained in:
Alexander 2012-05-04 18:20:56 +02:00
commit 3403305b3d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1322,7 +1322,9 @@ class ClassMetadataInfo implements ClassMetadata
if (count($cascades) !== count(array_intersect($cascades, array('remove', 'persist', 'refresh', 'merge', 'detach')))) { if (count($cascades) !== count(array_intersect($cascades, array('remove', 'persist', 'refresh', 'merge', 'detach')))) {
throw MappingException::invalidCascadeOption( throw MappingException::invalidCascadeOption(
array_diff($cascades, array_intersect($cascades, array('remove', 'persist', 'refresh', 'merge', 'detach'))) array_diff($cascades, array_intersect($cascades, array('remove', 'persist', 'refresh', 'merge', 'detach'))),
$this->name,
$mapping['fieldName']
); );
} }

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

@ -422,12 +422,14 @@ class MappingException extends \Doctrine\ORM\ORMException
return new self("The target-entity " . $targetEntity . " cannot be found in '" . $sourceEntity."#".$associationName."'."); return new self("The target-entity " . $targetEntity . " cannot be found in '" . $sourceEntity."#".$associationName."'.");
} }
public static function invalidCascadeOption(array $cascades) public static function invalidCascadeOption(array $cascades, $className, $propertyName)
{ {
$cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades)); $cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades));
return new self( return new self(sprintf(
"Invalid cascade option(s) specified: " . $cascades . ". " . 'You have specified invalid cascade options for %s::$%s: %s; available options: "remove", "persist", "refresh", "merge", and "detach"',
"Only 'remove', 'persist', 'refresh', 'merge' and 'detach' are allowed." $className,
); $propertyName,
$cascades
));
} }
} }