Merge pull request #55 from linc/fix/simplify-notes

Clarify a few steps in the migration process

config-sample.php

@@ -19,7 +19,7 @@
             ],
         ],
         [
-            'alias' => 'test',
+            'alias' => 'target',
             'type' => 'database',
             'adapter' => 'mysql',
             'host' => '127.0.0.1',

data/sources.php

@@ -32,8 +32,8 @@
     'Smf2',
     'Toast',
     'UserVoice',
+    'Vanilla',
     'Vanilla1',
-    'Vanilla2',
     'VBulletin',
     'VBulletin5',
     'WebWiz',

src/Command/ShowCommand.php

@@ -17,9 +17,9 @@ public function __construct()
             ->argument('<name>', 'Name of package.')
             ->usage(
                 '<bold>  show</end> <comment>[type] [name]</end> ## Show features of a package.<eol/>' .
-                '<bold>  show</end> <comment>source vanilla2</end> ' .
+                '<bold>  show</end> <comment>source Vanilla</end> ' .
                 '## Show what features can be migrated from Vanilla.<eol/>' .
-                '<bold>  show</end> <comment>target flarum</end> ## Show what features can be migrated to Flarum.<eol/>'
+                '<bold>  show</end> <comment>target Flarum</end> ## Show what features can be migrated to Flarum.<eol/>'
             );
     }
 
@@ -56,9 +56,9 @@ public static function viewFeatureList(string $type, string $name)
 
         // Output.
         $writer = new Writer();
-        if ($type === 'target' && strtolower($name) === 'vanilla2') {
+        if ($type === 'target' && strtolower($name) === 'vanilla') {
             // Vanilla is the intermediary format, so all features are supported by necessity.
-            $writer->bold->green->write("\n" . 'All features are supported for target Vanilla2.' . "\n");
+            $writer->bold->green->write("\n" . 'All features are supported for target Vanilla.' . "\n");
         } elseif (!array_key_exists($name, $supported)) {
             // Error message for invalid package names.
             $writer->bold->yellow->write("\n" . 'Unknown package "' . $name . '". Package is case-sensitive.' . "\n");

src/Controller.php

@@ -90,7 +90,7 @@ public static function run(Request $request)
         $exportSourceCM = new ConnectionManager($request->get('source'));
         $importSourceCM = new ConnectionManager($request->get('target') ?? '');
         // @todo Pass options not Request
-        $exportModel = exportModelFactory($request, $exportSourceCM, $storage, $importSourceCM);
+        $exportModel = exportModelFactory($request, $source, $exportSourceCM, $storage, $importSourceCM);
 
         // No permissions warning.
         $exportModel->comment('[ Porter never migrates user permissions! Reset user permissions afterward. ]' . "\n");
@@ -133,6 +133,9 @@ public static function run(Request $request)
             } else {
                 $exportModel->comment("No Postscript found.");
             }
+
+            // Doing this cleanup automatically is complex, so tell them to do it manually for now.
+            $exportModel->comment("After testing import, you may delete `PORT_` database tables.");
         }
 
         // End timer & report.

src/Functions/core.php

@@ -116,13 +116,15 @@ function postscriptFactory(string $target, Storage $storage, ConnectionManager $
 
 /**
  * @param Request $request
+ * @param Source $source
  * @param ConnectionManager $exportSourceCM
  * @param Storage $storage
  * @param ConnectionManager $importSourceCM
  * @return ExportModel
  */
 function exportModelFactory(
     Request $request,
+    Source $source,
     ConnectionManager $exportSourceCM,
     Storage $storage,
     ConnectionManager $importSourceCM
@@ -134,7 +136,7 @@ function exportModelFactory(
     $model = new ExportModel($db, $map, $storage, $importSourceCM);
 
     // Set model properties.
-    $model->srcPrefix = $request->get('src-prefix') ?? '';
+    $model->srcPrefix = $request->get('src-prefix') ?? $source::SUPPORTED['prefix'];
     $model->testMode = $request->get('test') ?? false;
     $model->limitTables((string) $request->get('tables'));
     $model->captureOnly = $request->get('dumpsql') ?? false;

src/Source/Vanilla2.php → src/Source/Vanilla.php

@@ -12,7 +12,7 @@
 use Porter\Source;
 use Porter\ExportModel;
 
-class Vanilla2 extends Source
+class Vanilla extends Source
 {
     public const SUPPORTED = [
         'name' => 'Vanilla 2+',