cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
StyleCI Bot
2023-09-20 06:41:32 +00:00
parent cbd07877df
commit 03585f5a5a
21 changed files with 78 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/v1/TokenAuthController.php
View File

@@ -174,8 +174,8 @@ class TokenAuthController extends Controller
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first(); $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) { 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 = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code; // $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]); // $password_reset_table->update(['token' => $code]);
} else { } else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
} }

2
app/Exceptions/Handler.php
View File

@@ -59,7 +59,7 @@ class Handler extends ExceptionHandler
} }
/** /**
* @param $request * @param $request
* @param \Throwable $e * @param \Throwable $e
* *
* @throws \Throwable * @throws \Throwable

8
app/Helper/Finder.php
View File

@@ -22,7 +22,7 @@ class Finder
* DEPARTMENT * DEPARTMENT
* This function is used for returning department name with respect to id. * 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 * @param $custom type array/null
* *
* @return type string * @return type string
@@ -42,7 +42,7 @@ class Finder
* GROUP * GROUP
* This function is used for returning group name with respect to id. * 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 * @param $custom type array/null
* *
* @return type string * @return type string
@@ -62,7 +62,7 @@ class Finder
* STATUS TYPE * STATUS TYPE
* This function is used for returning status type name with respect to id. * 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 * @param $custom type array/null
* *
* @return type string * @return type string
@@ -82,7 +82,7 @@ class Finder
* STATUS * STATUS
* This function is used for returning status name with respect to id. * 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 * @param $custom type array/null
* *
* @return type string * @return type string

18
app/Http/Controllers/Admin/helpdesk/SettingsController.php
View File

@@ -63,7 +63,7 @@ class SettingsController extends Controller
/** /**
* @param int $id * @param int $id
* @param $compant instance of company table * @param $compant instance of company table
* *
* get the form for company setting page * get the form for company setting page
* *
@@ -118,7 +118,7 @@ class SettingsController extends Controller
/** /**
* function to delete system logo. * function to delete system logo.
* *
* @return type string * @return type string
*/ */
public function deleteLogo() public function deleteLogo()
{ {
@@ -583,7 +583,7 @@ class SettingsController extends Controller
/** /**
* Generate Api key. * Generate Api key.
* *
* @return type json * @return type json
*/ */
public function generateApiKey() public function generateApiKey()
{ {
@@ -604,7 +604,7 @@ class SettingsController extends Controller
/** /**
* @param int $id * @param int $id
* @param $compant instance of company table * @param $compant instance of company table
* *
* get the form for company setting page * get the form for company setting page
* *
@@ -624,7 +624,7 @@ class SettingsController extends Controller
/** /**
* @param int $id * @param int $id
* @param $compant instance of company table * @param $compant instance of company table
* *
* get the form for company setting page * get the form for company setting page
* *
@@ -644,7 +644,7 @@ class SettingsController extends Controller
/** /**
* @param int $id * @param int $id
* @param $compant instance of company table * @param $compant instance of company table
* *
* get the form for company setting page * get the form for company setting page
* *
@@ -780,7 +780,7 @@ class SettingsController extends Controller
/** /**
* To display the list of ratings in the system. * To display the list of ratings in the system.
* *
* @return type View * @return type View
*/ */
public function RatingSettings() public function RatingSettings()
{ {
@@ -814,7 +814,7 @@ class SettingsController extends Controller
/** /**
* To store rating data. * To store rating data.
* *
* @return type Redirect * @return type Redirect
*/ */
public function PostRatingSettings($id, Rating $ratings, RatingUpdateRequest $request) public function PostRatingSettings($id, Rating $ratings, RatingUpdateRequest $request)
{ {
@@ -875,7 +875,7 @@ class SettingsController extends Controller
/** /**
* To delete a type of rating. * To delete a type of rating.
* *
* @return type Redirect * @return type Redirect
*/ */
public function RatingDelete($slug, \App\Model\helpdesk\Ratings\RatingRef $ratingrefs) public function RatingDelete($slug, \App\Model\helpdesk\Ratings\RatingRef $ratingrefs)
{ {

16
app/Http/Controllers/Admin/helpdesk/SettingsController2.php
View File

@@ -98,7 +98,7 @@ class SettingsController2 extends Controller
/** /**
* @param int $id * @param int $id
* @param $compant instance of company table * @param $compant instance of company table
* *
* get the form for company setting page * get the form for company setting page
* *
@@ -118,7 +118,7 @@ class SettingsController2 extends Controller
/** /**
* @param int $id * @param int $id
* @param $compant instance of company table * @param $compant instance of company table
* *
* get the form for company setting page * get the form for company setting page
* *
@@ -189,7 +189,7 @@ class SettingsController2 extends Controller
/** /**
* @param int $id * @param int $id
* @param $compant instance of company table * @param $compant instance of company table
* *
* get the form for company setting page * get the form for company setting page
* *
@@ -244,7 +244,7 @@ class SettingsController2 extends Controller
/** /**
* function to delete system logo. * function to delete system logo.
* *
* @return type string * @return type string
*/ */
public function deleteLogo() public function deleteLogo()
{ {
@@ -684,7 +684,7 @@ class SettingsController2 extends Controller
/** /**
* To display the list of ratings in the system. * To display the list of ratings in the system.
* *
* @return type View * @return type View
*/ */
public function RatingSettings() public function RatingSettings()
{ {
@@ -696,7 +696,7 @@ class SettingsController2 extends Controller
/** /**
* To store rating data. * To store rating data.
* *
* @return type Redirect * @return type Redirect
*/ */
public function PostRatingSettings($slug) public function PostRatingSettings($slug)
{ {
@@ -721,7 +721,7 @@ class SettingsController2 extends Controller
/** /**
* To delete a type of rating. * To delete a type of rating.
* *
* @return type Redirect * @return type Redirect
*/ */
public function RatingDelete($slug) public function RatingDelete($slug)
{ {
@@ -733,7 +733,7 @@ class SettingsController2 extends Controller
/** /**
* Generate Api key. * Generate Api key.
* *
* @return type json * @return type json
*/ */
public function generateApiKey() public function generateApiKey()
{ {

4
app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php
View File

@@ -315,9 +315,9 @@ class FilterControllerOld extends Controller
/** /**
*@category function to format and return user tickets *@category function to format and return user tickets
* *
*@param string $segment * @param string $segment
* *
*@return builder * @return builder
*/ */
public function formatUserTickets($segment) public function formatUserTickets($segment)
{ {

8
app/Http/Controllers/Agent/helpdesk/NotificationController.php
View File

@@ -72,7 +72,7 @@ class NotificationController extends Controller
* *
* @param company * @param company
* *
* @return mail * @return mail
* */ * */
public function send_notification_to_admin($company) public function send_notification_to_admin($company)
{ {
@@ -102,7 +102,7 @@ class NotificationController extends Controller
/** /**
* Department Manager Notification/Report. * Department Manager Notification/Report.
* *
* @return mail * @return mail
* */ * */
public function send_notification_to_manager($company) public function send_notification_to_manager($company)
{ {
@@ -138,7 +138,7 @@ class NotificationController extends Controller
/** /**
* Team Lead Notification/Report. * Team Lead Notification/Report.
* *
* @return mail * @return mail
* */ * */
public function send_notification_to_team_lead($company) public function send_notification_to_team_lead($company)
{ {
@@ -174,7 +174,7 @@ class NotificationController extends Controller
/** /**
* Agent Notification/Report. * Agent Notification/Report.
* *
* @return mail * @return mail
* */ * */
public function send_notification_to_agent($company) public function send_notification_to_agent($company)
{ {

4
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -2321,7 +2321,7 @@ class TicketController extends Controller
* *
*@param null *@param null
* *
*@return string //script to load tooltip data * @return string //script to load tooltip data
*/ */
public static function tooltip($ticketid) public static function tooltip($ticketid)
{ {
@@ -2672,7 +2672,7 @@ class TicketController extends Controller
* *
*@param srting array $t_id, $p_id *@param srting array $t_id, $p_id
* *
*@return null * @return null
*/ */
public function sendMergeNotification($p_id, $t_id) public function sendMergeNotification($p_id, $t_id)
{ {

4
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -58,8 +58,8 @@ class ForgotPasswordController extends Controller
$password_reset_table = DB::table('password_resets')->where('email', '=', $user->email)->first(); $password_reset_table = DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) { 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 = DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code; // $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]); // $password_reset_table->update(['token' => $code]);
} else { } else {
$create_password_reset = DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); $create_password_reset = DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
} }

4
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -63,8 +63,8 @@ class PasswordController extends Controller
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first(); $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) { 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 = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code; // $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]); // $password_reset_table->update(['token' => $code]);
} else { } else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);
} }

4
app/Http/Controllers/Client/helpdesk/GuestController.php
View File

@@ -125,9 +125,9 @@ class GuestController extends Controller
/** /**
*@category fucntion to check if mobile number is unqique or not *@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) public function checkMobile($mobile)
{ {

8
app/Http/Controllers/Client/helpdesk/UnAuthController.php
View File

@@ -327,9 +327,9 @@ class UnAuthController extends Controller
/** /**
*@category function to change system's language *@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) public static function changeLanguage($lang)
{ {
@@ -344,8 +344,8 @@ class UnAuthController extends Controller
// app()->setLocale($lang); // app()->setLocale($lang);
\Cache::forever('language', $lang); \Cache::forever('language', $lang);
// dd(Cache::get('language')); // dd(Cache::get('language'));
// dd() // dd()
} else { } else {
return false; return false;
} }

2
app/Http/Controllers/Common/PhpMailController.php
View File

@@ -17,7 +17,7 @@ use Mail;
class PhpMailController extends Controller class PhpMailController extends Controller
{ {
/** /**
*@var variable to instantiate common mailer class * @var variable to instantiate common mailer class
*/ */
public function __construct() public function __construct()
{ {

6
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@@ -11,9 +11,9 @@ class RedirectIfAuthenticated
/** /**
* Handle an incoming request. * Handle an incoming request.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
* @param string|null ...$guards * @param string|null ...$guards
* *
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
*/ */

4
app/Http/Requests/helpdesk/AgentRequest.php
View File

@@ -53,11 +53,11 @@ class AgentRequest extends Request
/** /**
*@category Funcion to set rule if send opt is enabled *@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 *@author manish.verma@ladybirdweb.com
* *
*@return array|int * @return array|int
*/ */
public function check($settings) public function check($settings)
{ {

4
app/Http/Requests/helpdesk/ClientRequest.php
View File

@@ -119,11 +119,11 @@ class ClientRequest extends Request
/** /**
*@category Funcion to set rule if send opt is enabled *@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 *@author manish.verma@ladybirdweb.com
* *
*@return array|int * @return array|int
*/ */
public function check($settings) public function check($settings)
{ {

6
app/Http/Requests/helpdesk/CreateTicketRequest.php
View File

@@ -58,11 +58,11 @@ class CreateTicketRequest extends Request
/** /**
*@category Funcion to set rule if send opt is enabled *@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 *@author manish.verma@ladybirdweb.com
* *
*@return array|int * @return array|int
*/ */
public function check($settings) public function check($settings)
{ {
@@ -102,7 +102,7 @@ class CreateTicketRequest extends Request
* *
*@param null *@param null
* *
*@return array * @return array
*/ */
public function onlyMobleRequired() public function onlyMobleRequired()
{ {

2
app/Http/Requests/helpdesk/ProfileRequest.php
View File

@@ -38,7 +38,7 @@ class ProfileRequest extends Request
/** /**
*Check the mobile number is unique or not. *Check the mobile number is unique or not.
* *
*@return string * @return string
*/ */
public function checkMobile() public function checkMobile()
{ {

4
app/Http/Requests/helpdesk/RegisterRequest.php
View File

@@ -45,11 +45,11 @@ class RegisterRequest extends Request
/** /**
*@category Funcion to set rule if send opt is enabled *@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 *@author manish.verma@ladybirdweb.com
* *
*@return array|int * @return array|int
*/ */
public function check($settings) public function check($settings)
{ {

6
app/Http/Requests/helpdesk/Sys_userRequest.php
View File

@@ -45,11 +45,11 @@ class Sys_userRequest extends Request
/** /**
*@category Funcion to set rule if send opt is enabled *@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 *@author manish.verma@ladybirdweb.com
* *
*@return array|int * @return array|int
*/ */
public function check($settings) public function check($settings)
{ {
@@ -83,7 +83,7 @@ class Sys_userRequest extends Request
* *
*@param null *@param null
* *
*@return array * @return array
*/ */
public function onlyMobleRequired() public function onlyMobleRequired()
{ {

40
tests/Unit/TicketControllerTest.php
View File

@@ -5,7 +5,6 @@ namespace Tests\Unit;
use App\Model\helpdesk\Ticket\Ticket_Thread; use App\Model\helpdesk\Ticket\Ticket_Thread;
use App\Model\helpdesk\Ticket\Tickets; use App\Model\helpdesk\Ticket\Tickets;
use App\User; use App\User;
use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Lang; use Illuminate\Support\Facades\Lang;
@@ -14,6 +13,7 @@ use Tests\TestCase;
class TicketControllerTest extends TestCase class TicketControllerTest extends TestCase
{ {
use DatabaseTransactions; use DatabaseTransactions;
/** /**
* A basic unit test example. * A basic unit test example.
* *
@@ -25,26 +25,26 @@ class TicketControllerTest extends TestCase
$password = Hash::make($str); $password = Hash::make($str);
$user = new User([ $user = new User([
'first_name' => 'a', 'first_name' => 'a',
'last_name' => 'noor', 'last_name' => 'noor',
'email' => 'naveen12@gmail.com', 'email' => 'naveen12@gmail.com',
'user_name' => 'noor', 'user_name' => 'noor',
'password' => $password, 'password' => $password,
'active' => 1, 'active' => 1,
'role' => 'user', 'role' => 'user',
]); ]);
$user->save(); $user->save();
// Authenticate as the created user // Authenticate as the created user
$this->actingAs($user); $this->actingAs($user);
$ticket = new Tickets( $ticket = new Tickets(
[ [
'ticket_number' => 'AAAA-0000-0001', 'ticket_number' => 'AAAA-0000-0001',
'user_id' => $user->id, 'user_id' => $user->id,
'priority_id' => 2, 'priority_id' => 2,
'sla' => 2, 'sla' => 2,
'help_topic_id' => 1, 'help_topic_id' => 1,
'status' => 1, 'status' => 1,
'source' => 1 'source' => 1,
] ]
); );
$ticket->save(); $ticket->save();
@@ -54,21 +54,20 @@ class TicketControllerTest extends TestCase
$ticket_thread = new Ticket_Thread( $ticket_thread = new Ticket_Thread(
[ [
'ticket_id' => $ticket->id, 'ticket_id' => $ticket->id,
'user_id' => $user->id, 'user_id' => $user->id,
'poster' => 'client', 'poster' => 'client',
'title' => 'TestCase', 'title' => 'TestCase',
'body' => 'Testing', 'body' => 'Testing',
] ]
); );
$ticket_thread->save(); $ticket_thread->save();
$mytickets = $this->get(route('ticket2')); $mytickets = $this->get(route('ticket2'));
$mytickets->assertStatus(200); $mytickets->assertStatus(200);
$response = $this->post(route('select_all'), [ $response = $this->post(route('select_all'), [
'select_all' => [$ticket->id], 'select_all' => [$ticket->id],
'submit' => 'Open', 'submit' => 'Open',
]); ]);
// Assert that the response status code indicates success // 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->assertSessionHas('success', Lang::get('lang.tickets_have_been_opened'));
$response = $this->post(route('select_all'), [ $response = $this->post(route('select_all'), [
'select_all' => [$ticket->id], 'select_all' => [$ticket->id],
'submit' => 'Close', 'submit' => 'Close',
]); ]);
$response->assertStatus(302); // Adjust this as needed $response->assertStatus(302); // Adjust this as needed
$this->assertEquals(3, $ticket->fresh()->status); // Adjust this as needed $this->assertEquals(3, $ticket->fresh()->status); // Adjust this as needed
$response->assertSessionHas('success', Lang::get('lang.tickets_have_been_closed')); $response->assertSessionHas('success', Lang::get('lang.tickets_have_been_closed'));
} }
} }