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.

app/Api/routes.php

@@ -8,15 +8,15 @@
      * @author Vijay Sebastian<vijay.sebastian@ladybirdweb.com>
      * @name Faveo
      */
-    Route::group(['prefix' => 'api/v1'], function () {
+    Route::prefix('api/v1')->group(function () {
         Route::post('authenticate', '\App\Api\v1\TokenAuthController@authenticate');
         Route::get('authenticate/user', '\App\Api\v1\TokenAuthController@getAuthenticatedUser');
-        Route::get('/database-config', ['as' => 'database-config', 'uses' => '\App\Api\v1\InstallerApiController@config_database']);
+        Route::get('/database-config', '\App\Api\v1\InstallerApiController@config_database')->name('database-config');
-        Route::get('/system-config', ['as' => 'database-config', 'uses' => '\App\Api\v1\InstallerApiController@config_system']);
+        Route::get('/system-config', '\App\Api\v1\InstallerApiController@config_system')->name('database-config');
         /*
          * Helpdesk
          */
-        Route::group(['prefix' => 'helpdesk'], function () {
+        Route::prefix('helpdesk')->group(function () {
             Route::post('create', '\App\Api\v1\ApiController@createTicket');
             Route::post('reply', '\App\Api\v1\ApiController@ticketReply');
             Route::post('edit', '\App\Api\v1\ApiController@editTicket');
@@ -60,7 +60,7 @@
         /*
          * FCM token response
          */
-        Route::post('fcmtoken', ['as' => 'fcmtoken', 'uses' => 'Common\PushNotificationController@fcmToken']);
+        Route::post('fcmtoken', 'Common\PushNotificationController@fcmToken')->name('fcmtoken');
     });
     /*
      * ================================================================================================
@@ -70,11 +70,11 @@
      * @author Manish Verma<manish.verma@ladybirdweb.com>
      * @name Faveo
      */
-    Route::group(['prefix' => 'api/v2'], function () {
+    Route::prefix('api/v2')->group(function () {
         /*
          * Helpdesk
          */
-        Route::group(['prefix' => 'helpdesk'], function () {
+        Route::prefix('helpdesk')->group(function () {
             Route::get('tickets', '\App\Api\v2\TicketController@getTickets');
         });
     });

app/FaveoLog/routes.php

@@ -4,6 +4,6 @@ Breadcrumbs::register('logs', function ($breadcrumbs) {
     $breadcrumbs->parent('setting');
     $breadcrumbs->push('System Logs', route('logs'));
 });
-Route::group(['middleware' => ['web', 'auth', 'roles']], function () {
+Route::middleware('web', 'auth', 'roles')->group(function () {
-    Route::get('logs', ['as' => 'logs', 'uses' => 'App\FaveoLog\controllers\LogViewerController@index']);
+    Route::get('logs', 'App\FaveoLog\controllers\LogViewerController@index')->name('logs');
 });

app/FaveoStorage/routes.php

@@ -5,8 +5,8 @@
     echo $controller->settingsIcon();
 });
 
-Route::group(['middleware' => ['web']], function () {
+Route::middleware('web')->group(function () {
-    Route::get('storage', ['as' => 'storage', 'uses' => 'App\FaveoStorage\Controllers\SettingsController@settings']);
+    Route::get('storage', 'App\FaveoStorage\Controllers\SettingsController@settings')->name('storage');
-    Route::post('storage', ['as' => 'post.storage', 'uses' => 'App\FaveoStorage\Controllers\SettingsController@postSettings']);
+    Route::post('storage', 'App\FaveoStorage\Controllers\SettingsController@postSettings')->name('post.storage');
-    Route::get('attachment', ['as' => 'attach', 'uses' => 'App\FaveoStorage\Controllers\SettingsController@attachment']);
+    Route::get('attachment', 'App\FaveoStorage\Controllers\SettingsController@attachment')->name('attach');
 });

app/Providers/RouteServiceProvider.php

@@ -55,10 +55,7 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapWebRoutes()
     {
-        Route::group([
+        Route::middleware('web')->namespace($this->namespace)->group(function ($router) {
-            'middleware' => 'web',
-            'namespace' => $this->namespace,
-        ], function ($router) {
             require base_path('routes/web.php');
         });
     }
@@ -72,11 +69,7 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapApiRoutes()
     {
-        Route::group([
+        Route::middleware('api')->namespace($this->namespace)->prefix('api')->group(function ($router) {
-            'middleware' => 'api',
-            'namespace' => $this->namespace,
-            'prefix' => 'api',
-        ], function ($router) {
             require base_path('routes/api.php');
         });
     }
@@ -90,10 +83,7 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapInstallerRoutes()
     {
-        Route::group([
+        Route::middleware('web', 'installer')->namespace($this->namespace)->group(function ($router) {
-            'middleware' => ['web', 'installer'],
-            'namespace' => $this->namespace,
-        ], function ($router) {
             require base_path('routes/installer.php');
         });
     }
@@ -107,11 +97,7 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapUpdateRoutes()
     {
-        Route::group([
+        Route::middleware('web', 'redirect', 'install')->namespace($this->namespace)->prefix('app/update')->group(function ($router) {
-            'middleware' => ['web', 'redirect', 'install'],
-            'namespace' => $this->namespace,
-            'prefix' => 'app/update',
-        ], function ($router) {
             require base_path('routes/update.php');
         });
     }

routes/installer.php

@@ -1,96 +1,30 @@
 <?php
 
-Route::get('serial', [
+Route::get('serial', 'Installer\helpdesk\InstallController@serialkey')->name('serialkey');
-    'as' => 'serialkey',
+Route::post('/post-serial', 'Installer\helpdesk\InstallController@postSerialKeyToFaveo')->name('post.serialkey');
-    'uses' => 'Installer\helpdesk\InstallController@serialkey',
+Route::post('/post-bill', 'Installer\helpdesk\InstallController@returnFormBilling')->name('return.bill');
-]);
-Route::post('/post-serial', [
-    'as' => 'post.serialkey',
-    'uses' => 'Installer\helpdesk\InstallController@postSerialKeyToFaveo',
-]);
-Route::post('/post-bill', [
-    'as' => 'return.bill',
-    'uses' => 'Installer\helpdesk\InstallController@returnFormBilling',
-]);
 
-Route::get('/JavaScript-disabled', [
+Route::get('/JavaScript-disabled', 'Installer\helpdesk\InstallController@jsDisabled')->name('js-disabled');
-    'as' => 'js-disabled',
+Route::get('/step2', 'Installer\helpdesk\InstallController@licence')->name('licence');
-    'uses' => 'Installer\helpdesk\InstallController@jsDisabled',
+Route::post('/step1post', 'Installer\helpdesk\InstallController@licencecheck')->name('postlicence');
-]);
+Route::get('/step1', 'Installer\helpdesk\InstallController@prerequisites')->name('prerequisites');
-Route::get('/step2', [
+Route::post('/step2post', 'Installer\helpdesk\InstallController@prerequisitescheck')->name('postprerequisites');
-    'as' => 'licence',
+Route::get('/step3', 'Installer\helpdesk\InstallController@configuration')->name('configuration');
-    'uses' => 'Installer\helpdesk\InstallController@licence',
+Route::post('/step4post', 'Installer\helpdesk\InstallController@configurationcheck')->name('postconfiguration');
-]);
+Route::get('/step4', 'Installer\helpdesk\InstallController@database')->name('database');
-Route::post('/step1post', [
+Route::get('/step5', 'Installer\helpdesk\InstallController@account')->name('account');
-    'as' => 'postlicence',
+Route::post('/step6post', 'Installer\helpdesk\InstallController@accountcheck')->name('postaccount');
-    'uses' => 'Installer\helpdesk\InstallController@licencecheck',
+Route::get('/final', 'Installer\helpdesk\InstallController@finalize')->name('final');
-]);
+Route::post('/finalpost', 'Installer\helpdesk\InstallController@finalcheck')->name('postfinal');
-Route::get('/step1', [
+Route::post('/postconnection', 'Installer\helpdesk\InstallController@postconnection')->name('postconnection');
-    'as' => 'prerequisites',
+Route::get('/change-file-permission', 'Installer\helpdesk\InstallController@changeFilePermission')->name('change-permission');
-    'uses' => 'Installer\helpdesk\InstallController@prerequisites',
-]);
-Route::post('/step2post', [
-    'as' => 'postprerequisites',
-    'uses' => 'Installer\helpdesk\InstallController@prerequisitescheck',
-]);
-Route::get('/step3', [
-    'as' => 'configuration',
-    'uses' => 'Installer\helpdesk\InstallController@configuration',
-]);
-Route::post('/step4post', [
-    'as' => 'postconfiguration',
-    'uses' => 'Installer\helpdesk\InstallController@configurationcheck',
-]);
-Route::get('/step4', [
-    'as' => 'database',
-    'uses' => 'Installer\helpdesk\InstallController@database',
-]);
-Route::get('/step5', [
-    'as' => 'account',
-    'uses' => 'Installer\helpdesk\InstallController@account',
-]);
-Route::post('/step6post', [
-    'as' => 'postaccount',
-    'uses' => 'Installer\helpdesk\InstallController@accountcheck',
-]);
-Route::get('/final', [
-    'as' => 'final',
-    'uses' => 'Installer\helpdesk\InstallController@finalize',
-]);
-Route::post('/finalpost', [
-    'as' => 'postfinal',
-    'uses' => 'Installer\helpdesk\InstallController@finalcheck',
-]);
-Route::post('/postconnection', [
-    'as' => 'postconnection',
-    'uses' => 'Installer\helpdesk\InstallController@postconnection',
-]);
-Route::get('/change-file-permission', [
-    'as' => 'change-permission',
-    'uses' => 'Installer\helpdesk\InstallController@changeFilePermission',
-]);
 
-Route::get('create/env', [
+Route::get('create/env', 'Installer\helpdesk\InstallController@createEnv')->name('create.env');
-    'as' => 'create.env',
-    'uses' => 'Installer\helpdesk\InstallController@createEnv',
-]);
 
-Route::get('preinstall/check', [
+Route::get('preinstall/check', 'Installer\helpdesk\InstallController@checkPreInstall')->name('preinstall.check');
-    'as' => 'preinstall.check',
-    'uses' => 'Installer\helpdesk\InstallController@checkPreInstall',
-]);
 
-Route::get('migrate', [
+Route::get('migrate', 'Installer\helpdesk\InstallController@migrate')->name('migrate');
-    'as' => 'migrate',
-    'uses' => 'Installer\helpdesk\InstallController@migrate',
-]);
 
-Route::get('seed', [
+Route::get('seed', 'Installer\helpdesk\InstallController@seed')->name('seed');
-    'as' => 'seed',
-    'uses' => 'Installer\helpdesk\InstallController@seed',
-]);
 
-Route::get('update/install', [
+Route::get('update/install', 'Installer\helpdesk\InstallController@updateInstalEnv')->name('update.install');
-    'as' => 'update.install',
-    'uses' => 'Installer\helpdesk\InstallController@updateInstalEnv',
-]);