Merge branch 'doctrine-mapping-convert'

* doctrine-mapping-convert:
  [DoctrineBundle] fixed extensions of generated files

src/Symfony/Bundle/DoctrineBundle/Command/Proxy/ConvertMappingDoctrineCommand.php

@@ -17,6 +17,8 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\Output;
 use Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand;
+use Doctrine\ORM\Tools\Export\Driver\XmlExporter;
+use Doctrine\ORM\Tools\Export\Driver\YamlExporter;
 
 /**
  * Convert Doctrine ORM metadata mapping information between the various supported
@@ -48,4 +50,17 @@ EOT
 
         return parent::execute($input, $output);
     }
-}
+
+
+    protected function getExporter($toType, $destPath)
+    {
+        $exporter = parent::getExporter($toType, $destPath);
+        if ($exporter instanceof XmlExporter) {
+            $exporter->setExtension('.orm.xml');
+        } elseif ($exporter instanceof YamlExporter) {
+            $exporter->setExtension('.orm.yml');
+        }
+
+        return $exporter;
+    }
+}