RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-10 17:29:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DDC-2792'

Browse Source
This commit is contained in:
Benjamin Eberlei 2014-01-03 23:01:12 +01:00
commit 8de37de4f7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
View File

@ -488,17 +488,21 @@ class YamlDriver extends FileDriver
$joinTable['schema'] = $joinTableElement['schema']; $joinTable['schema'] = $joinTableElement['schema'];
} }
foreach ($joinTableElement['joinColumns'] as $joinColumnName => $joinColumnElement) { if (isset($joinTableElement['joinColumns'])) {
if ( ! isset($joinColumnElement['name'])) { foreach ($joinTableElement['joinColumns'] as $joinColumnName => $joinColumnElement) {
$joinColumnElement['name'] = $joinColumnName; if ( ! isset($joinColumnElement['name'])) {
$joinColumnElement['name'] = $joinColumnName;
}
} }
$joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumnElement); $joinTable['joinColumns'][] = $this->joinColumnToArray($joinColumnElement);
} }
foreach ($joinTableElement['inverseJoinColumns'] as $joinColumnName => $joinColumnElement) { if (isset($joinTableElement['inverseJoinColumns'])) {
if ( ! isset($joinColumnElement['name'])) { foreach ($joinTableElement['inverseJoinColumns'] as $joinColumnName => $joinColumnElement) {
$joinColumnElement['name'] = $joinColumnName; if ( ! isset($joinColumnElement['name'])) {
$joinColumnElement['name'] = $joinColumnName;
}
} }
$joinTable['inverseJoinColumns'][] = $this->joinColumnToArray($joinColumnElement); $joinTable['inverseJoinColumns'][] = $this->joinColumnToArray($joinColumnElement);
@ -618,7 +622,7 @@ class YamlDriver extends FileDriver
} }
foreach ($entityListener as $eventName => $callbackElement){ foreach ($entityListener as $eventName => $callbackElement){
foreach ($callbackElement as $methodName){ foreach ($callbackElement as $methodName) {
$metadata->addEntityListener($eventName, $className, $methodName); $metadata->addEntityListener($eventName, $className, $methodName);
} }
} }