From bb0a71a20dc15876aceb90b065256bfb160c0652 Mon Sep 17 00:00:00 2001 From: Paul Isaris Date: Tue, 7 Jan 2025 10:10:29 +0200 Subject: [PATCH] Run rector on some files --- .../vendor/notifications/email.blade.php | 15 +++---- routes/api.php | 12 ++--- routes/channels.php | 4 +- routes/console.php | 2 +- routes/web.php | 44 +++++++++---------- 5 files changed, 35 insertions(+), 42 deletions(-) diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php index c52311be9..99fad5224 100644 --- a/resources/views/vendor/notifications/email.blade.php +++ b/resources/views/vendor/notifications/email.blade.php @@ -19,16 +19,11 @@ {{-- Action Button --}} @isset($actionText) 'green', + 'error' => 'red', + default => 'blue', + }; ?> @component('mail::button', ['url' => $actionUrl, 'color' => $color]) {{ $actionText }} diff --git a/routes/api.php b/routes/api.php index e5694600d..bef0411ba 100644 --- a/routes/api.php +++ b/routes/api.php @@ -25,7 +25,7 @@ use App\Http\Controllers\User\UserController; use Illuminate\Support\Facades\Route; -Route::middleware(['throttle:api-public'])->group(function () { +Route::middleware(['throttle:api-public'])->group(function (): void { Route::get('/questionnaire/languages', [QuestionnaireController::class, 'getLanguagesForQuestionnaire'])->name('api.questionnaire.languages.get'); Route::get('/languages', [LanguageController::class, 'getLanguages'])->name('api.languages.get'); Route::post('/questionnaire/respond', [QuestionnaireResponseController::class, 'store'])->name('api.questionnaire-responses.store'); @@ -38,18 +38,18 @@ Route::get('/problems', [ProblemController::class, 'getProblemsForCrowdSourcingProject'])->name('api.problems.get'); }); -Route::middleware(['throttle:api-internal', 'auth'])->group(function () { +Route::middleware(['throttle:api-internal', 'auth'])->group(function (): void { Route::post('/questionnaire/answer-votes', [QuestionnaireResponseController::class, 'voteAnswer'])->name('api.questionnaire.answer-votes.store'); Route::post('/solutions/vote-downvote', [SolutionController::class, 'voteOrDownVoteSolution'])->name('api.solutions.vote-downvote'); }); -Route::middleware(['throttle:api-internal'])->group(function () { +Route::middleware(['throttle:api-internal'])->group(function (): void { Route::get('/solutions', [SolutionController::class, 'getSolutions'])->name('api.solutions.get'); Route::post('/solutions/handle-share', [SolutionController::class, 'handleShareSolution'])->name('api.solutions.handle-share'); }); -Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:moderate-content-by-users']], function () { +Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:moderate-content-by-users']], function (): void { Route::get('questionnaire/report-data', [QuestionnaireReportController::class, 'getReportDataForQuestionnaire'])->name('api.questionnaire.report-data.get'); Route::post('/questionnaire/answer-annotations', [QuestionnaireAnswerAnnotationController::class, 'annotateAnswer'])->name('api.questionnaire.answer-annotations.store'); Route::post('/questionnaire/answer-annotations/delete', [QuestionnaireAnswerAnnotationController::class, 'deleteAnswerAnnotation'])->name('questionnaire.answer-annotations.destroy'); @@ -57,7 +57,7 @@ Route::post('questionnaire/delete-response', [QuestionnaireResponseController::class, 'destroy'])->name('questionnaire_response.destroy'); }); -Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:manage-platform-content']], function () { +Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:manage-platform-content']], function (): void { Route::post('/questionnaire/new', [QuestionnaireController::class, 'store'])->name('api.questionnaire.store'); Route::post('/questionnaire/update/{id?}', [QuestionnaireController::class, 'update'])->name('api.questionnaire.update'); Route::post('/questionnaire/translate', [QuestionnaireController::class, 'translateQuestionnaire'])->name('api.questionnaire.translation.store'); @@ -73,6 +73,6 @@ Route::put('/solutions/update-status/{id}', [SolutionController::class, 'updateStatus'])->name('api.solutions.update-status'); }); -Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:manage-users']], function () { +Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:manage-users']], function (): void { Route::get('/users/filter', [UserController::class, 'showUsersByCriteria'])->name('api.users.get-filtered'); }); diff --git a/routes/channels.php b/routes/channels.php index f16a20b9b..5fc7d3254 100644 --- a/routes/channels.php +++ b/routes/channels.php @@ -11,6 +11,4 @@ | */ -Broadcast::channel('App.User.{id}', function ($user, $id) { - return (int) $user->id === (int) $id; -}); +Broadcast::channel('App.User.{id}', fn ($user, $id): bool => (int) $user->id === (int) $id); diff --git a/routes/console.php b/routes/console.php index 75dd0cded..deb857053 100644 --- a/routes/console.php +++ b/routes/console.php @@ -13,6 +13,6 @@ | */ -Artisan::command('inspire', function () { +Artisan::command('inspire', function (): void { $this->comment(Inspiring::quote()); })->describe('Display an inspiring quote'); diff --git a/routes/web.php b/routes/web.php index 3d08dbedb..378681389 100644 --- a/routes/web.php +++ b/routes/web.php @@ -26,7 +26,7 @@ 'middleware' => 'setlocale', ]; -Route::group($localeInfo, function () { +Route::group($localeInfo, function (): void { Auth::routes(); Route::get('/', [HomeController::class, 'showHomePage'])->name('home'); Route::get('/terms-and-privacy', [HomeController::class, 'showTermsAndPrivacyPage'])->name('terms.privacy'); @@ -39,12 +39,12 @@ Route::get('login/social/{driver}', [LoginController::class, 'redirectToProvider']); Route::get('login/social/{driver}/callback', [LoginController::class, 'handleProviderCallback'])->name('socialLoginCallback'); -Route::group(['middleware' => ['auth', 'setlocale']], function () use ($localeInfo, $backOfficePrefix) { - Route::group($localeInfo, function () use ($backOfficePrefix) { +Route::group(['middleware' => ['auth', 'setlocale']], function () use ($localeInfo, $backOfficePrefix): void { + Route::group($localeInfo, function () use ($backOfficePrefix): void { Route::get('/{project_slug}/problems/{problem_slug}/solutions/propose', [SolutionController::class, 'userProposalCreate'])->name('solutions.user-proposal-create'); Route::post('/{project_slug}/problems/{problem_slug}/solutions', [SolutionController::class, 'userProposalStore'])->name('solutions.user-proposal-store'); Route::get('/{project_slug}/problems/{problem_slug}/solutions/{solution_slug}/submitted', [SolutionController::class, 'userProposalSubmitted'])->name('solutions.user-proposal-submitted'); - Route::group(['prefix' => $backOfficePrefix], function () { + Route::group(['prefix' => $backOfficePrefix], function (): void { Route::get('/my-dashboard', [UserController::class, 'myDashboard'])->name('my-dashboard'); Route::get('/my-account', [UserController::class, 'myAccount'])->name('my-account'); Route::get('/my-contributions', [UserController::class, 'showUserContributions'])->name('my-contributions'); @@ -52,8 +52,8 @@ }); }); -Route::group(['middleware' => ['auth', 'can:manage-users']], function () use ($backOfficePrefix) { - Route::group(['prefix' => $backOfficePrefix], function () { +Route::group(['middleware' => ['auth', 'can:manage-users']], function () use ($backOfficePrefix): void { + Route::group(['prefix' => $backOfficePrefix], function (): void { Route::get('/manage-users', [AdminController::class, 'manageUsers'])->name('manage-users'); Route::get('/edit-user/{id}', [AdminController::class, 'editUserForm'])->name('edit-user'); Route::post('/add-user', [AdminController::class, 'addUserToPlatform']); @@ -62,24 +62,24 @@ }); }); -Route::group(['middleware' => ['auth', 'can:manage-platform']], function () use ($backOfficePrefix) { - Route::group(['prefix' => $backOfficePrefix], function () { +Route::group(['middleware' => ['auth', 'can:manage-platform']], function () use ($backOfficePrefix): void { + Route::group(['prefix' => $backOfficePrefix], function (): void { Route::post('update-user', [AdminController::class, 'updateUserRoles']); Route::get('/communication/mailchimp', [CommunicationController::class, 'getMailChimpIntegration'])->name('mailchimp-integration.get'); Route::post('/communication/mailchimp', [CommunicationController::class, 'storeMailChimpListsIds'])->name('mailchimp-integration'); }); - Route::middleware(['throttle:api-public'])->group(function () { - Route::group(['prefix' => 'admin'], function () { - Route::get('/phpinfo', fn () => phpinfo()); + Route::middleware(['throttle:api-public'])->group(function (): void { + Route::group(['prefix' => 'admin'], function (): void { + Route::get('/phpinfo', fn (): true => phpinfo()); Route::get('/check-upload', [AdminController::class, 'checkUploadPage']); Route::post('/upload-files', [AdminController::class, 'uploadAdminFile'])->name('admin.image.upload'); }); }); }); -Route::group(['middleware' => ['auth', 'can:manage-platform-content']], function () use ($localeInfo, $backOfficePrefix) { - Route::group($localeInfo, function () use ($backOfficePrefix) { - Route::group(['prefix' => $backOfficePrefix], function () { +Route::group(['middleware' => ['auth', 'can:manage-platform-content']], function () use ($localeInfo, $backOfficePrefix): void { + Route::group($localeInfo, function () use ($backOfficePrefix): void { + Route::group(['prefix' => $backOfficePrefix], function (): void { Route::resource('projects', CrowdSourcingProjectController::class)->except(['destroy']); Route::get('project/{id}/clone', [CrowdSourcingProjectController::class, 'clone'])->name('project.clone'); Route::post('project/destroy', [CrowdSourcingProjectController::class, 'destroy'])->name('project.destroy'); @@ -94,9 +94,9 @@ }); }); -Route::group(['middleware' => ['auth', 'can:moderate-content-by-users']], function () use ($localeInfo, $backOfficePrefix) { - Route::group($localeInfo, function () use ($backOfficePrefix) { - Route::group(['prefix' => $backOfficePrefix], function () { +Route::group(['middleware' => ['auth', 'can:moderate-content-by-users']], function () use ($localeInfo, $backOfficePrefix): void { + Route::group($localeInfo, function () use ($backOfficePrefix): void { + Route::group(['prefix' => $backOfficePrefix], function (): void { Route::get('/questionnaires', [QuestionnaireController::class, 'manageQuestionnaires'])->name('questionnaires.all'); Route::get('/questionnaires/reports', [QuestionnaireReportController::class, 'viewReportsPage'])->name('questionnaires.reports'); Route::get('/{project:slug}/questionnaire/{questionnaire:id}/moderator-add-answer', [QuestionnaireController::class, 'showAddResponseAsModeratorToQuestionnaire'])->name('questionnaire-moderator-add-response'); @@ -104,8 +104,8 @@ }); }); -Route::group(['middleware' => 'auth'], function () use ($backOfficePrefix) { - Route::group(['prefix' => $backOfficePrefix], function () { +Route::group(['middleware' => 'auth'], function () use ($backOfficePrefix): void { + Route::group(['prefix' => $backOfficePrefix], function (): void { Route::put('/user/update', [UserController::class, 'patch'])->name('user.update'); Route::post('/user/deactivate', [UserController::class, 'deactivateLoggedInUser'])->name('user.deactivate'); Route::get('/questionnaire/{questionnaire_id}/download-responses', [QuestionnaireResponseController::class, 'downloadQuestionnaireResponses'])->name('questionnaire.responses.download'); @@ -113,14 +113,14 @@ }); }); -Route::group($localeInfo, function () { +Route::group($localeInfo, function (): void { Route::get('/questionnaires/{questionnaire}/statistics/{projectFilter?}', [QuestionnaireStatisticsController::class, 'showStatisticsPageForQuestionnaire'])->name('questionnaire.statistics')->middleware('questionnaire.page_settings'); }); -Route::group($localeInfo, function () { +Route::group($localeInfo, function (): void { Route::post('/languages/setlocale', [LanguageController::class, 'setLocale'])->name('languages.setlocale'); }); -Route::group($localeInfo, function () { +Route::group($localeInfo, function (): void { Route::get('/{slug}', [CrowdSourcingProjectController::class, 'showLandingPage'])->name('project.landing-page'); Route::get('/{project_slug}/{questionnaire_id}/thanks', [QuestionnaireResponseController::class, 'showQuestionnaireThanksForRespondingPage'])->name('questionnaire.thanks'); Route::get('/{project_slug}/problems', [ProblemController::class, 'showProblemsPage'])->name('project.problems-page');