From 8ef067dbc5ba2fdecd1b7f3f542b5ca84740b37d Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Fri, 17 Dec 2021 06:19:23 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Api/v1/TicketController.php | 4 ++-- .../Admin/helpdesk/EmailsController.php | 2 +- .../Admin/helpdesk/HelptopicController.php | 4 ++-- .../Admin/helpdesk/ProfileController.php | 4 ++-- .../Admin/helpdesk/SettingsController.php | 2 +- .../Admin/helpdesk/SettingsController2.php | 2 +- .../Admin/helpdesk/TeamController.php | 4 ++-- .../Admin/helpdesk/TemplateController.php | 2 +- .../Agent/helpdesk/CannedController.php | 6 +++--- .../helpdesk/Filter/FilterController.php | 4 +++- .../Agent/helpdesk/OrganizationController.php | 6 +++--- .../Agent/helpdesk/TicketController.php | 19 +++++++++---------- .../Agent/helpdesk/UserController.php | 4 ++-- .../Agent/kb/ArticleController.php | 2 +- .../Agent/kb/CategoryController.php | 6 +++--- .../Controllers/Agent/kb/PageController.php | 2 +- .../Agent/kb/SettingsController.php | 8 ++------ app/Http/Controllers/Auth/AuthController.php | 2 +- app/Http/Controllers/Auth/UserController.php | 6 +----- .../Client/helpdesk/GuestController.php | 6 +++--- .../Controllers/Client/kb/UserController.php | 2 -- app/Http/helpers.php | 6 +++--- app/Providers/AppServiceProvider.php | 1 - 23 files changed, 47 insertions(+), 57 deletions(-) diff --git a/app/Api/v1/TicketController.php b/app/Api/v1/TicketController.php index 4da8437af..8bfa51de4 100644 --- a/app/Api/v1/TicketController.php +++ b/app/Api/v1/TicketController.php @@ -404,7 +404,7 @@ class TicketController extends Controller /** * Ticket edit and save ticket data. * - * @param type $ticket_id + * @param type $ticket_id * @param type Ticket_Thread $thread * * @return type bool @@ -500,7 +500,7 @@ class TicketController extends Controller /** * Function to delete ticket. * - * @param type $id + * @param type $id * @param type Tickets $ticket * * @return type string diff --git a/app/Http/Controllers/Admin/helpdesk/EmailsController.php b/app/Http/Controllers/Admin/helpdesk/EmailsController.php index 10b8ad1c0..db02eb902 100644 --- a/app/Http/Controllers/Admin/helpdesk/EmailsController.php +++ b/app/Http/Controllers/Admin/helpdesk/EmailsController.php @@ -387,7 +387,7 @@ class EmailsController extends Controller /** * Update the specified resource in storage. * - * @param type $id + * @param type $id * @param type Emails $email * @param type EmailsEditRequest $request * diff --git a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php index 82a1669af..e39cba133 100644 --- a/app/Http/Controllers/Admin/helpdesk/HelptopicController.php +++ b/app/Http/Controllers/Admin/helpdesk/HelptopicController.php @@ -130,7 +130,7 @@ class HelptopicController extends Controller /** * Show the form for editing the specified helptopic. * - * @param type $id + * @param type $id * @param type Priority $priority * @param type Department $department * @param type Help_topic $topic @@ -162,7 +162,7 @@ class HelptopicController extends Controller /** * Update the specified helptopic in storage. * - * @param type $id + * @param type $id * @param type Help_topic $topic * @param type HelptopicUpdate $request * diff --git a/app/Http/Controllers/Admin/helpdesk/ProfileController.php b/app/Http/Controllers/Admin/helpdesk/ProfileController.php index 3bdaed0e6..7e697a608 100644 --- a/app/Http/Controllers/Admin/helpdesk/ProfileController.php +++ b/app/Http/Controllers/Admin/helpdesk/ProfileController.php @@ -104,11 +104,11 @@ class ProfileController extends Controller Input::file('profile_pic')->move($destinationPath, $fileName); $user->profile_pic = $fileName; } else { - $user->fill($request->except('profile_pic', 'gender','active','role','is_delete','ban'))->save(); + $user->fill($request->except('profile_pic', 'gender', 'active', 'role', 'is_delete', 'ban'))->save(); return redirect('guest')->with('success', 'Profile Updated sucessfully'); } - if ($user->fill($request->except('profile_pic','active','role','is_delete','ban'))->save()) { + if ($user->fill($request->except('profile_pic', 'active', 'role', 'is_delete', 'ban'))->save()) { return redirect('guest')->with('success', 'Profile Updated sucessfully'); } } diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 3332de56c..42e03e5aa 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -513,7 +513,7 @@ class SettingsController extends Controller /** * Update the specified alert in storage. * - * @param type $id + * @param type $id * @param type Alert $alert * @param type Request $request * diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController2.php b/app/Http/Controllers/Admin/helpdesk/SettingsController2.php index 0a18728a1..edf257563 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController2.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController2.php @@ -614,7 +614,7 @@ class SettingsController2 extends Controller /** * Update the specified resource in storage. * - * @param type $id + * @param type $id * @param type Alert $alert * @param type Request $request * diff --git a/app/Http/Controllers/Admin/helpdesk/TeamController.php b/app/Http/Controllers/Admin/helpdesk/TeamController.php index 5b8fd9a3d..1ea6e14aa 100644 --- a/app/Http/Controllers/Admin/helpdesk/TeamController.php +++ b/app/Http/Controllers/Admin/helpdesk/TeamController.php @@ -114,7 +114,7 @@ class TeamController extends Controller /** * Show the form for editing the specified resource. * - * @param type $id + * @param type $id * @param type User $user * @param type Assign_team_agent $assign_team_agent * @param type Teams $team @@ -200,7 +200,7 @@ class TeamController extends Controller /** * Show the form for editing the specified resource. * - * @param type $id + * @param type $id * @param type User $user * @param type Assign_team_agent $assign_team_agent * @param type Teams $team diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php index 9a56cc220..86c25012b 100644 --- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php +++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php @@ -115,7 +115,7 @@ class TemplateController extends Controller /** * Show the form for editing the specified resource. * - * @param type $id + * @param type $id * @param type Template $template * @param type Languages $language * diff --git a/app/Http/Controllers/Agent/helpdesk/CannedController.php b/app/Http/Controllers/Agent/helpdesk/CannedController.php index a764f436f..3d2a70b85 100644 --- a/app/Http/Controllers/Agent/helpdesk/CannedController.php +++ b/app/Http/Controllers/Agent/helpdesk/CannedController.php @@ -95,7 +95,7 @@ class CannedController extends Controller /** * Show the form for editing the Canned Response. * - * @param type $id + * @param type $id * @param type Canned $canned * * @return type View @@ -115,7 +115,7 @@ class CannedController extends Controller /** * Update the Canned Response in database. * - * @param type $id + * @param type $id * @param type CannedUpdateRequest $request * @param type Canned $canned * @@ -142,7 +142,7 @@ class CannedController extends Controller /** * Delete the Canned Response from storage. * - * @param type $id + * @param type $id * @param type Canned $canned * * @return type Redirect diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index 42f4e926c..b2d9218e6 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -922,7 +922,9 @@ class FilterController extends Controller return $table->whereIn('tickets.source', $sources); } - /** DEPRICATED. + /** + * DEPRICATED. + * * @category function to get array of status to filter tickets * * @param string $status diff --git a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php index 03a059a1f..636cca3a9 100644 --- a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php +++ b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php @@ -167,7 +167,7 @@ class OrganizationController extends Controller /** * Display the specified organization. * - * @param type $id + * @param type $id * @param type Organization $org * * @return type view @@ -187,7 +187,7 @@ class OrganizationController extends Controller /** * Show the form for editing the specified organization. * - * @param type $id + * @param type $id * @param type Organization $org * * @return type view @@ -207,7 +207,7 @@ class OrganizationController extends Controller /** * Update the specified organization in storage. * - * @param type $id + * @param type $id * @param type Organization $org * @param type OrganizationUpdate $request * diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 765fc0b1c..b72e16ba7 100755 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -441,7 +441,7 @@ class TicketController extends Controller /** * Ticket edit and save ticket data. * - * @param type $ticket_id + * @param type $ticket_id * @param type Ticket_Thread $thread * * @return type bool @@ -485,8 +485,7 @@ class TicketController extends Controller */ public function ticket_print($id) { - $tickets = Tickets:: - leftJoin('ticket_thread', function ($join) { + $tickets = Tickets::leftJoin('ticket_thread', function ($join) { $join->on('tickets.id', '=', 'ticket_thread.ticket_id') ->whereNotNull('ticket_thread.title'); }) @@ -1118,7 +1117,7 @@ class TicketController extends Controller /** * function to Ticket Close. * - * @param type $id + * @param type $id * @param type Tickets $ticket * * @return type string @@ -1182,7 +1181,7 @@ class TicketController extends Controller /** * function to Ticket resolved. * - * @param type $id + * @param type $id * @param type Tickets $ticket * * @return type string @@ -1228,7 +1227,7 @@ class TicketController extends Controller /** * function to Open Ticket. * - * @param type $id + * @param type $id * @param type Tickets $ticket * * @return type @@ -1268,7 +1267,7 @@ class TicketController extends Controller /** * Function to delete ticket. * - * @param type $id + * @param type $id * @param type Tickets $ticket * * @return type string @@ -1321,7 +1320,7 @@ class TicketController extends Controller /** * Function to ban an email. * - * @param type $id + * @param type $id * @param type Tickets $ticket * * @return type string @@ -2710,9 +2709,9 @@ class TicketController extends Controller /** * chumper's function to return data to chumper datatable. * - * @param Array-object $tickets + * @param array-object $tickets * - * @return Array-object + * @return array-object */ public static function genreateTableJson($tickets) { diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 8a6133d0f..e4b86098e 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -690,7 +690,7 @@ class UserController extends Controller } } $users->mobile = ($request->input('mobile') == '') ? null : $request->input('mobile'); - $users->fill($request->except('mobile','active','role','is_delete','ban')); + $users->fill($request->except('mobile', 'active', 'role', 'is_delete', 'ban')); $users->save(); if ($request->input('org_id') != '') { $orgid = $request->input('org_id'); @@ -765,7 +765,7 @@ class UserController extends Controller } $user->country_code = $request->country_code; } - $user->fill($request->except('profile_pic', 'mobile','active','role','is_delete','ban')); + $user->fill($request->except('profile_pic', 'mobile', 'active', 'role', 'is_delete', 'ban')); $user->gender = $request->input('gender'); $user->save(); if (Input::file('profile_pic')) { diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php index 863bcae66..75cbf8804 100644 --- a/app/Http/Controllers/Agent/kb/ArticleController.php +++ b/app/Http/Controllers/Agent/kb/ArticleController.php @@ -259,7 +259,7 @@ class ArticleController extends Controller /** * Delete an Agent by id. * - * @param type $id + * @param type $id * @param type Article $article * * @return Response diff --git a/app/Http/Controllers/Agent/kb/CategoryController.php b/app/Http/Controllers/Agent/kb/CategoryController.php index 1b1b22382..4df52dcd8 100644 --- a/app/Http/Controllers/Agent/kb/CategoryController.php +++ b/app/Http/Controllers/Agent/kb/CategoryController.php @@ -158,7 +158,7 @@ class CategoryController extends Controller /** * Show the form for editing the specified category. * - * @param type $slug + * @param type $slug * @param type Category $category * * @return type view @@ -175,7 +175,7 @@ class CategoryController extends Controller /** * Update the specified Category in storage. * - * @param type $slug + * @param type $slug * @param type Category $category * @param type CategoryUpdate $request * @@ -204,7 +204,7 @@ class CategoryController extends Controller /** * Remove the specified category from storage. * - * @param type $id + * @param type $id * @param type Category $category * @param type Relationship $relation * diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php index cbed458b3..2eadc5ef5 100644 --- a/app/Http/Controllers/Agent/kb/PageController.php +++ b/app/Http/Controllers/Agent/kb/PageController.php @@ -160,7 +160,7 @@ class PageController extends Controller /** * To update a page. * - * @param type $slug + * @param type $slug * @param type PageUpdate $request * * @return type redirect diff --git a/app/Http/Controllers/Agent/kb/SettingsController.php b/app/Http/Controllers/Agent/kb/SettingsController.php index a69df4a45..cf12899b3 100644 --- a/app/Http/Controllers/Agent/kb/SettingsController.php +++ b/app/Http/Controllers/Agent/kb/SettingsController.php @@ -6,19 +6,15 @@ namespace App\Http\Controllers\Agent\kb; use App\Http\Controllers\Agent\helpdesk\TicketController; use App\Http\Controllers\Controller; // Request -use App\Http\Requests\kb\ProfilePassword; -use App\Http\Requests\kb\ProfileRequest; use App\Http\Requests\kb\SettingsRequests; use App\Model\helpdesk\Utility\Date_format; // Model use App\Model\helpdesk\Utility\Timezones; use App\Model\kb\Comment; use App\Model\kb\Settings; -use Auth; // Classes use Config; use Exception; -use Hash; use Illuminate\Http\Request; use Image; use Input; @@ -171,7 +167,7 @@ class SettingsController extends Controller /** * Admin can publish the comment. * - * @param type $id + * @param type $id * @param type Comment $comment * * @return bool @@ -190,7 +186,7 @@ class SettingsController extends Controller /** * delete the comment. * - * @param type $id + * @param type $id * @param type Comment $comment * * @return type diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index a5f95ff5f..d659d9a8c 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -244,7 +244,7 @@ class AuthController extends Controller /** * Get mail function. * - * @param type $token + * @param type $token * @param type User $user * * @return type Response diff --git a/app/Http/Controllers/Auth/UserController.php b/app/Http/Controllers/Auth/UserController.php index 9dddbc224..d5664161a 100644 --- a/app/Http/Controllers/Auth/UserController.php +++ b/app/Http/Controllers/Auth/UserController.php @@ -6,9 +6,7 @@ namespace App\Http\Controllers\Agent\helpdesk; use App\Http\Controllers\Controller; // requests /* Include Sys_user Model */ -use App\Http\Requests\helpdesk\ProfilePassword; /* For validation include Sys_userRequest in create */ -use App\Http\Requests\helpdesk\ProfileRequest; /* For validation include Sys_userUpdate in update */ use App\Http\Requests\helpdesk\Sys_userRequest; /* include guest_note model */ @@ -23,9 +21,7 @@ use App\Model\helpdesk\Agent_panel\User_org; use App\User; // classes /* include ticket_thred model */ -use Auth; /* include tickets model */ -use Hash; /* TicketRequest to validate the ticket response */ /* Validate post check ticket */ use Input; @@ -246,7 +242,7 @@ class UserController extends Controller $users = $user->whereId($id)->first(); /* Update the value by selected field */ /* Check whether function success or not */ - if ($users->fill($request->except('active','role','is_delete','ban'))->save() == true) { + if ($users->fill($request->except('active', 'role', 'is_delete', 'ban'))->save() == true) { /* redirect to Index page with Success Message */ return redirect('user')->with('success', 'User Updated Successfully'); } else { diff --git a/app/Http/Controllers/Client/helpdesk/GuestController.php b/app/Http/Controllers/Client/helpdesk/GuestController.php index a2909f843..ca20a7b5e 100644 --- a/app/Http/Controllers/Client/helpdesk/GuestController.php +++ b/app/Http/Controllers/Client/helpdesk/GuestController.php @@ -73,7 +73,7 @@ class GuestController extends Controller /** * Save profile data. * - * @param type $id + * @param type $id * @param type ProfileRequest $request * * @return type Response @@ -92,7 +92,7 @@ class GuestController extends Controller } $user->country_code = $request->country_code; } - $user->fill($request->except('profile_pic', 'mobile','active','role','is_delete','ban')); + $user->fill($request->except('profile_pic', 'mobile', 'active', 'role', 'is_delete', 'ban')); $user->gender = $request->input('gender'); $user->save(); if (Input::file('profile_pic')) { @@ -226,7 +226,7 @@ class GuestController extends Controller /** * Post porfile password. * - * @param type $id + * @param type $id * @param type ProfilePassword $request * * @return type Response diff --git a/app/Http/Controllers/Client/kb/UserController.php b/app/Http/Controllers/Client/kb/UserController.php index 56d321af2..e2597f947 100644 --- a/app/Http/Controllers/Client/kb/UserController.php +++ b/app/Http/Controllers/Client/kb/UserController.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers\Client\kb; use App\Http\Controllers\Controller; use App\Http\Requests\kb\CommentRequest; use App\Http\Requests\kb\ContactRequest; -use App\Http\Requests\kb\ProfilePassword; use App\Http\Requests\kb\SearchRequest; use App\Model\kb\Article; use App\Model\kb\Category; @@ -18,7 +17,6 @@ use App\Model\kb\Settings; use Auth; // use Creativeorange\Gravatar\Gravatar; use Config; -use Hash; use Illuminate\Http\Request; use Lang; use Mail; diff --git a/app/Http/helpers.php b/app/Http/helpers.php index f46cd41b4..e291a24c1 100644 --- a/app/Http/helpers.php +++ b/app/Http/helpers.php @@ -229,7 +229,7 @@ function timezone() * formats the error message into json error response. * * @param string/array $errorMsg errorMsg can be an array of errors or string - * @param int $responseCode + * @param int $responseCode * * @return json */ @@ -243,9 +243,9 @@ function errorResponse($errorMsg, $responseCode = 400) /** * formats success message/data into json success response. * - * @param string $successMsg + * @param string $successMsg * @param array/string $data data of the response - * @param int $responseCode + * @param int $responseCode * * @return json */ diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 80755cbef..7d09bba51 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -8,7 +8,6 @@ use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; use Laravel\Dusk\DuskServiceProvider; use Queue; -use View; class AppServiceProvider extends ServiceProvider {