From 1edf6b65b1794f184bf549f30c263365848b1249 Mon Sep 17 00:00:00 2001 From: Vyacheslav Ganzin Date: Thu, 14 Nov 2013 10:58:11 +0200 Subject: [PATCH 1/2] joinColumn is not required in manyToMany annotation behavior copied --- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index a6880b018..86621d0fb 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -488,18 +488,20 @@ class YamlDriver extends FileDriver $joinTable['schema'] = $joinTableElement['schema']; } - foreach ($joinTableElement['joinColumns'] as $joinColumnName => $joinColumnElement) { - if ( ! isset($joinColumnElement['name'])) { - $joinColumnElement['name'] = $joinColumnName; - } + if (isset($joinTableElement['joinColumns'])) { + foreach ($joinTableElement['joinColumns'] as $joinColumnName => $joinColumnElement) { + if ( ! isset($joinColumnElement['name'])) { + $joinColumnElement['name'] = $joinColumnName; + } $joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumnElement); } - foreach ($joinTableElement['inverseJoinColumns'] as $joinColumnName => $joinColumnElement) { - if ( ! isset($joinColumnElement['name'])) { - $joinColumnElement['name'] = $joinColumnName; - } + if (isset($joinTableElement['inverseJoinColumns'])) { + foreach ($joinTableElement['inverseJoinColumns'] as $joinColumnName => $joinColumnElement) { + if ( ! isset($joinColumnElement['name'])) { + $joinColumnElement['name'] = $joinColumnName; + } $joinTable['inverseJoinColumns'][] = $this->joinColumnToArray($joinColumnElement); } From 2a9351b8dccd756c0072d15cc3d73a7d2bba847d Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Fri, 3 Jan 2014 23:01:05 +0100 Subject: [PATCH 2/2] [DDC-2792] Fix fatals --- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 86621d0fb..5549acae9 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -493,6 +493,7 @@ class YamlDriver extends FileDriver if ( ! isset($joinColumnElement['name'])) { $joinColumnElement['name'] = $joinColumnName; } + } $joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumnElement); } @@ -502,6 +503,7 @@ class YamlDriver extends FileDriver if ( ! isset($joinColumnElement['name'])) { $joinColumnElement['name'] = $joinColumnName; } + } $joinTable['inverseJoinColumns'][] = $this->joinColumnToArray($joinColumnElement); } @@ -620,7 +622,7 @@ class YamlDriver extends FileDriver } foreach ($entityListener as $eventName => $callbackElement){ - foreach ($callbackElement as $methodName){ + foreach ($callbackElement as $methodName) { $metadata->addEntityListener($eventName, $className, $methodName); } }