From f6c4d1c56ac224b87ef172e6577cb02dfcbec05d Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 21 Jun 2022 09:59:43 +0000 Subject: [PATCH] Convert route options to fluent methods Laravel 8 adopts the tuple syntax for controller actions. Since the old options array is incompatible with this syntax, Shift converted them to use modern, fluent methods. --- routes/api.php | 6 +++--- routes/client.php | 4 ++-- routes/contact.php | 4 ++-- routes/shop.php | 2 +- routes/vendor.php | 4 ++-- routes/web.php | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/routes/api.php b/routes/api.php index be22c4487658..e9256537f733 100644 --- a/routes/api.php +++ b/routes/api.php @@ -13,17 +13,17 @@ use Illuminate\Support\Facades\Route; -Route::group(['middleware' => ['throttle:300,1', 'api_secret_check']], function () { +Route::middleware('throttle:300,1', 'api_secret_check')->group(function () { Route::post('api/v1/signup', 'AccountController@store')->name('signup.submit'); Route::post('api/v1/oauth_login', 'Auth\LoginController@oauthApiLogin'); }); -Route::group(['middleware' => ['throttle:10,1', 'api_secret_check', 'email_db']], function () { +Route::middleware('throttle:10,1', 'api_secret_check', 'email_db')->group(function () { Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit')->middleware('throttle:20,1'); Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail'); }); -Route::group(['middleware' => ['throttle:100,1', 'api_db', 'token_auth', 'locale'], 'prefix' => 'api/v1', 'as' => 'api.'], function () { +Route::middleware('throttle:100,1', 'api_db', 'token_auth', 'locale')->prefix('api/v1')->name('api.')->group(function () { Route::put('accounts/{account}', 'AccountController@update')->name('account.update'); Route::post('check_subdomain', 'SubdomainController@index')->name('check_subdomain'); Route::get('ping', 'PingController@index')->name('ping'); diff --git a/routes/client.php b/routes/client.php index d76f14bed135..ca59af615357 100644 --- a/routes/client.php +++ b/routes/client.php @@ -30,7 +30,7 @@ Route::get('client/payment/{contact_key}/{payment_id}', 'ClientPortal\Invitation Route::get('client/ninja/{contact_key}/{company_key}', 'ClientPortal\NinjaPlanController@index')->name('client.ninja_contact_login')->middleware(['domain_db']); Route::post('client/ninja/trial_confirmation', 'ClientPortal\NinjaPlanController@trial_confirmation')->name('client.trial.response')->middleware(['domain_db']); -Route::group(['middleware' => ['auth:contact', 'locale', 'domain_db', 'check_client_existence'], 'prefix' => 'client', 'as' => 'client.'], function () { +Route::middleware('auth:contact', 'locale', 'domain_db', 'check_client_existence')->prefix('client')->name('client.')->group(function () { Route::get('dashboard', 'ClientPortal\DashboardController@index')->name('dashboard'); // name = (dashboard. index / create / show / update / destroy / edit Route::get('plan', 'ClientPortal\NinjaPlanController@plan')->name('plan'); // name = (dashboard. index / create / show / update / destroy / edit @@ -100,7 +100,7 @@ Route::group(['middleware' => ['auth:contact', 'locale', 'domain_db', 'check_cli Route::get('client/subscriptions/{subscription}/purchase', 'ClientPortal\SubscriptionPurchaseController@index')->name('client.subscription.purchase')->middleware('domain_db'); -Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () { +Route::middleware('invite_db')->prefix('client')->name('client.')->group(function () { /*Invitation catches*/ Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter'); Route::get('invoice/{invitation_key}', 'ClientPortal\InvitationController@invoiceRouter'); diff --git a/routes/contact.php b/routes/contact.php index cb7d977ec7dc..9332a1357c73 100644 --- a/routes/contact.php +++ b/routes/contact.php @@ -11,10 +11,10 @@ | */ -Route::group(['middleware' => ['api_secret_check']], function () { +Route::middleware('api_secret_check')->group(function () { Route::post('api/v1/contact/login', 'Contact\LoginController@apiLogin'); }); -Route::group(['middleware' => ['contact_db', 'api_secret_check', 'contact_token_auth'], 'prefix' =>'api/v1/contact', 'as' => 'api.contact.'], function () { +Route::middleware('contact_db', 'api_secret_check', 'contact_token_auth')->prefix('api/v1/contact')->name('api.contact.')->group(function () { Route::get('invoices', 'Contact\InvoiceController@index'); // name = (clients. index / create / show / update / destroy / edit }); diff --git a/routes/shop.php b/routes/shop.php index a522eecb1276..a69e3220cf67 100644 --- a/routes/shop.php +++ b/routes/shop.php @@ -2,7 +2,7 @@ use Illuminate\Support\Facades\Route; -Route::group(['middleware' => ['company_key_db', 'locale'], 'prefix' => 'api/v1'], function () { +Route::middleware('company_key_db', 'locale')->prefix('api/v1')->group(function () { Route::get('shop/products', 'Shop\ProductController@index'); Route::post('shop/clients', 'Shop\ClientController@store'); Route::post('shop/invoices', 'Shop\InvoiceController@store'); diff --git a/routes/vendor.php b/routes/vendor.php index d745f4490ba6..437b59dac82b 100644 --- a/routes/vendor.php +++ b/routes/vendor.php @@ -17,14 +17,14 @@ use Illuminate\Support\Facades\Route; Route::get('vendors', [VendorContactLoginController::class, 'catch'])->name('vendor.catchall')->middleware(['domain_db', 'contact_account', 'vendor_locale']); //catch all -Route::group(['middleware' => ['invite_db'], 'prefix' => 'vendor', 'as' => 'vendor.'], function () { +Route::middleware('invite_db')->prefix('vendor')->name('vendor.')->group(function () { /*Invitation catches*/ Route::get('purchase_order/{invitation_key}', [InvitationController::class, 'purchaseOrder']); // Route::get('purchase_order/{invitation_key}/download_pdf', 'PurchaseOrderController@downloadPdf')->name('recurring_invoice.download_invitation_key'); // Route::get('purchase_order/{invitation_key}/download', 'ClientPortal\InvitationController@routerForDownload'); }); -Route::group(['middleware' => ['auth:vendor', 'vendor_locale', 'domain_db'], 'prefix' => 'vendor', 'as' => 'vendor.'], function () { +Route::middleware('auth:vendor', 'vendor_locale', 'domain_db')->prefix('vendor')->name('vendor.')->group(function () { Route::get('dashboard', [PurchaseOrderController::class, 'index'])->name('dashboard'); Route::get('purchase_orders', [PurchaseOrderController::class, 'index'])->name('purchase_orders.index'); Route::get('purchase_orders/{purchase_order}', [PurchaseOrderController::class, 'show'])->name('purchase_order.show'); diff --git a/routes/web.php b/routes/web.php index 86cc0bc48960..8238f8552a8b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -33,7 +33,7 @@ Route::get('auth/{provider}', 'Auth\LoginController@redirectToProvider'); /* * Inbound routes requiring DB Lookup */ -Route::group(['middleware' => ['url_db']], function () { +Route::middleware('url_db')->group(function () { Route::get('/user/confirm/{confirmation_code}', 'UserController@confirm'); Route::post('/user/confirm/{confirmation_code}', 'UserController@confirmWithPassword'); });