Skip to content

Ensure "cascade" mapping is set for ResolveTargetDocumentListener #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Ensure "cascade" mapping is set for ResolveTargetDocumentListener #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,27 +1056,25 @@ public function mapField(array $mapping)
throw MappingException::cascadeOnEmbeddedNotAllowed($this->name, $mapping['fieldName']);
}

if (isset($mapping['cascade']) && is_string($mapping['cascade'])) {
$mapping['cascade'] = array($mapping['cascade']);
$cascades = isset($mapping['cascade']) ? array_map('strtolower', (array) $mapping['cascade']) : array();

if (in_array('all', $cascades) || isset($mapping['embedded'])) {
$cascades = array('remove', 'persist', 'refresh', 'merge', 'detach', 'callbacks');
}
if (isset($mapping['cascade']) && in_array('all', (array) $mapping['cascade'])) {

if (isset($mapping['embedded'])) {
unset($mapping['cascade']);
$default = true;
} else {
$default = isset($mapping['embedded']) ? true : false;
} elseif (isset($mapping['cascade'])) {
$mapping['cascade'] = $cascades;
}
$mapping['isCascadeRemove'] = $default;
$mapping['isCascadePersist'] = $default;
$mapping['isCascadeRefresh'] = $default;
$mapping['isCascadeMerge'] = $default;
$mapping['isCascadeDetach'] = $default;
$mapping['isCascadeCallbacks'] = $default;
if (isset($mapping['cascade']) && is_array($mapping['cascade'])) {
foreach ($mapping['cascade'] as $cascade) {
$mapping['isCascade' . ucfirst($cascade)] = true;
}
}
unset($mapping['cascade']);

$mapping['isCascadeRemove'] = in_array('remove', $cascades);
$mapping['isCascadePersist'] = in_array('persist', $cascades);
$mapping['isCascadeRefresh'] = in_array('refresh', $cascades);
$mapping['isCascadeMerge'] = in_array('merge', $cascades);
$mapping['isCascadeDetach'] = in_array('detach', $cascades);
$mapping['isCascadeCallbacks'] = in_array('callbacks', $cascades);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than expectations in tests, I don't see isCascadeCallbacks used anywhere in ODM. ORM has no such cascade, either. @jwage: is this obsolete and a candidate for removal?


if (isset($mapping['type']) && $mapping['type'] === 'file') {
$mapping['file'] = true;
}
Expand Down
3 changes: 3 additions & 0 deletions tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/AbstractDriverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public function testDriver()
'reference' => true,
'simple' => true,
'targetDocument' => 'Documents\Profile',
'cascade' => array('remove', 'persist', 'refresh', 'merge', 'detach', 'callbacks'),
'isCascadeCallbacks' => true,
'isCascadeDetach' => true,
'isCascadeMerge' => true,
Expand All @@ -164,6 +165,7 @@ public function testDriver()
'reference' => true,
'simple' => false,
'targetDocument' => 'Documents\Account',
'cascade' => array('remove', 'persist', 'refresh', 'merge', 'detach', 'callbacks'),
'isCascadeCallbacks' => true,
'isCascadeDetach' => true,
'isCascadeMerge' => true,
Expand All @@ -190,6 +192,7 @@ public function testDriver()
'reference' => true,
'simple' => false,
'targetDocument' => 'Documents\Group',
'cascade' => array('remove', 'persist', 'refresh', 'merge', 'detach', 'callbacks'),
'isCascadeCallbacks' => true,
'isCascadeDetach' => true,
'isCascadeMerge' => true,
Expand Down