From 03585f5a5a4354285d4f4b6d3d27cfcfbb45bdcf Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Wed, 20 Sep 2023 06:41:32 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Api/v1/TokenAuthController.php | 4 +- app/Exceptions/Handler.php | 2 +- app/Helper/Finder.php | 8 ++-- .../Admin/helpdesk/SettingsController.php | 18 ++++----- .../Admin/helpdesk/SettingsController2.php | 16 ++++---- .../helpdesk/Filter/FilterControllerOld.php | 4 +- .../Agent/helpdesk/NotificationController.php | 8 ++-- .../Agent/helpdesk/TicketController.php | 4 +- .../Auth/ForgotPasswordController.php | 4 +- .../Controllers/Auth/PasswordController.php | 4 +- .../Client/helpdesk/GuestController.php | 4 +- .../Client/helpdesk/UnAuthController.php | 8 ++-- .../Controllers/Common/PhpMailController.php | 2 +- .../Middleware/RedirectIfAuthenticated.php | 6 +-- app/Http/Requests/helpdesk/AgentRequest.php | 4 +- app/Http/Requests/helpdesk/ClientRequest.php | 4 +- .../Requests/helpdesk/CreateTicketRequest.php | 6 +-- app/Http/Requests/helpdesk/ProfileRequest.php | 2 +- .../Requests/helpdesk/RegisterRequest.php | 4 +- .../Requests/helpdesk/Sys_userRequest.php | 6 +-- tests/Unit/TicketControllerTest.php | 40 +++++++++---------- 21 files changed, 78 insertions(+), 80 deletions(-) diff --git a/app/Api/v1/TokenAuthController.php b/app/Api/v1/TokenAuthController.php index 577d5836b..5c596018c 100644 --- a/app/Api/v1/TokenAuthController.php +++ b/app/Api/v1/TokenAuthController.php @@ -174,8 +174,8 @@ class TokenAuthController extends Controller $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first(); if (isset($password_reset_table)) { $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]); - // $password_reset_table->token = $code; - // $password_reset_table->update(['token' => $code]); + // $password_reset_table->token = $code; + // $password_reset_table->update(['token' => $code]); } else { $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 5bc7cbdb3..f4a7c2d56 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -59,7 +59,7 @@ class Handler extends ExceptionHandler } /** - * @param $request + * @param $request * @param \Throwable $e * * @throws \Throwable diff --git a/app/Helper/Finder.php b/app/Helper/Finder.php index 594f9d1c4..f18d541b8 100644 --- a/app/Helper/Finder.php +++ b/app/Helper/Finder.php @@ -22,7 +22,7 @@ class Finder * DEPARTMENT * This function is used for returning department name with respect to id. * - * @param $id type int + * @param $id type int * @param $custom type array/null * * @return type string @@ -42,7 +42,7 @@ class Finder * GROUP * This function is used for returning group name with respect to id. * - * @param $id type int + * @param $id type int * @param $custom type array/null * * @return type string @@ -62,7 +62,7 @@ class Finder * STATUS TYPE * This function is used for returning status type name with respect to id. * - * @param $id type int + * @param $id type int * @param $custom type array/null * * @return type string @@ -82,7 +82,7 @@ class Finder * STATUS * This function is used for returning status name with respect to id. * - * @param $id type int + * @param $id type int * @param $custom type array/null * * @return type string diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 6ff51b814..003a10779 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -63,7 +63,7 @@ class SettingsController extends Controller /** * @param int $id - * @param $compant instance of company table + * @param $compant instance of company table * * get the form for company setting page * @@ -118,7 +118,7 @@ class SettingsController extends Controller /** * function to delete system logo. * - * @return type string + * @return type string */ public function deleteLogo() { @@ -583,7 +583,7 @@ class SettingsController extends Controller /** * Generate Api key. * - * @return type json + * @return type json */ public function generateApiKey() { @@ -604,7 +604,7 @@ class SettingsController extends Controller /** * @param int $id - * @param $compant instance of company table + * @param $compant instance of company table * * get the form for company setting page * @@ -624,7 +624,7 @@ class SettingsController extends Controller /** * @param int $id - * @param $compant instance of company table + * @param $compant instance of company table * * get the form for company setting page * @@ -644,7 +644,7 @@ class SettingsController extends Controller /** * @param int $id - * @param $compant instance of company table + * @param $compant instance of company table * * get the form for company setting page * @@ -780,7 +780,7 @@ class SettingsController extends Controller /** * To display the list of ratings in the system. * - * @return type View + * @return type View */ public function RatingSettings() { @@ -814,7 +814,7 @@ class SettingsController extends Controller /** * To store rating data. * - * @return type Redirect + * @return type Redirect */ public function PostRatingSettings($id, Rating $ratings, RatingUpdateRequest $request) { @@ -875,7 +875,7 @@ class SettingsController extends Controller /** * To delete a type of rating. * - * @return type Redirect + * @return type Redirect */ public function RatingDelete($slug, \App\Model\helpdesk\Ratings\RatingRef $ratingrefs) { diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController2.php b/app/Http/Controllers/Admin/helpdesk/SettingsController2.php index 4841229fa..5a3260045 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController2.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController2.php @@ -98,7 +98,7 @@ class SettingsController2 extends Controller /** * @param int $id - * @param $compant instance of company table + * @param $compant instance of company table * * get the form for company setting page * @@ -118,7 +118,7 @@ class SettingsController2 extends Controller /** * @param int $id - * @param $compant instance of company table + * @param $compant instance of company table * * get the form for company setting page * @@ -189,7 +189,7 @@ class SettingsController2 extends Controller /** * @param int $id - * @param $compant instance of company table + * @param $compant instance of company table * * get the form for company setting page * @@ -244,7 +244,7 @@ class SettingsController2 extends Controller /** * function to delete system logo. * - * @return type string + * @return type string */ public function deleteLogo() { @@ -684,7 +684,7 @@ class SettingsController2 extends Controller /** * To display the list of ratings in the system. * - * @return type View + * @return type View */ public function RatingSettings() { @@ -696,7 +696,7 @@ class SettingsController2 extends Controller /** * To store rating data. * - * @return type Redirect + * @return type Redirect */ public function PostRatingSettings($slug) { @@ -721,7 +721,7 @@ class SettingsController2 extends Controller /** * To delete a type of rating. * - * @return type Redirect + * @return type Redirect */ public function RatingDelete($slug) { @@ -733,7 +733,7 @@ class SettingsController2 extends Controller /** * Generate Api key. * - * @return type json + * @return type json */ public function generateApiKey() { diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php index 48919929a..7d0a7a4ab 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php @@ -315,9 +315,9 @@ class FilterControllerOld extends Controller /** *@category function to format and return user tickets * - *@param string $segment + * @param string $segment * - *@return builder + * @return builder */ public function formatUserTickets($segment) { diff --git a/app/Http/Controllers/Agent/helpdesk/NotificationController.php b/app/Http/Controllers/Agent/helpdesk/NotificationController.php index 13b4f6d9f..e289282dd 100644 --- a/app/Http/Controllers/Agent/helpdesk/NotificationController.php +++ b/app/Http/Controllers/Agent/helpdesk/NotificationController.php @@ -72,7 +72,7 @@ class NotificationController extends Controller * * @param company * - * @return mail + * @return mail * */ public function send_notification_to_admin($company) { @@ -102,7 +102,7 @@ class NotificationController extends Controller /** * Department Manager Notification/Report. * - * @return mail + * @return mail * */ public function send_notification_to_manager($company) { @@ -138,7 +138,7 @@ class NotificationController extends Controller /** * Team Lead Notification/Report. * - * @return mail + * @return mail * */ public function send_notification_to_team_lead($company) { @@ -174,7 +174,7 @@ class NotificationController extends Controller /** * Agent Notification/Report. * - * @return mail + * @return mail * */ public function send_notification_to_agent($company) { diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 3563e7c40..e85890f4a 100755 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2321,7 +2321,7 @@ class TicketController extends Controller * *@param null * - *@return string //script to load tooltip data + * @return string //script to load tooltip data */ public static function tooltip($ticketid) { @@ -2672,7 +2672,7 @@ class TicketController extends Controller * *@param srting array $t_id, $p_id * - *@return null + * @return null */ public function sendMergeNotification($p_id, $t_id) { diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 3ede1033d..c10a09bf7 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -58,8 +58,8 @@ class ForgotPasswordController extends Controller $password_reset_table = DB::table('password_resets')->where('email', '=', $user->email)->first(); if (isset($password_reset_table)) { $password_reset_table = DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]); - // $password_reset_table->token = $code; - // $password_reset_table->update(['token' => $code]); + // $password_reset_table->token = $code; + // $password_reset_table->update(['token' => $code]); } else { $create_password_reset = DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); } diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 9c783fd5c..437cc3b72 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -63,8 +63,8 @@ class PasswordController extends Controller $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first(); if (isset($password_reset_table)) { $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]); - // $password_reset_table->token = $code; - // $password_reset_table->update(['token' => $code]); + // $password_reset_table->token = $code; + // $password_reset_table->update(['token' => $code]); } else { $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); } diff --git a/app/Http/Controllers/Client/helpdesk/GuestController.php b/app/Http/Controllers/Client/helpdesk/GuestController.php index 33f0d9eee..8ac8d7140 100644 --- a/app/Http/Controllers/Client/helpdesk/GuestController.php +++ b/app/Http/Controllers/Client/helpdesk/GuestController.php @@ -125,9 +125,9 @@ class GuestController extends Controller /** *@category fucntion to check if mobile number is unqique or not * - *@param string $mobile + * @param string $mobile * - *@return bool true(if mobile exists in users table)/false (if mobile does not exist in user table) + * @return bool true(if mobile exists in users table)/false (if mobile does not exist in user table) */ public function checkMobile($mobile) { diff --git a/app/Http/Controllers/Client/helpdesk/UnAuthController.php b/app/Http/Controllers/Client/helpdesk/UnAuthController.php index dd3fd8ed7..ac82e531a 100755 --- a/app/Http/Controllers/Client/helpdesk/UnAuthController.php +++ b/app/Http/Controllers/Client/helpdesk/UnAuthController.php @@ -327,9 +327,9 @@ class UnAuthController extends Controller /** *@category function to change system's language * - *@param string $lang //desired language's iso code + * @param string $lang //desired language's iso code * - *@return response + * @return response */ public static function changeLanguage($lang) { @@ -344,8 +344,8 @@ class UnAuthController extends Controller // app()->setLocale($lang); \Cache::forever('language', $lang); - // dd(Cache::get('language')); - // dd() + // dd(Cache::get('language')); + // dd() } else { return false; } diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index 7f77d1595..fc72eea75 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -17,7 +17,7 @@ use Mail; class PhpMailController extends Controller { /** - *@var variable to instantiate common mailer class + * @var variable to instantiate common mailer class */ public function __construct() { diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 539729fc3..5922fce87 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -11,9 +11,9 @@ class RedirectIfAuthenticated /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next - * @param string|null ...$guards + * @param \Illuminate\Http\Request $request + * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next + * @param string|null ...$guards * * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse */ diff --git a/app/Http/Requests/helpdesk/AgentRequest.php b/app/Http/Requests/helpdesk/AgentRequest.php index 2f19c576c..4c8d62d02 100644 --- a/app/Http/Requests/helpdesk/AgentRequest.php +++ b/app/Http/Requests/helpdesk/AgentRequest.php @@ -53,11 +53,11 @@ class AgentRequest extends Request /** *@category Funcion to set rule if send opt is enabled * - *@param object $settings (instance of Model common settings) + * @param object $settings (instance of Model common settings) * *@author manish.verma@ladybirdweb.com * - *@return array|int + * @return array|int */ public function check($settings) { diff --git a/app/Http/Requests/helpdesk/ClientRequest.php b/app/Http/Requests/helpdesk/ClientRequest.php index 6a7301bd8..f6de79bfc 100644 --- a/app/Http/Requests/helpdesk/ClientRequest.php +++ b/app/Http/Requests/helpdesk/ClientRequest.php @@ -119,11 +119,11 @@ class ClientRequest extends Request /** *@category Funcion to set rule if send opt is enabled * - *@param object $settings (instance of Model common settings) + * @param object $settings (instance of Model common settings) * *@author manish.verma@ladybirdweb.com * - *@return array|int + * @return array|int */ public function check($settings) { diff --git a/app/Http/Requests/helpdesk/CreateTicketRequest.php b/app/Http/Requests/helpdesk/CreateTicketRequest.php index 311ce2486..273f134b5 100644 --- a/app/Http/Requests/helpdesk/CreateTicketRequest.php +++ b/app/Http/Requests/helpdesk/CreateTicketRequest.php @@ -58,11 +58,11 @@ class CreateTicketRequest extends Request /** *@category Funcion to set rule if send opt is enabled * - *@param object $settings (instance of Model common settings) + * @param object $settings (instance of Model common settings) * *@author manish.verma@ladybirdweb.com * - *@return array|int + * @return array|int */ public function check($settings) { @@ -102,7 +102,7 @@ class CreateTicketRequest extends Request * *@param null * - *@return array + * @return array */ public function onlyMobleRequired() { diff --git a/app/Http/Requests/helpdesk/ProfileRequest.php b/app/Http/Requests/helpdesk/ProfileRequest.php index 3b995c906..8dd3d4554 100644 --- a/app/Http/Requests/helpdesk/ProfileRequest.php +++ b/app/Http/Requests/helpdesk/ProfileRequest.php @@ -38,7 +38,7 @@ class ProfileRequest extends Request /** *Check the mobile number is unique or not. * - *@return string + * @return string */ public function checkMobile() { diff --git a/app/Http/Requests/helpdesk/RegisterRequest.php b/app/Http/Requests/helpdesk/RegisterRequest.php index 04ecfc11e..31436b8c4 100644 --- a/app/Http/Requests/helpdesk/RegisterRequest.php +++ b/app/Http/Requests/helpdesk/RegisterRequest.php @@ -45,11 +45,11 @@ class RegisterRequest extends Request /** *@category Funcion to set rule if send opt is enabled * - *@param object $settings (instance of Model common settings) + * @param object $settings (instance of Model common settings) * *@author manish.verma@ladybirdweb.com * - *@return array|int + * @return array|int */ public function check($settings) { diff --git a/app/Http/Requests/helpdesk/Sys_userRequest.php b/app/Http/Requests/helpdesk/Sys_userRequest.php index a8d829a97..d86b59ef2 100644 --- a/app/Http/Requests/helpdesk/Sys_userRequest.php +++ b/app/Http/Requests/helpdesk/Sys_userRequest.php @@ -45,11 +45,11 @@ class Sys_userRequest extends Request /** *@category Funcion to set rule if send opt is enabled * - *@param object $settings (instance of Model common settings) + * @param object $settings (instance of Model common settings) * *@author manish.verma@ladybirdweb.com * - *@return array|int + * @return array|int */ public function check($settings) { @@ -83,7 +83,7 @@ class Sys_userRequest extends Request * *@param null * - *@return array + * @return array */ public function onlyMobleRequired() { diff --git a/tests/Unit/TicketControllerTest.php b/tests/Unit/TicketControllerTest.php index 8c2ec1559..41a862272 100644 --- a/tests/Unit/TicketControllerTest.php +++ b/tests/Unit/TicketControllerTest.php @@ -5,7 +5,6 @@ namespace Tests\Unit; use App\Model\helpdesk\Ticket\Ticket_Thread; use App\Model\helpdesk\Ticket\Tickets; use App\User; - use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Lang; @@ -14,6 +13,7 @@ use Tests\TestCase; class TicketControllerTest extends TestCase { use DatabaseTransactions; + /** * A basic unit test example. * @@ -25,26 +25,26 @@ class TicketControllerTest extends TestCase $password = Hash::make($str); $user = new User([ 'first_name' => 'a', - 'last_name' => 'noor', - 'email' => 'naveen12@gmail.com', - 'user_name' => 'noor', - 'password' => $password, - 'active' => 1, - 'role' => 'user', + 'last_name' => 'noor', + 'email' => 'naveen12@gmail.com', + 'user_name' => 'noor', + 'password' => $password, + 'active' => 1, + 'role' => 'user', ]); $user->save(); -// Authenticate as the created user + // Authenticate as the created user $this->actingAs($user); $ticket = new Tickets( [ 'ticket_number' => 'AAAA-0000-0001', - 'user_id' => $user->id, - 'priority_id' => 2, - 'sla' => 2, + 'user_id' => $user->id, + 'priority_id' => 2, + 'sla' => 2, 'help_topic_id' => 1, - 'status' => 1, - 'source' => 1 + 'status' => 1, + 'source' => 1, ] ); $ticket->save(); @@ -54,21 +54,20 @@ class TicketControllerTest extends TestCase $ticket_thread = new Ticket_Thread( [ 'ticket_id' => $ticket->id, - 'user_id' => $user->id, - 'poster' => 'client', - 'title' => 'TestCase', - 'body' => 'Testing', + 'user_id' => $user->id, + 'poster' => 'client', + 'title' => 'TestCase', + 'body' => 'Testing', ] ); $ticket_thread->save(); - $mytickets = $this->get(route('ticket2')); $mytickets->assertStatus(200); $response = $this->post(route('select_all'), [ 'select_all' => [$ticket->id], - 'submit' => 'Open', + 'submit' => 'Open', ]); // Assert that the response status code indicates success @@ -79,11 +78,10 @@ class TicketControllerTest extends TestCase $response->assertSessionHas('success', Lang::get('lang.tickets_have_been_opened')); $response = $this->post(route('select_all'), [ 'select_all' => [$ticket->id], - 'submit' => 'Close', + 'submit' => 'Close', ]); $response->assertStatus(302); // Adjust this as needed $this->assertEquals(3, $ticket->fresh()->status); // Adjust this as needed $response->assertSessionHas('success', Lang::get('lang.tickets_have_been_closed')); - } }