From 5c6fb470cad3804f54e5af9b66d486e985ae421f Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Wed, 23 Sep 2026 09:29:12 +0100 Subject: [PATCH] M3 Integration fixes pass 27 --- Modules/Countries/Routes/web.php | 12 ++++++------ Modules/Documentation/Routes/web.php | 18 +++++++++--------- routes/jetstream.php | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Modules/Countries/Routes/web.php b/Modules/Countries/Routes/web.php index a5cb8346..97447b6a 100755 --- a/Modules/Countries/Routes/web.php +++ b/Modules/Countries/Routes/web.php @@ -5,9 +5,9 @@ use Modules\Countries\Http\Controllers\CountriesController; use Modules\Countries\Http\Controllers\CountrySyncController; use Modules\Countries\Http\Controllers\ReferenceDataController; -const COUNTRY_ROUTE = '/{country}'; +$countryRoute = '/{country}'; -Route::prefix('countries')->name('countries.')->middleware(['web', 'auth'])->group(function (): void { +Route::prefix('countries')->name('countries.')->middleware(['web', 'auth'])->group(function () use ($countryRoute): void { Route::get('/', CountriesController::class)->name('index'); Route::get('/create', [CountriesController::class, 'create'])->name('create'); Route::post('/', [CountriesController::class, 'store'])->name('store'); @@ -17,8 +17,8 @@ Route::prefix('countries')->name('countries.')->middleware(['web', 'auth'])->gro Route::get('/reference/languages', [ReferenceDataController::class, 'languages'])->name('languages.index'); Route::get('/reference/scripts', [ReferenceDataController::class, 'scripts'])->name('scripts.index'); Route::get('/reference/locodes', [ReferenceDataController::class, 'locodes'])->name('locodes.index'); - Route::get(COUNTRY_ROUTE, [CountriesController::class, 'show'])->name('show'); - Route::get(COUNTRY_ROUTE . '/edit', [CountriesController::class, 'edit'])->name('edit'); - Route::put(COUNTRY_ROUTE, [CountriesController::class, 'update'])->name('update'); - Route::delete(COUNTRY_ROUTE, [CountriesController::class, 'destroy'])->name('destroy'); + Route::get($countryRoute, [CountriesController::class, 'show'])->name('show'); + Route::get($countryRoute . '/edit', [CountriesController::class, 'edit'])->name('edit'); + Route::put($countryRoute, [CountriesController::class, 'update'])->name('update'); + Route::delete($countryRoute, [CountriesController::class, 'destroy'])->name('destroy'); }); diff --git a/Modules/Documentation/Routes/web.php b/Modules/Documentation/Routes/web.php index 87624a4c..0627f9ac 100755 --- a/Modules/Documentation/Routes/web.php +++ b/Modules/Documentation/Routes/web.php @@ -6,24 +6,24 @@ use Illuminate\Support\Facades\Route; use Modules\Documentation\Http\Controllers\DocumentationCategoryController; use Modules\Documentation\Http\Controllers\DocumentationController; -const DOCUMENT_ROUTE = '/documents/{document}'; +$documentRoute = '/documents/{document}'; Route::middleware(['web', 'auth']) ->prefix('documentation') ->name('documentation.') - ->group(function (): void { + ->group(function () use ($documentRoute): void { Route::get('/', [DocumentationController::class, 'index'])->name('index'); Route::get('/documents', [DocumentationController::class, 'index'])->name('documents.index'); Route::get('/documents/create', [DocumentationController::class, 'create'])->name('documents.create'); Route::post('/documents', [DocumentationController::class, 'store'])->name('documents.store'); - Route::get(DOCUMENT_ROUTE, [DocumentationController::class, 'show'])->name('documents.show'); - Route::get(DOCUMENT_ROUTE . '/edit', [DocumentationController::class, 'edit'])->name('documents.edit'); - Route::put(DOCUMENT_ROUTE, [DocumentationController::class, 'update'])->name('documents.update'); - Route::delete(DOCUMENT_ROUTE, [DocumentationController::class, 'destroy'])->name('documents.destroy'); - Route::get(DOCUMENT_ROUTE . '/download', [DocumentationController::class, 'download'])->name('documents.download'); - Route::get(DOCUMENT_ROUTE . '/attachments/{attachment}/download', [DocumentationController::class, 'downloadAttachment'])->name('documents.attachments.download'); - Route::delete(DOCUMENT_ROUTE . '/attachments/{attachment}', [DocumentationController::class, 'destroyAttachment'])->name('documents.attachments.destroy'); + Route::get($documentRoute, [DocumentationController::class, 'show'])->name('documents.show'); + Route::get($documentRoute . '/edit', [DocumentationController::class, 'edit'])->name('documents.edit'); + Route::put($documentRoute, [DocumentationController::class, 'update'])->name('documents.update'); + Route::delete($documentRoute, [DocumentationController::class, 'destroy'])->name('documents.destroy'); + Route::get($documentRoute . '/download', [DocumentationController::class, 'download'])->name('documents.download'); + Route::get($documentRoute . '/attachments/{attachment}/download', [DocumentationController::class, 'downloadAttachment'])->name('documents.attachments.download'); + Route::delete($documentRoute . '/attachments/{attachment}', [DocumentationController::class, 'destroyAttachment'])->name('documents.attachments.destroy'); Route::resource('categories', DocumentationCategoryController::class)->except(['show']); }); diff --git a/routes/jetstream.php b/routes/jetstream.php index 1251b23a..a2c54477 100755 --- a/routes/jetstream.php +++ b/routes/jetstream.php @@ -14,9 +14,9 @@ use Laravel\Jetstream\Http\Controllers\Inertia\UserProfileController; use Laravel\Jetstream\Http\Controllers\TeamInvitationController; use Laravel\Jetstream\Jetstream; -const TEAM_ROUTE = '/teams/{team}'; +$teamRoute = '/teams/{team}'; -Route::group(['middleware' => config('jetstream.middleware', ['web'])], function () { +Route::group(['middleware' => config('jetstream.middleware', ['web'])], function () use ($teamRoute) { if (Jetstream::hasTermsAndPrivacyPolicyFeature()) { Route::get('/terms-of-service', [TermsOfServiceController::class, 'show'])->name('terms.show'); Route::get('/privacy-policy', [PrivacyPolicyController::class, 'show'])->name('policy.show'); @@ -30,7 +30,7 @@ Route::group(['middleware' => config('jetstream.middleware', ['web'])], function ? config('jetstream.auth_session') : null; - Route::group(['middleware' => array_values(array_filter([$authMiddleware, $authSessionMiddleware]))], function () { + Route::group(['middleware' => array_values(array_filter([$authMiddleware, $authSessionMiddleware]))], function () use ($teamRoute) { // User & Profile... Route::get('/user/profile', [UserProfileController::class, 'show']) ->name('profile.show'); @@ -59,9 +59,9 @@ Route::group(['middleware' => config('jetstream.middleware', ['web'])], function if (Jetstream::hasTeamFeatures()) { Route::get('/teams/create', [TeamController::class, 'create'])->name('teams.create'); Route::post('/teams', [TeamController::class, 'store'])->name('teams.store'); - Route::get(TEAM_ROUTE, [TeamController::class, 'show'])->name('teams.show'); - Route::put(TEAM_ROUTE, [TeamController::class, 'update'])->name('teams.update'); - Route::delete(TEAM_ROUTE, [TeamController::class, 'destroy'])->name('teams.destroy'); + Route::get($teamRoute, [TeamController::class, 'show'])->name('teams.show'); + Route::put($teamRoute, [TeamController::class, 'update'])->name('teams.update'); + Route::delete($teamRoute, [TeamController::class, 'destroy'])->name('teams.destroy'); Route::put('/current-team', [CurrentTeamController::class, 'update'])->name('current-team.update'); Route::post('/teams/{team}/members', [TeamMemberController::class, 'store'])->name('team-members.store'); Route::put('/teams/{team}/members/{user}', [TeamMemberController::class, 'update'])->name('team-members.update');