From 5e938b3147ea2b9b58b193befb849af0a911ee5b Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 15 May 2011 20:39:55 +0200 Subject: [PATCH] Revert "Implemented auto-inference of isCascadeRemove when orphanRemoval is defined (marked as todo)." This reverts commit 551247d11a0346dfb878a1e3571655a9395958ab. --- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index b52029421..f556257f9 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -909,13 +909,9 @@ class ClassMetadataInfo implements ClassMetadata $mapping['targetToSourceKeyColumns'] = array_flip($mapping['sourceToTargetKeyColumns']); } + //TODO: if orphanRemoval, cascade=remove is implicit! $mapping['orphanRemoval'] = isset($mapping['orphanRemoval']) ? (bool) $mapping['orphanRemoval'] : false; - - // if orphanRemoval, cascade=remove is implicit - if ($mapping['orphanRemoval']) { - $mapping['isCascadeRemove'] = true; - } if (isset($mapping['id']) && $mapping['id'] === true && !$mapping['isOwningSide']) { throw MappingException::illegalInverseIdentifierAssocation($this->name, $mapping['fieldName']); @@ -940,14 +936,10 @@ class ClassMetadataInfo implements ClassMetadata throw MappingException::oneToManyRequiresMappedBy($mapping['fieldName']); } + //TODO: if orphanRemoval, cascade=remove is implicit! $mapping['orphanRemoval'] = isset($mapping['orphanRemoval']) ? (bool) $mapping['orphanRemoval'] : false; - // if orphanRemoval, cascade=remove is implicit - if ($mapping['orphanRemoval']) { - $mapping['isCascadeRemove'] = true; - } - if (isset($mapping['orderBy'])) { if ( ! is_array($mapping['orderBy'])) { throw new \InvalidArgumentException("'orderBy' is expected to be an array, not ".gettype($mapping['orderBy']));