From de26952e296e1c34da3019c46abbd12b8453ef0e Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 7 Apr 2012 10:42:54 +0200 Subject: [PATCH] [DDC-1534] YamlDriver wrongly used "inversedBy" inside join table condition although its independent. --- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 7db57dbad..0c4fb43cb 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -412,9 +412,6 @@ class YamlDriver extends AbstractFileDriver if (isset($manyToManyElement['mappedBy'])) { $mapping['mappedBy'] = $manyToManyElement['mappedBy']; } else if (isset($manyToManyElement['joinTable'])) { - if (isset($manyToManyElement['inversedBy'])) { - $mapping['inversedBy'] = $manyToManyElement['inversedBy']; - } $joinTableElement = $manyToManyElement['joinTable']; $joinTable = array( @@ -444,6 +441,10 @@ class YamlDriver extends AbstractFileDriver $mapping['joinTable'] = $joinTable; } + if (isset($manyToManyElement['inversedBy'])) { + $mapping['inversedBy'] = $manyToManyElement['inversedBy']; + } + if (isset($manyToManyElement['cascade'])) { $mapping['cascade'] = $manyToManyElement['cascade']; }