From 8f2d59c289372ac107ae53d3f649a3c6096391a8 Mon Sep 17 00:00:00 2001 From: jwage Date: Wed, 30 Sep 2009 04:48:37 +0000 Subject: [PATCH] [2.0] Fix to yaml exporter to output associations in correct structure --- lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php index 5991e5289..a06c77a7f 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php @@ -122,6 +122,7 @@ class YamlExporter extends AbstractExporter ); $associationMappingArray = array_merge($associationMappingArray, $oneToOneMappingArray); + $array['oneToOne'][$name] = $associationMappingArray; } else if ($associationMapping instanceof \Doctrine\ORM\Mapping\OneToManyMapping) { $oneToManyMappingArray = array( 'mappedBy' => $associationMapping->mappedByFieldName, @@ -129,6 +130,7 @@ class YamlExporter extends AbstractExporter ); $associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray); + $array['oneToMany'][$name] = $associationMappingArray; } else if ($associationMapping instanceof \Doctrine\ORM\Mapping\ManyToManyMapping) { $manyToManyMappingArray = array( 'mappedBy' => $associationMapping->mappedByFieldName, @@ -136,12 +138,9 @@ class YamlExporter extends AbstractExporter ); $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray); + $array['manyToMany'][$name] = $associationMappingArray; } - - $associations[$name] = $associationMappingArray; } - - $array['associations'] = $associations; return \sfYaml::dump(array($metadata->name => $array), 10); }