X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=vendor%2Fdrupal%2Fconsole%2Fsrc%2FCommand%2FMigrate%2FSetupCommand.php;h=4430d93870c92def47c38dcc2aab44bf732bacba;hb=aea91e65e895364e460983b890e295aa5d5540a5;hp=738c5eb437aa3764baa7297150b3ddd02994a939;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/vendor/drupal/console/src/Command/Migrate/SetupCommand.php b/vendor/drupal/console/src/Command/Migrate/SetupCommand.php
index 738c5eb43..4430d9387 100644
--- a/vendor/drupal/console/src/Command/Migrate/SetupCommand.php
+++ b/vendor/drupal/console/src/Command/Migrate/SetupCommand.php
@@ -56,49 +56,49 @@ class SetupCommand extends Command
             ->setDescription($this->trans('commands.migrate.setup.description'))
             ->addOption(
                 'db-type',
-                '',
+                null,
                 InputOption::VALUE_REQUIRED,
                 $this->trans('commands.migrate.setup.options.db-type')
             )
             ->addOption(
                 'db-host',
-                '',
+                null,
                 InputOption::VALUE_REQUIRED,
                 $this->trans('commands.migrate.setup.options.db-host')
             )
             ->addOption(
                 'db-name',
-                '',
+                null,
                 InputOption::VALUE_REQUIRED,
                 $this->trans('commands.migrate.setup.options.db-name')
             )
             ->addOption(
                 'db-user',
-                '',
+                null,
                 InputOption::VALUE_REQUIRED,
                 $this->trans('commands.migrate.setup.options.db-user')
             )
             ->addOption(
                 'db-pass',
-                '',
+                null,
                 InputOption::VALUE_OPTIONAL,
                 $this->trans('commands.migrate.setup.options.db-pass')
             )
             ->addOption(
                 'db-prefix',
-                '',
+                null,
                 InputOption::VALUE_OPTIONAL,
                 $this->trans('commands.migrate.setup.options.db-prefix')
             )
             ->addOption(
                 'db-port',
-                '',
+                null,
                 InputOption::VALUE_REQUIRED,
                 $this->trans('commands.migrate.setup.options.db-port')
             )
             ->addOption(
                 'source-base_path',
-                '',
+                null,
                 InputOption::VALUE_OPTIONAL,
                 $this->trans('commands.migrate.setup.options.source-base_path')
             );
@@ -183,7 +183,7 @@ class SetupCommand extends Command
 
         if (!$drupal_version = $this->getLegacyDrupalVersion($this->migrateConnection)) {
             $io->error($this->trans('commands.migrate.setup.migrations.questions.not-drupal'));
-            return;
+            return 1;
         }
         
         $database = $this->getDBInfo();
@@ -202,5 +202,7 @@ class SetupCommand extends Command
                 )
             );
         }
+
+        return 0;
     }
 }