Merge remote-tracking branch 'origin/2.0.x' into 2.0.x

Seldaek · Jun 5, 2011 · c12c6e8 · c12c6e8
2 parents 505f7bd + be03811
commit c12c6e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php
@@ -137,8 +137,7 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
 
         $toType = strtolower($input->getArgument('to-type'));
 
-        $cme = new ClassMetadataExporter();
-        $exporter = $cme->getExporter($toType, $destPath);
+        $exporter = $this->getExporter($toType, $destPath);
         $exporter->setOverwriteExistingFiles( ($input->getOption('force') !== false) );
 
         if ($toType == 'annotation') {
@@ -167,4 +166,11 @@ protected function execute(Console\Input\InputInterface $input, Console\Output\O
             $output->write('No Metadata Classes to process.' . PHP_EOL);
         }
     }
+
+    protected function getExporter($toType, $destPath)
+    {
+        $cme = new ClassMetadataExporter();
+
+        return $cme->getExporter($toType, $destPath);
+    }
 }
diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php
@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.0.5-DEV';
+    const VERSION = '2.0.6-DEV';
 
     /**
      * Compares a Doctrine version with the current one.