Doctrine

Timestamp:

03/17/10 18:33:25 (4 months ago)

Author:

jwage

Message:

[2.0] Extracting Doctrine 1 schema conversion from orm:convert-mapping task to a orm:convert-d1-schema task

Location:

trunk/lib/Doctrine

Files:

• Common/Cli/CliController.php (modified) (1 diff)
• ORM/Tools/Cli/Tasks/ConvertDoctrine1SchemaTask.php (added)
• ORM/Tools/Cli/Tasks/ConvertMappingTask.php (modified) (2 diffs)

trunk/lib/Doctrine/Common/Cli/CliController.php

@@ -83 +83 @@
              ->addTask('run-dql', $ns . '\RunDqlTask')
              ->addTask('schema-tool', $ns . '\SchemaToolTask')
-             ->addTask('version', $ns . '\VersionTask');
+             ->addTask('version', $ns . '\VersionTask')
+             ->addTask('convert-d1-schema', $ns . '\ConvertDoctrine1SchemaTask');
 
         $ns = 'Doctrine\DBAL\Tools\Cli\Tasks';

trunk/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php

@@ -130 +130 @@
         $from = (array) $arguments['from'];
 
-        if ($this->_isDoctrine1Schema($from)) {
-            $printer->writeln('Converting Doctrine 1 schema to Doctrine 2 mapping files', 'INFO');
-
-            $converter = new \Doctrine\ORM\Tools\ConvertDoctrine1Schema($from);
-            $metadatas = $converter->getMetadatasFromSchema();
-        } else {
-            foreach ($from as $source) {
-                $sourceArg = $source;
-                $type = $this->_determineSourceType($sourceArg);
-                
-                if ( ! $type) {
-                    throw new CliException(
-                        "Invalid mapping source type '$sourceArg'."
-                    );
-                }
-                
-                $source = $this->_getSourceByType($type, $sourceArg);
-                
-                $printer->writeln(
-                    sprintf(
-                        'Adding "%s" mapping source which contains the "%s" format', 
-                        $printer->format($sourceArg, 'KEYWORD'), $printer->format($type, 'KEYWORD')
-                    )
+        foreach ($from as $source) {
+            $sourceArg = $source;
+            $type = $this->_determineSourceType($sourceArg);
+            
+            if ( ! $type) {
+                throw new CliException(
+                    "Invalid mapping source type '$sourceArg'."
                 );
-
-                $cme->addMappingSource($source, $type);
-            }
-            
-            $metadatas = $cme->getMetadatasForMappingSources();
-        }
+            }
+            
+            $source = $this->_getSourceByType($type, $sourceArg);
+            
+            $printer->writeln(
+                sprintf(
+                    'Adding "%s" mapping source which contains the "%s" format', 
+                    $printer->format($sourceArg, 'KEYWORD'), $printer->format($type, 'KEYWORD')
+                )
+            );
+
+            $cme->addMappingSource($source, $type);
+        }
+        
+        $metadatas = $cme->getMetadatasForMappingSources();
 
         foreach ($metadatas as $metadata) {
@@ -177 +170 @@
         $exporter->setMetadatas($metadatas);
         $exporter->export();
-    }
-
-    private function _isDoctrine1Schema(array $from)
-    {
-        $files = glob(current($from) . '/*.yml');
-        
-        if ($files) {
-            $array = \Symfony\Components\Yaml\Yaml::load($files[0]);
-            $first = current($array);
-            
-            // We're dealing with a Doctrine 1 schema if you have
-            // a columns index in the first model array
-            return isset($first['columns']);
-        } else {
-            return false;
-        }
     }