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

[DDC-1746] Throw exception on invalid cascade option.

Browse Source
This commit is contained in:
Benjamin Eberlei 2012-04-01 11:01:41 +02:00
parent c5c3719e79
commit 5b18718b92
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1210,6 +1210,12 @@ class ClassMetadataInfo implements ClassMetadata
$cascades = array('remove', 'persist', 'refresh', 'merge', 'detach'); $cascades = array('remove', 'persist', 'refresh', 'merge', 'detach');
} }
if (count($cascades) !== count(array_intersect($cascades, array('remove', 'persist', 'refresh', 'merge', 'detach')))) {
throw MappingException::invalidCascadeOption(
array_diff($cascades, array_intersect($cascades, array('remove', 'persist', 'refresh', 'merge', 'detach')))
);
}
$mapping['cascade'] = $cascades; $mapping['cascade'] = $cascades;
$mapping['isCascadeRemove'] = in_array('remove', $cascades); $mapping['isCascadeRemove'] = in_array('remove', $cascades);
$mapping['isCascadePersist'] = in_array('persist', $cascades); $mapping['isCascadePersist'] = in_array('persist', $cascades);

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

@ -354,4 +354,13 @@ 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)
{
$cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades));
return new self(
"Invalid cascade option(s) specified: " . $cascades . ". " .
"Only 'remove', 'persist', 'refresh', 'merge' and 'detach' are allowed."
);
}
} }

12
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
View File

@ -637,6 +637,18 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
$this->assertEquals('cms_cmsaddress_cms_cmsuser', $addressMetadata->associationMappings['user']['joinTable']['name']); $this->assertEquals('cms_cmsaddress_cms_cmsuser', $addressMetadata->associationMappings['user']['joinTable']['name']);
$this->assertEquals('doctrineglobal_article_cms_cmsuser', $articleMetadata->associationMappings['author']['joinTable']['name']); $this->assertEquals('doctrineglobal_article_cms_cmsuser', $articleMetadata->associationMappings['author']['joinTable']['name']);
} }
/**
* @group DDC-1746
*/
public function testInvalidCascade()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
$cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);
$this->setExpectedException("Doctrine\ORM\Mapping\MappingException", "Invalid cascade option(s) specified: 'invalid'. Only 'remove', 'persist', 'refresh', 'merge' and 'detach' are allowed.");
$cm->mapManyToOne(array('fieldName' => 'address', 'targetEntity' => 'UnknownClass', 'cascade' => array('invalid')));
}
} }
class MyNamespacedNamingStrategy extends \Doctrine\ORM\Mapping\DefaultNamingStrategy class MyNamespacedNamingStrategy extends \Doctrine\ORM\Mapping\DefaultNamingStrategy