From 17ae8d1b2d579225453531dfc1dd60ba36e3b98e Mon Sep 17 00:00:00 2001 From: Pantel Date: Sat, 31 Oct 2015 16:02:14 +0100 Subject: [PATCH] [DDC-3711] Correct Error on manyToMany with composite primary key --- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 95d148318..eab510b1e 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -514,9 +514,8 @@ class YamlDriver extends FileDriver if ( ! isset($joinColumnElement['name'])) { $joinColumnElement['name'] = $joinColumnName; } + $joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumnElement); } - - $joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumnElement); } if (isset($joinTableElement['inverseJoinColumns'])) { @@ -524,9 +523,8 @@ class YamlDriver extends FileDriver if ( ! isset($joinColumnElement['name'])) { $joinColumnElement['name'] = $joinColumnName; } + $joinTable['inverseJoinColumns'][] = $this->joinColumnToArray($joinColumnElement); } - - $joinTable['inverseJoinColumns'][] = $this->joinColumnToArray($joinColumnElement); } $mapping['joinTable'] = $joinTable;