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

[2.0] Fix to yaml exporter to output associations in correct structure

Browse Source
This commit is contained in:
jwage 2009-09-30 04:48:37 +00:00
parent e6131d11ac
commit 8f2d59c289
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
View File

@ -122,6 +122,7 @@ class YamlExporter extends AbstractExporter
); );
$associationMappingArray = array_merge($associationMappingArray, $oneToOneMappingArray); $associationMappingArray = array_merge($associationMappingArray, $oneToOneMappingArray);
$array['oneToOne'][$name] = $associationMappingArray;
} else if ($associationMapping instanceof \Doctrine\ORM\Mapping\OneToManyMapping) { } else if ($associationMapping instanceof \Doctrine\ORM\Mapping\OneToManyMapping) {
$oneToManyMappingArray = array( $oneToManyMappingArray = array(
'mappedBy' => $associationMapping->mappedByFieldName, 'mappedBy' => $associationMapping->mappedByFieldName,
@ -129,6 +130,7 @@ class YamlExporter extends AbstractExporter
); );
$associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray); $associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray);
$array['oneToMany'][$name] = $associationMappingArray;
} else if ($associationMapping instanceof \Doctrine\ORM\Mapping\ManyToManyMapping) { } else if ($associationMapping instanceof \Doctrine\ORM\Mapping\ManyToManyMapping) {
$manyToManyMappingArray = array( $manyToManyMappingArray = array(
'mappedBy' => $associationMapping->mappedByFieldName, 'mappedBy' => $associationMapping->mappedByFieldName,
@ -136,13 +138,10 @@ class YamlExporter extends AbstractExporter
); );
$associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray); $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray);
$array['manyToMany'][$name] = $associationMappingArray;
} }
$associations[$name] = $associationMappingArray;
} }
$array['associations'] = $associations;
return \sfYaml::dump(array($metadata->name => $array), 10); return \sfYaml::dump(array($metadata->name => $array), 10);
} }
} }