From 9a6f1788a4a423a6b75f369d2d23b70be855fe56 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 3 Jan 2023 08:25:43 +0000 Subject: [PATCH] Convert string references to `::class` PHP 5.5.9 adds the new static `class` property which provides the fully qualified class name. This is preferred over using strings for class names since the `class` property references are checked by PHP. --- app/Console/Kernel.php | 10 +++++----- app/Model/MailJob/QueueService.php | 2 +- .../helpdesk/Agent_panel/Organization.php | 2 +- app/Model/helpdesk/Email/Emails.php | 2 +- app/Model/helpdesk/Form/Fields.php | 2 +- app/Model/helpdesk/Form/Forms.php | 4 ++-- app/Model/helpdesk/Manage/Help_topic.php | 2 +- .../helpdesk/Notification/Notification.php | 6 +++--- .../helpdesk/Notification/UserNotification.php | 4 ++-- app/Model/helpdesk/Ticket/Ticket_Thread.php | 4 ++-- app/Model/helpdesk/Ticket/Ticket_ThreadOld.php | 2 +- app/Model/helpdesk/Ticket/Tickets.php | 10 +++++----- app/Providers/ComposerServiceProvider.php | 8 ++++---- app/User.php | 4 ++-- config/app.php | 18 +++++++++--------- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index c8bde54ca..dccf2d414 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -14,11 +14,11 @@ class Kernel extends ConsoleKernel * @var array */ protected $commands = [ - 'App\Console\Commands\Inspire', - 'App\Console\Commands\SendReport', - 'App\Console\Commands\CloseWork', - 'App\Console\Commands\TicketFetch', - 'App\Console\Commands\UpdateEncryption', + \App\Console\Commands\Inspire::class, + \App\Console\Commands\SendReport::class, + \App\Console\Commands\CloseWork::class, + \App\Console\Commands\TicketFetch::class, + \App\Console\Commands\UpdateEncryption::class, \App\Console\Commands\DropTables::class, \App\Console\Commands\Install::class, \App\Console\Commands\InstallDB::class, diff --git a/app/Model/MailJob/QueueService.php b/app/Model/MailJob/QueueService.php index e00426e7d..6439ddb8b 100644 --- a/app/Model/MailJob/QueueService.php +++ b/app/Model/MailJob/QueueService.php @@ -13,7 +13,7 @@ class QueueService extends Model public function extraFieldRelation() { - $related = "App\Model\MailJob\FaveoQueue"; + $related = \App\Model\MailJob\FaveoQueue::class; return $this->hasMany($related, 'service_id'); } diff --git a/app/Model/helpdesk/Agent_panel/Organization.php b/app/Model/helpdesk/Agent_panel/Organization.php index 58c30ac41..ff34f65a8 100644 --- a/app/Model/helpdesk/Agent_panel/Organization.php +++ b/app/Model/helpdesk/Agent_panel/Organization.php @@ -15,7 +15,7 @@ class Organization extends BaseModel public function userRelation() { - $related = "App\Model\helpdesk\Agent_panel\User_org"; + $related = \App\Model\helpdesk\Agent_panel\User_org::class; return $this->hasMany($related, 'org_id'); } diff --git a/app/Model/helpdesk/Email/Emails.php b/app/Model/helpdesk/Email/Emails.php index 172374dd0..47a0b47f6 100644 --- a/app/Model/helpdesk/Email/Emails.php +++ b/app/Model/helpdesk/Email/Emails.php @@ -44,7 +44,7 @@ class Emails extends BaseModel public function extraFieldRelation() { - $related = "App\Model\MailJob\FaveoMail"; + $related = \App\Model\MailJob\FaveoMail::class; return $this->hasMany($related, 'email_id'); } diff --git a/app/Model/helpdesk/Form/Fields.php b/app/Model/helpdesk/Form/Fields.php index 279f6f05b..1f777497a 100644 --- a/app/Model/helpdesk/Form/Fields.php +++ b/app/Model/helpdesk/Form/Fields.php @@ -17,7 +17,7 @@ class Fields extends BaseModel public function valueRelation() { - $related = "App\Model\helpdesk\Form\FieldValue"; + $related = \App\Model\helpdesk\Form\FieldValue::class; return $this->hasMany($related, 'field_id'); } diff --git a/app/Model/helpdesk/Form/Forms.php b/app/Model/helpdesk/Form/Forms.php index e8d1cdb86..b0b960fbd 100644 --- a/app/Model/helpdesk/Form/Forms.php +++ b/app/Model/helpdesk/Form/Forms.php @@ -17,7 +17,7 @@ class Forms extends BaseModel public function fieldRelation() { - $related = "App\Model\helpdesk\Form\Fields"; + $related = \App\Model\helpdesk\Form\Fields::class; return $this->hasMany($related); } @@ -41,7 +41,7 @@ class Forms extends BaseModel public function formValueRelation() { - $related = "App\Model\helpdesk\Form\FieldValue"; + $related = \App\Model\helpdesk\Form\FieldValue::class; return $this->hasMany($related, 'child_id'); } diff --git a/app/Model/helpdesk/Manage/Help_topic.php b/app/Model/helpdesk/Manage/Help_topic.php index 4b2fc73fc..deeb375d5 100644 --- a/app/Model/helpdesk/Manage/Help_topic.php +++ b/app/Model/helpdesk/Manage/Help_topic.php @@ -16,7 +16,7 @@ class Help_topic extends BaseModel public function department() { - $related = 'App\Model\helpdesk\Agent\Department'; + $related = \App\Model\helpdesk\Agent\Department::class; $foreignKey = 'department'; return $this->belongsTo($related, $foreignKey); diff --git a/app/Model/helpdesk/Notification/Notification.php b/app/Model/helpdesk/Notification/Notification.php index 18ff84208..618af7f6e 100644 --- a/app/Model/helpdesk/Notification/Notification.php +++ b/app/Model/helpdesk/Notification/Notification.php @@ -15,7 +15,7 @@ class Notification extends BaseModel public function type() { - $related = 'App\Model\helpdesk\Notification\NotificationType'; + $related = \App\Model\helpdesk\Notification\NotificationType::class; $id = 'type_id'; return $this->belongsTo($related, $id); @@ -23,7 +23,7 @@ class Notification extends BaseModel public function model() { - $related = 'App\Model\helpdesk\Ticket\Tickets'; + $related = \App\Model\helpdesk\Ticket\Tickets::class; $id = 'model_id'; return $this->belongsTo($related, $id); @@ -31,7 +31,7 @@ class Notification extends BaseModel public function userNotification() { - $related = 'App\Model\helpdesk\Notification\UserNotification'; + $related = \App\Model\helpdesk\Notification\UserNotification::class; $foreignKey = 'notification_id'; return $this->hasMany($related, $foreignKey); diff --git a/app/Model/helpdesk/Notification/UserNotification.php b/app/Model/helpdesk/Notification/UserNotification.php index 1eff17f88..c109e0579 100644 --- a/app/Model/helpdesk/Notification/UserNotification.php +++ b/app/Model/helpdesk/Notification/UserNotification.php @@ -15,7 +15,7 @@ class UserNotification extends BaseModel public function notification() { - $related = 'App\Model\helpdesk\Notification\Notification'; + $related = \App\Model\helpdesk\Notification\Notification::class; $id = 'notification_id'; return $this->belongsTo($related, $id); @@ -23,7 +23,7 @@ class UserNotification extends BaseModel public function users() { - $related = 'App\User'; + $related = \App\User::class; $id = 'user_id'; return $this->belongsTo($related, $id); diff --git a/app/Model/helpdesk/Ticket/Ticket_Thread.php b/app/Model/helpdesk/Ticket/Ticket_Thread.php index 3f33b53e6..249aa878c 100644 --- a/app/Model/helpdesk/Ticket/Ticket_Thread.php +++ b/app/Model/helpdesk/Ticket/Ticket_Thread.php @@ -16,7 +16,7 @@ class Ticket_Thread extends Model public function attach() { - return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_attachments', 'thread_id'); + return $this->hasMany(\App\Model\helpdesk\Ticket\Ticket_attachments::class, 'thread_id'); } public function delete() @@ -149,7 +149,7 @@ class Ticket_Thread extends Model public function user() { - $related = 'App\User'; + $related = \App\User::class; $foreignKey = 'user_id'; return $this->belongsTo($related, $foreignKey); diff --git a/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php b/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php index 4b3aeab0d..4bddc4546 100644 --- a/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php +++ b/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php @@ -16,7 +16,7 @@ class Ticket_ThreadOld extends Model public function attach() { - return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_attachments', 'thread_id'); + return $this->hasMany(\App\Model\helpdesk\Ticket\Ticket_attachments::class, 'thread_id'); } public function delete() diff --git a/app/Model/helpdesk/Ticket/Tickets.php b/app/Model/helpdesk/Ticket/Tickets.php index b134ceb61..3e1816aba 100644 --- a/app/Model/helpdesk/Ticket/Tickets.php +++ b/app/Model/helpdesk/Ticket/Tickets.php @@ -16,17 +16,17 @@ class Tickets extends BaseModel // } public function thread() { - return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_Thread', 'ticket_id'); + return $this->hasMany(\App\Model\helpdesk\Ticket\Ticket_Thread::class, 'ticket_id'); } public function collaborator() { - return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_Collaborator', 'ticket_id'); + return $this->hasMany(\App\Model\helpdesk\Ticket\Ticket_Collaborator::class, 'ticket_id'); } public function helptopic() { - $related = 'App\Model\helpdesk\Manage\Help_topic'; + $related = \App\Model\helpdesk\Manage\Help_topic::class; $foreignKey = 'help_topic_id'; return $this->belongsTo($related, $foreignKey); @@ -34,7 +34,7 @@ class Tickets extends BaseModel public function formdata() { - return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_Form_Data', 'ticket_id'); + return $this->hasMany(\App\Model\helpdesk\Ticket\Ticket_Form_Data::class, 'ticket_id'); } public function extraFields() @@ -96,7 +96,7 @@ class Tickets extends BaseModel public function user() { - $related = "App\User"; + $related = \App\User::class; $foreignKey = 'user_id'; return $this->belongsTo($related, $foreignKey); diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 51c79dc24..33f2dad98 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -27,20 +27,20 @@ class ComposerServiceProvider extends ServiceProvider 'themes.default1.admin.helpdesk.setting', $service_desk, ], - 'App\Http\ViewComposers\AgentLayout' + \App\Http\ViewComposers\AgentLayout::class ); view()->composer( [ 'themes.default1.update.notification', ], - 'App\Http\ViewComposers\UpdateNotification' + \App\Http\ViewComposers\UpdateNotification::class ); view()->composer( [ 'themes.default1.agent.layout.agent', 'themes.default1.admin.layout.admin', ], - 'App\Http\ViewComposers\AuthUser' + \App\Http\ViewComposers\AuthUser::class ); view()->composer( [ @@ -48,7 +48,7 @@ class ComposerServiceProvider extends ServiceProvider 'themes.default1.agent.layout.agent', 'themes.default1.client.layout.client', ], - 'App\Http\ViewComposers\UserLanguage' + \App\Http\ViewComposers\UserLanguage::class ); } diff --git a/app/User.php b/app/User.php index b2df69a26..1172efc9a 100644 --- a/app/User.php +++ b/app/User.php @@ -63,7 +63,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon public function avatar() { - $related = 'App\UserAdditionalInfo'; + $related = \App\UserAdditionalInfo::class; $foreignKey = 'owner'; return $this->hasMany($related, $foreignKey)->select('value')->where('key', 'avatar')->first(); @@ -71,7 +71,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon public function getOrganizationRelation() { - $related = "App\Model\helpdesk\Agent_panel\User_org"; + $related = \App\Model\helpdesk\Agent_panel\User_org::class; $user_relation = $this->hasMany($related, 'user_id'); $relation = $user_relation->first(); if ($relation) { diff --git a/config/app.php b/config/app.php index 983fe2c6f..b8b0883f4 100644 --- a/config/app.php +++ b/config/app.php @@ -163,11 +163,11 @@ return [ /* * Application Service Providers... */ - 'App\Providers\AppServiceProvider', - 'App\Providers\EventServiceProvider', - 'App\Providers\RouteServiceProvider', - 'App\Providers\ConfigServiceProvider', - 'App\Providers\ComposerServiceProvider', + App\Providers\AppServiceProvider::class, + App\Providers\EventServiceProvider::class, + App\Providers\RouteServiceProvider::class, + App\Providers\ConfigServiceProvider::class, + App\Providers\ComposerServiceProvider::class, 'Propaganistas\LaravelPhone\LaravelPhoneServiceProvider', 'Bugsnag\BugsnagLaravel\BugsnagLaravelServiceProvider', 'Vsmoraes\Pdf\PdfServiceProvider', @@ -238,9 +238,9 @@ return [ 'Bugsnag' => 'Bugsnag\BugsnagLaravel\BugsnagFacade', 'PDF' => 'Vsmoraes\Pdf\PdfFacade', 'Gravatar' => 'Thomaswelton\LaravelGravatar\Facades\Gravatar', - 'UTC' => 'App\Http\Controllers\Agent\helpdesk\TicketController', - 'Ttable' => 'App\Http\Controllers\Agent\helpdesk\TicketController', //to use getTable function. - 'SMTPS' => 'App\Http\Controllers\HomeController', + 'UTC' => App\Http\Controllers\Agent\helpdesk\TicketController::class, + 'Ttable' => App\Http\Controllers\Agent\helpdesk\TicketController::class, //to use getTable function. + 'SMTPS' => App\Http\Controllers\HomeController::class, 'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade', 'Zipper' => 'Chumper\Zipper\Zipper', 'JWTAuth' => 'Tymon\JWTAuth\Facades\JWTAuth', @@ -253,7 +253,7 @@ return [ 'Debugbar' => Barryvdh\Debugbar\Facade::class, 'Excel' => Maatwebsite\Excel\Facades\Excel::class, 'Socialite' => Laravel\Socialite\Facades\Socialite::class, - 'UnAuth' => 'App\Http\Controllers\Client\helpdesk\UnAuthController', + 'UnAuth' => App\Http\Controllers\Client\helpdesk\UnAuthController::class, 'Finder' => App\Helper\Finder::class, 'Datatables' => Yajra\Datatables\Facades\Datatables::class, 'Notification' => Illuminate\Support\Facades\Notification::class,