Use builtin no-interaction option instead of custom parameter

ppy · Aug 18, 2023 · d7d5e67 · d7d5e67
1 parent 48b309c
commit d7d5e67
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -143,8 +143,8 @@ jobs:
       - name: Setup indices
         run: |
           php artisan es:create-search-blacklist
-          php artisan es:index-documents --yes
-          php artisan es:index-wiki --create-only --yes
+          php artisan es:index-documents --no-interaction
+          php artisan es:index-wiki --create-only --no-interaction
 
       - name: Generate docs
         run: php artisan scribe:generate
@@ -158,7 +158,7 @@ jobs:
       # but has since been fixed.
       # Something should still be done regarding es index between tests though.
       - name: Clean indexes
-        run: php artisan es:index-documents --yes
+        run: php artisan es:index-documents --no-interaction
 
       - name: Run Dusk
         run: ./bin/run_dusk.sh

diff --git a/SETUP.md b/SETUP.md
@@ -272,13 +272,13 @@ Once the env files are set, database for testing will need to be setup:
 Tests should be run against an empty database, to initialize an empty database:
 
 ```
-APP_ENV=testing php artisan migrate:fresh --yes
+APP_ENV=testing php artisan migrate:fresh --no-interaction
 ```
 
 or if using docker:
 
 ```
-docker compose run --rm -e APP_ENV=testing php artisan migrate:fresh --yes
+docker compose run --rm -e APP_ENV=testing php artisan migrate:fresh --no-interaction
 ```
 
 ---

diff --git a/app/Console/Commands/BeatmapLeadersRefresh.php b/app/Console/Commands/BeatmapLeadersRefresh.php
@@ -35,7 +35,7 @@ class BeatmapLeadersRefresh extends Command
      */
     public function handle()
     {
-        $continue = $this->option('yes') || $this->confirm('This will recalculate beatmap leaders, continue?');
+        $continue = $this->option('yes') || $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
@@ -169,6 +169,6 @@ protected function starterMessage(array $oldIndices)
             $confirmMessage = 'This will create new indices';
         }
 
-        return $this->yes || $this->confirm("{$confirmMessage}, begin indexing?");
+        return $this->yes || $this->confirm("{$confirmMessage}, begin indexing?", true);
     }
 }
diff --git a/app/Console/Commands/EsIndexWiki.php b/app/Console/Commands/EsIndexWiki.php
@@ -165,7 +165,7 @@ private function starterMessage()
             );
         }
 
-        return $this->yes || $this->confirm("This index to {$this->indexName}, begin indexing?");
+        return $this->yes || $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
@@ -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?')) {
+        if (!$this->option('yes') && !$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?');
+        $continue = $this->option('yes') || $this->confirm('continue?', true);
         if (!$continue) {
             $this->error('User aborted!');
             return 1;
@@ -47,13 +47,13 @@ public function handle()
 
         $this->call('es:index-documents', [
             '--cleanup' => true,
-            '--yes' => $this->option('yes'),
+            '--no-interaction' => $this->option('no-interaction'),
         ]);
 
         $this->call('es:index-wiki', [
             '--cleanup' => true,
             '--create-only' => true,
-            '--yes' => $this->option('yes'),
+            '--no-interaction' => $this->option('no-interaction'),
         ]);
 
         $this->call('es:create-search-blacklist');

diff --git a/app/Console/Commands/MigrateFreshOrRunCommand.php b/app/Console/Commands/MigrateFreshOrRunCommand.php
@@ -39,7 +39,7 @@ public function handle()
     private function fresh()
     {
         $this->info('Database is empty. Calling migrate:fresh to initalise database and elasticsearch.');
-        $this->call('migrate:fresh', ['--yes' => true]);
+        $this->call('migrate:fresh', ['--no-interaction' => true]);
     }
 
     private function migrate()

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -101,7 +101,7 @@ protected function schedule(Schedule $schedule)
             ->everyThirtyMinutes()
             ->onOneServer();
 
-        $schedule->command('forum:topic-cover-cleanup --yes')
+        $schedule->command('forum:topic-cover-cleanup --no-interaction')
             ->daily()
             ->withoutOverlapping()
             ->onOneServer();

diff --git a/app/Http/Controllers/InterOp/ArtistTracksController.php b/app/Http/Controllers/InterOp/ArtistTracksController.php
@@ -21,7 +21,7 @@ public function reindexAll()
             '--cleanup' => $params['cleanup'] ?? true,
             '--inplace' => $params['inplace'] ?? true,
             '--types' => 'artist_tracks',
-            '--yes' => true,
+            '--no-interaction' => true,
         ]);
 
         return response()->noContent();