From a81c520d934153f8fdda2e89474628b9ecbcb36a Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 26 Feb 2025 20:15:09 +0000 Subject: [PATCH] Follow up for #16341 Signed-off-by: snipe --- .github/workflows/tests-mysql.yml | 2 +- .github/workflows/tests-postgres.yml | 2 +- app/Http/Controllers/DashboardController.php | 2 +- upgrade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests-mysql.yml b/.github/workflows/tests-mysql.yml index c6f5746152..16190900b0 100644 --- a/.github/workflows/tests-mysql.yml +++ b/.github/workflows/tests-mysql.yml @@ -67,7 +67,7 @@ jobs: run: | php artisan key:generate php artisan migrate --force - php artisan passport:install + php artisan passport:install --no-interaction chmod -R 777 storage bootstrap/cache - name: Execute tests (Unit and Feature tests) via PHPUnit diff --git a/.github/workflows/tests-postgres.yml b/.github/workflows/tests-postgres.yml index 0d7bf41f92..d111fc87a5 100644 --- a/.github/workflows/tests-postgres.yml +++ b/.github/workflows/tests-postgres.yml @@ -65,7 +65,7 @@ jobs: run: | php artisan key:generate php artisan migrate --force - php artisan passport:install + php artisan passport:install --no-interaction chmod -R 777 storage bootstrap/cache - name: Execute tests (Unit and Feature tests) via PHPUnit diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index af9c7ee446..a2ccb62475 100755 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -40,7 +40,7 @@ class DashboardController extends Controller if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) { Artisan::call('migrate', ['--force' => true]); - \Artisan::call('passport:install'); + Artisan::call('passport:install', ['--no-interaction' => true]); } return view('dashboard')->with('asset_stats', $asset_stats)->with('counts', $counts); diff --git a/upgrade.php b/upgrade.php index bd1678534b..9bd1e8ad15 100644 --- a/upgrade.php +++ b/upgrade.php @@ -580,7 +580,7 @@ echo "--------------------------------------------------------\e[39m\n\n"; if ((!file_exists('storage/oauth-public.key')) || (!file_exists('storage/oauth-private.key'))) { echo $info_icon." No OAuth keys detected. Running passport install now.\n\n"; - $passport = shell_exec('php artisan passport:install'); + $passport = shell_exec('php artisan passport:install --no-interaction'); echo $passport; } else { echo $success_icon." OAuth keys detected. Skipping passport install.\n\n";