RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63 from chesteroni/master

Browse Source 
Added missing checks for associatation indexes
This commit is contained in:
Benjamin Eberlei 2011-06-05 03:28:52 -07:00
commit 3cdff65761
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
View File

@ -121,21 +121,29 @@ class PhpExporter extends AbstractExporter
$associationMappingArray = array_merge($associationMappingArray, $oneToOneMappingArray); $associationMappingArray = array_merge($associationMappingArray, $oneToOneMappingArray);
} else if ($associationMapping['type'] == ClassMetadataInfo::ONE_TO_MANY) { } else if ($associationMapping['type'] == ClassMetadataInfo::ONE_TO_MANY) {
$method = 'mapOneToMany'; $method = 'mapOneToMany';
$oneToManyMappingArray = array( $potentialAssociationMappingIndexes = array(
'mappedBy' => $associationMapping['mappedBy'], 'mappedBy',
'orphanRemoval' => $associationMapping['orphanRemoval'], 'orphanRemoval',
'orderBy' => $associationMapping['orderBy'] 'orderBy',
); );
foreach ($potentialAssociationMappingIndexes as $index) {
if (isset($associationMapping[$index])) {
$oneToManyMappingArray[$index] = $associationMapping[$index];
}
}
$associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray); $associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray);
} else if ($associationMapping['type'] == ClassMetadataInfo::MANY_TO_MANY) { } else if ($associationMapping['type'] == ClassMetadataInfo::MANY_TO_MANY) {
$method = 'mapManyToMany'; $method = 'mapManyToMany';
$manyToManyMappingArray = array( $potentialAssociationMappingIndexes = array(
'mappedBy' => $associationMapping['mappedBy'], 'mappedBy',
'joinTable' => $associationMapping['joinTable'], 'joinTable',
'orderBy' => $associationMapping['orderBy'] 'orderBy',
); );
foreach ($potentialAssociationMappingIndexes as $index) {
if (isset($associationMapping[$index])) {
$manyToManyMappingArray[$index] = $associationMapping[$index];
}
}
$associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray); $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray);
} }