From c680b8fe1df64228d47f34b2d378897378492d62 Mon Sep 17 00:00:00 2001 From: guilhermeblanco Date: Mon, 8 Mar 2010 23:42:38 +0000 Subject: [PATCH] [2.0] Fixed AnnotationDriver that was incorrectly inspecting cascades in associations. --- .../ORM/Tools/Export/Driver/AnnotationExporter.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php index 74bc8a3c9..84c2cc4f7 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php @@ -357,11 +357,11 @@ class AnnotationExporter extends AbstractExporter } if ($associationMapping->hasCascades()) { $cascades = array(); - if ($this->isCascadePersist) $cascades[] = '"persist"'; - if ($this->isCascadeRemove) $cascades[] = '"remove"'; - if ($this->isCascadeDetach) $cascades[] = '"detach"'; - if ($this->isCascadeMerge) $cascades[] = '"merge"'; - if ($this->isCascadeRefresh) $cascades[] = '"refresh"'; + if ($associationMapping->isCascadePersist) $cascades[] = '"persist"'; + if ($associationMapping->isCascadeRemove) $cascades[] = '"remove"'; + if ($associationMapping->isCascadeDetach) $cascades[] = '"detach"'; + if ($associationMapping->isCascadeMerge) $cascades[] = '"merge"'; + if ($associationMapping->isCascadeRefresh) $cascades[] = '"refresh"'; $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}'; } if (isset($associationMapping->orphanRemoval) && $associationMapping->orphanRemoval) {