Feature/defaults to questions (#84)

* Added -y|--yes defaults to the questions if you are sure. * Small refactor.
weprovide · Oct 17, 2017 · 5cef044 · 5cef044
1 parent 85553cd
commit 5cef044
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/cli/valet.php b/cli/valet.php
@@ -421,8 +421,9 @@
     /**
      * Create database
      */
-    $app->command('db [run] [name] [optional]', function ($input, $output, $run, $name, $optional) {
+    $app->command('db [run] [name] [optional] [-y|--yes]', function ($input, $output, $run, $name, $optional) {
         $helper = $this->getHelperSet()->get('question');
+        $defaults = $input->getOptions();
 
         if($run === 'list' || $run === 'ls') {
             Mysql::listDatabases();
@@ -441,10 +442,12 @@
         }
 
         if($run === 'drop') {
-            $question = new ConfirmationQuestion('Are you sure you want to delete the database? [y/N] ', false);
-            if (!$helper->ask($input, $output, $question)) {
-                warning('Aborted');
-                return;
+            if(!$defaults['yes']) {
+                $question = new ConfirmationQuestion('Are you sure you want to delete the database? [y/N] ', FALSE);
+                if (!$helper->ask($input, $output, $question)) {
+                    warning('Aborted');
+                    return;
+                }
             }
             $databaseName = Mysql::dropDatabase($name);
 
@@ -457,10 +460,12 @@
         }
 
         if($run === 'reset') {
-            $question = new ConfirmationQuestion('Are you sure you want to reset the database? [y/N] ', false);
-            if (!$helper->ask($input, $output, $question)) {
-                warning('Aborted');
-                return;
+          if(!$defaults['yes']) {
+                $question = new ConfirmationQuestion('Are you sure you want to reset the database? [y/N] ', FALSE);
+                if (!$helper->ask($input, $output, $question)) {
+                    warning('Aborted');
+                    return;
+                }
             }
 
             $dropped = Mysql::dropDatabase($name);
@@ -500,10 +505,12 @@
         }
 
         if($run === 'reimport') {
-            $question = new ConfirmationQuestion('Are you sure you want to reimport the database? [y/N] ', false);
-            if (!$helper->ask($input, $output, $question)) {
-                warning('Aborted');
-                return;
+          if(!$defaults['yes']) {
+                $question = new ConfirmationQuestion('Are you sure you want to reimport the database? [y/N] ', FALSE);
+                if (!$helper->ask($input, $output, $question)) {
+                    warning('Aborted');
+                    return;
+                }
             }
             info('Resetting database, importing database...');
             if(!$name) {