Merge pull request #11329 from nanaya/remove-yes

Remove redundant command option
ppy · Jul 16, 2024 · 5e28611 · 5e28611
2 parents a995d5d + a916f54
commit 5e28611
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/app/Console/Commands/BeatmapLeadersRefresh.php b/app/Console/Commands/BeatmapLeadersRefresh.php
@@ -19,7 +19,7 @@ class BeatmapLeadersRefresh extends Command
      *
      * @var string
      */
-    protected $signature = 'beatmap-leaders:refresh {--yes}';
+    protected $signature = 'beatmap-leaders:refresh';
 
     /**
      * The console command description.
@@ -35,7 +35,7 @@ class BeatmapLeadersRefresh extends Command
      */
     public function handle()
     {
-        $continue = $this->option('yes') || $this->confirm('This will recalculate beatmap leaders, continue?', true);
+        $continue = $this->option('no-interaction') || $this->confirm('This will recalculate beatmap leaders, continue?', true);
 
         if (!$continue) {
             return $this->error('User aborted!');

diff --git a/app/Console/Commands/EsIndexDocuments.php b/app/Console/Commands/EsIndexDocuments.php
@@ -27,7 +27,7 @@ class EsIndexDocuments extends Command
      *
      * @var string
      */
-    protected $signature = 'es:index-documents {--types=} {--inplace} {--cleanup} {--yes}';
+    protected $signature = 'es:index-documents {--types=} {--inplace} {--cleanup}';
 
     /**
      * The console command description.
@@ -39,7 +39,6 @@ class EsIndexDocuments extends Command
     protected $cleanup;
     protected $inplace;
     protected $groups;
-    protected $yes;
 
     /**
      * Execute the console command.
@@ -136,7 +135,6 @@ protected function readOptions()
     {
         $this->inplace = $this->option('inplace');
         $this->cleanup = $this->option('cleanup');
-        $this->yes = $this->option('yes');
 
         if ($this->option('types')) {
             $types = explode(',', $this->option('types'));
@@ -169,6 +167,6 @@ protected function starterMessage(array $oldIndices)
             $confirmMessage = 'This will create new indices';
         }
 
-        return $this->yes || $this->confirm("{$confirmMessage}, begin indexing?", true);
+        return $this->option('no-interaction') || $this->confirm("{$confirmMessage}, begin indexing?", true);
     }
 }
diff --git a/app/Console/Commands/EsIndexWiki.php b/app/Console/Commands/EsIndexWiki.php
@@ -22,7 +22,7 @@ class EsIndexWiki extends Command
      *
      * @var string
      */
-    protected $signature = 'es:index-wiki {--create-only} {--inplace} {--cleanup} {--yes}';
+    protected $signature = 'es:index-wiki {--create-only} {--inplace} {--cleanup}';
 
     /**
      * The console command description.
@@ -36,7 +36,6 @@ class EsIndexWiki extends Command
     private $indexName;
     private $indicesToRemove;
     private $inplace;
-    private $yes;
 
     public function handle()
     {
@@ -101,7 +100,6 @@ private function readOptions()
         $this->createOnly = $this->option('create-only');
         $this->inplace = $this->option('inplace');
         $this->cleanup = $this->option('cleanup');
-        $this->yes = $this->option('yes');
     }
 
     private function reindex()
@@ -165,7 +163,7 @@ private function starterMessage()
             );
         }
 
-        return $this->yes || $this->confirm("This index to {$this->indexName}, begin indexing?", true);
+        return $this->option('no-interaction') || $this->confirm("This index to {$this->indexName}, begin indexing?", true);
     }
 
     private function updateSitemap()

diff --git a/app/Console/Commands/ForumTopicCoversCleanup.php b/app/Console/Commands/ForumTopicCoversCleanup.php
@@ -15,7 +15,7 @@ class ForumTopicCoversCleanup extends Command
      *
      * @var string
      */
-    protected $signature = 'forum:topic-cover-cleanup {--maxdays=} {--yes}';
+    protected $signature = 'forum:topic-cover-cleanup {--maxdays=}';
 
     /**
      * The console command description.
@@ -34,7 +34,7 @@ public function handle()
         $createdBefore = now()->subDays(get_int($this->option('maxdays')) ?? 30);
         $this->line("This will delete unused topic covers before {$createdBefore}.");
 
-        if (!$this->option('yes') && !$this->confirm('Proceed?', true)) {
+        if (!$this->option('no-interaction') && !$this->confirm('Proceed?', true)) {
             $this->error('Aborted.');
             return;
         }

diff --git a/app/Console/Commands/MigrateFreshAllCommand.php b/app/Console/Commands/MigrateFreshAllCommand.php
@@ -24,7 +24,7 @@ public function handle()
             $this->warn("{$name} => {$config['database']}");
         }
 
-        $continue = $this->option('yes') || $this->confirm('continue?', true);
+        $continue = $this->option('no-interaction') || $this->confirm('continue?', true);
         if (!$continue) {
             $this->error('User aborted!');
             return 1;
@@ -78,7 +78,6 @@ protected function getOptions()
             ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to be executed.'],
             ['seed', null, InputOption::VALUE_NONE, 'Indicates if the seed task should be re-run.'],
             ['seeder', null, InputOption::VALUE_OPTIONAL, 'The class name of the root seeder.'],
-            ['yes', null, InputOption::VALUE_NONE, 'Skip the confirmation prompt.'],
         ];
     }
 }