Tweak no-interaction PR with defaults

stevebauman · stevebauman · commit c76bd4867ee0 · 2017-12-12T16:48:14.000-05:00
diff --git a/src/Commands/Import.php b/src/Commands/Import.php
@@ -77,14 +77,11 @@ public function handle()
             $this->info("Found {$count} user(s).");
         }
 
-        $interactive = ! $this->option('no-interaction');
-
-        if (!$interactive || $this->confirm('Would you like to display the user(s) to be imported / synchronized?')) {
+        if ($this->confirm('Would you like to display the user(s) to be imported / synchronized?', $default = false)) {
             $this->display($users);
         }
 
-        if (!$interactive || $this->confirm('Would you like these users to be imported / synchronized?',
-                $default = true)) {
+        if ($this->confirm('Would you like these users to be imported / synchronized?', $default = true)) {
             $imported = $this->import($users);
 
             $this->info("Successfully imported / synchronized {$imported} user(s).");

Original file line number	Diff line number	Diff line change
`@@ -77,14 +77,11 @@ public function handle()`
`77`	`77`	`$this->info("Found {$count} user(s).");`
`78`	`78`	`}`
`79`	`79`
`80`		`- $interactive = ! $this->option('no-interaction');`
`81`		`-`
`82`		`- if (!$interactive \|\| $this->confirm('Would you like to display the user(s) to be imported / synchronized?')) {`
	`80`	`+ if ($this->confirm('Would you like to display the user(s) to be imported / synchronized?', $default = false)) {`
`83`	`81`	`$this->display($users);`
`84`	`82`	`}`
`85`	`83`
`86`		`- if (!$interactive \|\| $this->confirm('Would you like these users to be imported / synchronized?',`
`87`		`- $default = true)) {`
	`84`	`+ if ($this->confirm('Would you like these users to be imported / synchronized?', $default = true)) {`
`88`	`85`	`$imported = $this->import($users);`
`89`	`86`
`90`	`87`	`$this->info("Successfully imported / synchronized {$imported} user(s).");`