lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Shift bindings

Browse source 
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
This commit is contained in:
Laravel Shift 2021-06-10 20:16:56 +00:00
parent 934afa036f
commit 802dc9240d
40 changed files with 181 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/Console/Commands/FixDoubleEscape.php
View file

@ -38,21 +38,21 @@ class FixDoubleEscape extends Command
public function handle() public function handle()
{ {
$tables = [ $tables = [
'\App\Models\Asset' => ['name'], \App\Models\Asset::class => ['name'],
'\App\Models\License' => ['name'], \App\Models\License::class => ['name'],
'\App\Models\Consumable' => ['name'], \App\Models\Consumable::class => ['name'],
'\App\Models\Accessory' => ['name'], \App\Models\Accessory::class => ['name'],
'\App\Models\Component' => ['name'], \App\Models\Component::class => ['name'],
'\App\Models\Company' => ['name'], \App\Models\Company::class => ['name'],
'\App\Models\Manufacturer' => ['name'], \App\Models\Manufacturer::class => ['name'],
'\App\Models\Supplier' => ['name'], \App\Models\Supplier::class => ['name'],
'\App\Models\Statuslabel' => ['name'], \App\Models\Statuslabel::class => ['name'],
'\App\Models\Depreciation' => ['name'], \App\Models\Depreciation::class => ['name'],
'\App\Models\AssetModel' => ['name'], \App\Models\AssetModel::class => ['name'],
'\App\Models\Group' => ['name'], \App\Models\Group::class => ['name'],
'\App\Models\Department' => ['name'], \App\Models\Department::class => ['name'],
'\App\Models\Location' => ['name'], \App\Models\Location::class => ['name'],
'\App\Models\User' => ['first_name', 'last_name'], \App\Models\User::class => ['first_name', 'last_name'],
]; ];
$count = []; $count = [];

6
app/Console/Commands/FixMismatchedAssetsAndLogs.php
View file

@ -56,19 +56,19 @@ class FixMismatchedAssetsAndLogs extends Command
$mismatch_count = 0; $mismatch_count = 0;
$assets = Asset::whereNotNull('assigned_to') $assets = Asset::whereNotNull('assigned_to')
->where('assigned_type', '=', 'App\\Models\\User') ->where('assigned_type', '=', \App\Models\User::class)
->orderBy('id', 'ASC')->get(); ->orderBy('id', 'ASC')->get();
foreach ($assets as $asset) { foreach ($assets as $asset) {
// get the last checkout of the asset // get the last checkout of the asset
if ($checkout_log = Actionlog::where('target_type', '=', 'App\\Models\\User') if ($checkout_log = Actionlog::where('target_type', '=', \App\Models\User::class)
->where('action_type', '=', 'checkout') ->where('action_type', '=', 'checkout')
->where('item_id', '=', $asset->id) ->where('item_id', '=', $asset->id)
->orderBy('created_at', 'DESC') ->orderBy('created_at', 'DESC')
->first()) { ->first()) {
// Now check for a subsequent checkin log - we want to ignore those // Now check for a subsequent checkin log - we want to ignore those
if (! $checkin_log = Actionlog::where('target_type', '=', 'App\\Models\\User') if (! $checkin_log = Actionlog::where('target_type', '=', \App\Models\User::class)
->where('action_type', '=', 'checkin from') ->where('action_type', '=', 'checkin from')
->where('item_id', '=', $asset->id) ->where('item_id', '=', $asset->id)
->whereDate('created_at', '>', $checkout_log->created_at) ->whereDate('created_at', '>', $checkout_log->created_at)

6
app/Console/Commands/SyncAssetLocations.php
View file

@ -57,7 +57,7 @@ class SyncAssetLocations extends Command
$bar->advance(); $bar->advance();
} }
$assigned_user_assets = Asset::where('assigned_type', 'App\Models\User')->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); $assigned_user_assets = Asset::where('assigned_type', \App\Models\User::class)->whereNotNull('assigned_to')->whereNull('deleted_at')->get();
$output['info'][] = 'There are '.$assigned_user_assets->count().' assets checked out to users.'; $output['info'][] = 'There are '.$assigned_user_assets->count().' assets checked out to users.';
foreach ($assigned_user_assets as $assigned_user_asset) { foreach ($assigned_user_assets as $assigned_user_asset) {
if (($assigned_user_asset->assignedTo) && ($assigned_user_asset->assignedTo->userLoc)) { if (($assigned_user_asset->assignedTo) && ($assigned_user_asset->assignedTo->userLoc)) {
@ -73,7 +73,7 @@ class SyncAssetLocations extends Command
$bar->advance(); $bar->advance();
} }
$assigned_location_assets = Asset::where('assigned_type', 'App\Models\Location') $assigned_location_assets = Asset::where('assigned_type', \App\Models\Location::class)
->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); ->whereNotNull('assigned_to')->whereNull('deleted_at')->get();
$output['info'][] = 'There are '.$assigned_location_assets->count().' assets checked out to locations.'; $output['info'][] = 'There are '.$assigned_location_assets->count().' assets checked out to locations.';
@ -90,7 +90,7 @@ class SyncAssetLocations extends Command
} }
// Assigned to assets // Assigned to assets
$assigned_asset_assets = Asset::where('assigned_type', 'App\Models\Asset') $assigned_asset_assets = Asset::where('assigned_type', \App\Models\Asset::class)
->whereNotNull('assigned_to')->whereNull('deleted_at')->get(); ->whereNotNull('assigned_to')->whereNull('deleted_at')->get();
$output['info'][] = 'Asset-assigned assets: '.$assigned_asset_assets->count(); $output['info'][] = 'Asset-assigned assets: '.$assigned_asset_assets->count();

2
app/Http/Controllers/Api/AssetsController.php
View file

@ -577,7 +577,7 @@ class AssetsController extends Controller
} elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) { } elseif (($request->filled('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
$location = $target->location_id; $location = $target->location_id;
Asset::where('assigned_type', '\\App\\Models\\Asset')->where('assigned_to', $id) Asset::where('assigned_type', \App\Models\Asset::class)->where('assigned_to', $id)
->update(['location_id' => $target->location_id]); ->update(['location_id' => $target->location_id]);
} elseif (($request->filled('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) { } elseif (($request->filled('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
$location = $target->id; $location = $target->id;

2
app/Http/Controllers/ReportsController.php
View file

@ -914,7 +914,7 @@ class ReportsController extends Controller
$assetsForReport = $acceptances $assetsForReport = $acceptances
->filter(function ($acceptance) { ->filter(function ($acceptance) {
return $acceptance->checkoutable_type == 'App\Models\Asset'; return $acceptance->checkoutable_type == \App\Models\Asset::class;
}) })
->map(function ($acceptance) { ->map(function ($acceptance) {
return $acceptance->checkoutable; return $acceptance->checkoutable;

2
app/Http/Controllers/Users/BulkUsersController.php
View file

@ -166,7 +166,7 @@ class BulkUsersController extends Controller
} }
$users = User::whereIn('id', $user_raw_array)->get(); $users = User::whereIn('id', $user_raw_array)->get();
$assets = Asset::whereIn('assigned_to', $user_raw_array)->where('assigned_type', 'App\Models\User')->get(); $assets = Asset::whereIn('assigned_to', $user_raw_array)->where('assigned_type', \App\Models\User::class)->get();
$accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get(); $accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get();
$licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get(); $licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get();

4
app/Http/Controllers/Users/UsersController.php
View file

@ -125,7 +125,7 @@ class UsersController extends Controller
$user->permissions = json_encode($permissions_array); $user->permissions = json_encode($permissions_array);
// we have to invoke the // we have to invoke the
app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar'); app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'image', 'avatars', 'avatar');
if ($user->save()) { if ($user->save()) {
if ($request->filled('groups')) { if ($request->filled('groups')) {
@ -289,7 +289,7 @@ class UsersController extends Controller
$user->permissions = json_encode($permissions_array); $user->permissions = json_encode($permissions_array);
// Handle uploaded avatar // Handle uploaded avatar
app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar'); app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
//\Log::debug(print_r($user, true)); //\Log::debug(print_r($user, true));

4
app/Listeners/CheckoutableListener.php
View file

@ -200,12 +200,12 @@ class CheckoutableListener
public function subscribe($events) public function subscribe($events)
{ {
$events->listen( $events->listen(
'App\Events\CheckoutableCheckedIn', \App\Events\CheckoutableCheckedIn::class,
'App\Listeners\CheckoutableListener@onCheckedIn' 'App\Listeners\CheckoutableListener@onCheckedIn'
); );
$events->listen( $events->listen(
'App\Events\CheckoutableCheckedOut', \App\Events\CheckoutableCheckedOut::class,
'App\Listeners\CheckoutableListener@onCheckedOut' 'App\Listeners\CheckoutableListener@onCheckedOut'
); );
} }

18
app/Models/Accessory.php
View file

@ -16,7 +16,7 @@ use Watson\Validating\ValidatingTrait;
*/ */
class Accessory extends SnipeModel class Accessory extends SnipeModel
{ {
protected $presenter = 'App\Presenters\AccessoryPresenter'; protected $presenter = \App\Presenters\AccessoryPresenter::class;
use CompanyableTrait; use CompanyableTrait;
use Loggable, Presentable; use Loggable, Presentable;
use SoftDeletes; use SoftDeletes;
@ -102,7 +102,7 @@ class Accessory extends SnipeModel
*/ */
public function supplier() public function supplier()
{ {
return $this->belongsTo('\App\Models\Supplier', 'supplier_id'); return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
} }
/** /**
@ -130,7 +130,7 @@ class Accessory extends SnipeModel
*/ */
public function company() public function company()
{ {
return $this->belongsTo('\App\Models\Company', 'company_id'); return $this->belongsTo(\App\Models\Company::class, 'company_id');
} }
/** /**
@ -142,7 +142,7 @@ class Accessory extends SnipeModel
*/ */
public function location() public function location()
{ {
return $this->belongsTo('\App\Models\Location', 'location_id'); return $this->belongsTo(\App\Models\Location::class, 'location_id');
} }
/** /**
@ -154,7 +154,7 @@ class Accessory extends SnipeModel
*/ */
public function category() public function category()
{ {
return $this->belongsTo('\App\Models\Category', 'category_id')->where('category_type', '=', 'accessory'); return $this->belongsTo(\App\Models\Category::class, 'category_id')->where('category_type', '=', 'accessory');
} }
/** /**
@ -166,7 +166,7 @@ class Accessory extends SnipeModel
*/ */
public function assetlog() public function assetlog()
{ {
return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); return $this->hasMany(\App\Models\Actionlog::class, 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed();
} }
/** /**
@ -228,7 +228,7 @@ class Accessory extends SnipeModel
*/ */
public function users() public function users()
{ {
return $this->belongsToMany('\App\Models\User', 'accessories_users', 'accessory_id', 'assigned_to')->withPivot('id', 'created_at', 'note')->withTrashed(); return $this->belongsToMany(\App\Models\User::class, 'accessories_users', 'accessory_id', 'assigned_to')->withPivot('id', 'created_at', 'note')->withTrashed();
} }
/** /**
@ -240,7 +240,7 @@ class Accessory extends SnipeModel
*/ */
public function hasUsers() public function hasUsers()
{ {
return $this->belongsToMany('\App\Models\User', 'accessories_users', 'accessory_id', 'assigned_to')->count(); return $this->belongsToMany(\App\Models\User::class, 'accessories_users', 'accessory_id', 'assigned_to')->count();
} }
/** /**
@ -252,7 +252,7 @@ class Accessory extends SnipeModel
*/ */
public function manufacturer() public function manufacturer()
{ {
return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id'); return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id');
} }
/** /**

6
app/Models/Actionlog.php
View file

@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Auth;
*/ */
class Actionlog extends SnipeModel class Actionlog extends SnipeModel
{ {
protected $presenter = "App\Presenters\ActionlogPresenter"; protected $presenter = \App\Presenters\ActionlogPresenter::class;
use SoftDeletes; use SoftDeletes;
use Presentable; use Presentable;
protected $dates = ['deleted_at']; protected $dates = ['deleted_at'];
@ -88,7 +88,7 @@ class Actionlog extends SnipeModel
*/ */
public function company() public function company()
{ {
return $this->hasMany('\App\Models\Company', 'id', 'company_id'); return $this->hasMany(\App\Models\Company::class, 'id', 'company_id');
} }
/** /**
@ -183,7 +183,7 @@ class Actionlog extends SnipeModel
*/ */
public function location() public function location()
{ {
return $this->belongsTo('\App\Models\Location', 'location_id')->withTrashed(); return $this->belongsTo(\App\Models\Location::class, 'location_id')->withTrashed();
} }
/** /**

34
app/Models/Asset.php
View file

@ -26,7 +26,7 @@ use Watson\Validating\ValidatingTrait;
*/ */
class Asset extends Depreciable class Asset extends Depreciable
{ {
protected $presenter = 'App\Presenters\AssetPresenter'; protected $presenter = \App\Presenters\AssetPresenter::class;
use Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait, UniqueSerialTrait; use Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait, UniqueSerialTrait;
const LOCATION = 'location'; const LOCATION = 'location';
@ -224,7 +224,7 @@ class Asset extends Depreciable
*/ */
public function company() public function company()
{ {
return $this->belongsTo('\App\Models\Company', 'company_id'); return $this->belongsTo(\App\Models\Company::class, 'company_id');
} }
/** /**
@ -304,7 +304,7 @@ class Asset extends Depreciable
if ($this->save()) { if ($this->save()) {
if (is_int($admin)) { if (is_int($admin)) {
$checkedOutBy = User::findOrFail($admin); $checkedOutBy = User::findOrFail($admin);
} elseif (get_class($admin) === 'App\Models\User') { } elseif (get_class($admin) === \App\Models\User::class) {
$checkedOutBy = $admin; $checkedOutBy = $admin;
} else { } else {
$checkedOutBy = Auth::user(); $checkedOutBy = Auth::user();
@ -358,7 +358,7 @@ class Asset extends Depreciable
*/ */
public function depreciation() public function depreciation()
{ {
return $this->model->belongsTo('\App\Models\Depreciation', 'depreciation_id'); return $this->model->belongsTo(\App\Models\Depreciation::class, 'depreciation_id');
} }
/** /**
@ -370,7 +370,7 @@ class Asset extends Depreciable
*/ */
public function components() public function components()
{ {
return $this->belongsToMany('\App\Models\Component', 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty')->withTrashed(); return $this->belongsToMany(\App\Models\Component::class, 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty')->withTrashed();
} }
/** /**
@ -398,7 +398,7 @@ class Asset extends Depreciable
*/ */
public function uploads() public function uploads()
{ {
return $this->hasMany('\App\Models\Actionlog', 'item_id') return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
->where('item_type', '=', self::class) ->where('item_type', '=', self::class)
->where('action_type', '=', 'uploaded') ->where('action_type', '=', 'uploaded')
->whereNotNull('filename') ->whereNotNull('filename')
@ -443,7 +443,7 @@ class Asset extends Depreciable
*/ */
public function assignedAssets() public function assignedAssets()
{ {
return $this->morphMany('App\Models\Asset', 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed();
} }
/** /**
@ -508,7 +508,7 @@ class Asset extends Depreciable
*/ */
public function defaultLoc() public function defaultLoc()
{ {
return $this->belongsTo('\App\Models\Location', 'rtd_location_id'); return $this->belongsTo(\App\Models\Location::class, 'rtd_location_id');
} }
/** /**
@ -541,7 +541,7 @@ class Asset extends Depreciable
*/ */
public function assetlog() public function assetlog()
{ {
return $this->hasMany('\App\Models\Actionlog', 'item_id') return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
->where('item_type', '=', self::class) ->where('item_type', '=', self::class)
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->withTrashed(); ->withTrashed();
@ -600,7 +600,7 @@ class Asset extends Depreciable
*/ */
public function assetmaintenances() public function assetmaintenances()
{ {
return $this->hasMany('\App\Models\AssetMaintenance', 'asset_id') return $this->hasMany(\App\Models\AssetMaintenance::class, 'asset_id')
->orderBy('created_at', 'desc'); ->orderBy('created_at', 'desc');
} }
@ -613,7 +613,7 @@ class Asset extends Depreciable
*/ */
public function adminuser() public function adminuser()
{ {
return $this->belongsTo('\App\Models\User', 'user_id'); return $this->belongsTo(\App\Models\User::class, 'user_id');
} }
/** /**
@ -625,7 +625,7 @@ class Asset extends Depreciable
*/ */
public function assetstatus() public function assetstatus()
{ {
return $this->belongsTo('\App\Models\Statuslabel', 'status_id'); return $this->belongsTo(\App\Models\Statuslabel::class, 'status_id');
} }
/** /**
@ -637,7 +637,7 @@ class Asset extends Depreciable
*/ */
public function model() public function model()
{ {
return $this->belongsTo('\App\Models\AssetModel', 'model_id')->withTrashed(); return $this->belongsTo(\App\Models\AssetModel::class, 'model_id')->withTrashed();
} }
/** /**
@ -670,7 +670,7 @@ class Asset extends Depreciable
*/ */
public function licenses() public function licenses()
{ {
return $this->belongsToMany('\App\Models\License', 'license_seats', 'asset_id', 'license_id'); return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'asset_id', 'license_id');
} }
/** /**
@ -682,7 +682,7 @@ class Asset extends Depreciable
*/ */
public function licenseseats() public function licenseseats()
{ {
return $this->hasMany('\App\Models\LicenseSeat', 'asset_id'); return $this->hasMany(\App\Models\LicenseSeat::class, 'asset_id');
} }
/** /**
@ -694,7 +694,7 @@ class Asset extends Depreciable
*/ */
public function supplier() public function supplier()
{ {
return $this->belongsTo('\App\Models\Supplier', 'supplier_id'); return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
} }
/** /**
@ -706,7 +706,7 @@ class Asset extends Depreciable
*/ */
public function location() public function location()
{ {
return $this->belongsTo('\App\Models\Location', 'location_id'); return $this->belongsTo(\App\Models\Location::class, 'location_id');
} }
/** /**

6
app/Models/AssetMaintenance.php
View file

@ -129,7 +129,7 @@ class AssetMaintenance extends Model implements ICompanyableChild
*/ */
public function asset() public function asset()
{ {
return $this->belongsTo('\App\Models\Asset', 'asset_id') return $this->belongsTo(\App\Models\Asset::class, 'asset_id')
->withTrashed(); ->withTrashed();
} }
@ -142,13 +142,13 @@ class AssetMaintenance extends Model implements ICompanyableChild
*/ */
public function admin() public function admin()
{ {
return $this->belongsTo('\App\Models\User', 'user_id') return $this->belongsTo(\App\Models\User::class, 'user_id')
->withTrashed(); ->withTrashed();
} }
public function supplier() public function supplier()
{ {
return $this->belongsTo('\App\Models\Supplier', 'supplier_id') return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id')
->withTrashed(); ->withTrashed();
} }

14
app/Models/AssetModel.php
View file

@ -17,7 +17,7 @@ use Watson\Validating\ValidatingTrait;
class AssetModel extends SnipeModel class AssetModel extends SnipeModel
{ {
use SoftDeletes; use SoftDeletes;
protected $presenter = 'App\Presenters\AssetModelPresenter'; protected $presenter = \App\Presenters\AssetModelPresenter::class;
use Requestable, Presentable; use Requestable, Presentable;
protected $dates = ['deleted_at']; protected $dates = ['deleted_at'];
protected $table = 'models'; protected $table = 'models';
@ -98,7 +98,7 @@ class AssetModel extends SnipeModel
*/ */
public function assets() public function assets()
{ {
return $this->hasMany('\App\Models\Asset', 'model_id'); return $this->hasMany(\App\Models\Asset::class, 'model_id');
} }
/** /**
@ -110,7 +110,7 @@ class AssetModel extends SnipeModel
*/ */
public function category() public function category()
{ {
return $this->belongsTo('\App\Models\Category', 'category_id'); return $this->belongsTo(\App\Models\Category::class, 'category_id');
} }
/** /**
@ -122,7 +122,7 @@ class AssetModel extends SnipeModel
*/ */
public function depreciation() public function depreciation()
{ {
return $this->belongsTo('\App\Models\Depreciation', 'depreciation_id'); return $this->belongsTo(\App\Models\Depreciation::class, 'depreciation_id');
} }
/** /**
@ -134,7 +134,7 @@ class AssetModel extends SnipeModel
*/ */
public function manufacturer() public function manufacturer()
{ {
return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id'); return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id');
} }
/** /**
@ -146,7 +146,7 @@ class AssetModel extends SnipeModel
*/ */
public function fieldset() public function fieldset()
{ {
return $this->belongsTo('\App\Models\CustomFieldset', 'fieldset_id'); return $this->belongsTo(\App\Models\CustomFieldset::class, 'fieldset_id');
} }
/** /**
@ -158,7 +158,7 @@ class AssetModel extends SnipeModel
*/ */
public function defaultValues() public function defaultValues()
{ {
return $this->belongsToMany('\App\Models\CustomField', 'models_custom_fields')->withPivot('default_value'); return $this->belongsToMany(\App\Models\CustomField::class, 'models_custom_fields')->withPivot('default_value');
} }
/** /**

14
app/Models/Category.php
View file

@ -19,7 +19,7 @@ use Watson\Validating\ValidatingTrait;
*/ */
class Category extends SnipeModel class Category extends SnipeModel
{ {
protected $presenter = 'App\Presenters\CategoryPresenter'; protected $presenter = \App\Presenters\CategoryPresenter::class;
use Presentable; use Presentable;
use SoftDeletes; use SoftDeletes;
protected $dates = ['deleted_at']; protected $dates = ['deleted_at'];
@ -105,7 +105,7 @@ class Category extends SnipeModel
*/ */
public function accessories() public function accessories()
{ {
return $this->hasMany('\App\Models\Accessory'); return $this->hasMany(\App\Models\Accessory::class);
} }
/** /**
@ -117,7 +117,7 @@ class Category extends SnipeModel
*/ */
public function licenses() public function licenses()
{ {
return $this->hasMany('\App\Models\License'); return $this->hasMany(\App\Models\License::class);
} }
/** /**
@ -129,7 +129,7 @@ class Category extends SnipeModel
*/ */
public function consumables() public function consumables()
{ {
return $this->hasMany('\App\Models\Consumable'); return $this->hasMany(\App\Models\Consumable::class);
} }
/** /**
@ -141,7 +141,7 @@ class Category extends SnipeModel
*/ */
public function components() public function components()
{ {
return $this->hasMany('\App\Models\Component'); return $this->hasMany(\App\Models\Component::class);
} }
/** /**
@ -178,7 +178,7 @@ class Category extends SnipeModel
*/ */
public function assets() public function assets()
{ {
return $this->hasManyThrough('\App\Models\Asset', '\App\Models\AssetModel', 'category_id', 'model_id'); return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'category_id', 'model_id');
} }
/** /**
@ -190,7 +190,7 @@ class Category extends SnipeModel
*/ */
public function models() public function models()
{ {
return $this->hasMany('\App\Models\AssetModel', 'category_id'); return $this->hasMany(\App\Models\AssetModel::class, 'category_id');
} }
/** /**

2
app/Models/Company.php
View file

@ -23,7 +23,7 @@ final class Company extends SnipeModel
'name' => 'required|min:1|max:255|unique:companies,name', 'name' => 'required|min:1|max:255|unique:companies,name',
]; ];
protected $presenter = 'App\Presenters\CompanyPresenter'; protected $presenter = \App\Presenters\CompanyPresenter::class;
use Presentable; use Presentable;
/** /**

14
app/Models/Component.php
View file

@ -14,7 +14,7 @@ use Watson\Validating\ValidatingTrait;
*/ */
class Component extends SnipeModel class Component extends SnipeModel
{ {
protected $presenter = 'App\Presenters\ComponentPresenter'; protected $presenter = \App\Presenters\ComponentPresenter::class;
use CompanyableTrait; use CompanyableTrait;
use Loggable, Presentable; use Loggable, Presentable;
use SoftDeletes; use SoftDeletes;
@ -92,7 +92,7 @@ class Component extends SnipeModel
*/ */
public function location() public function location()
{ {
return $this->belongsTo('\App\Models\Location', 'location_id'); return $this->belongsTo(\App\Models\Location::class, 'location_id');
} }
/** /**
@ -104,7 +104,7 @@ class Component extends SnipeModel
*/ */
public function assets() public function assets()
{ {
return $this->belongsToMany('\App\Models\Asset', 'components_assets')->withPivot('id', 'assigned_qty', 'created_at', 'user_id'); return $this->belongsToMany(\App\Models\Asset::class, 'components_assets')->withPivot('id', 'assigned_qty', 'created_at', 'user_id');
} }
/** /**
@ -118,7 +118,7 @@ class Component extends SnipeModel
*/ */
public function admin() public function admin()
{ {
return $this->belongsTo('\App\Models\User', 'user_id'); return $this->belongsTo(\App\Models\User::class, 'user_id');
} }
/** /**
@ -130,7 +130,7 @@ class Component extends SnipeModel
*/ */
public function company() public function company()
{ {
return $this->belongsTo('\App\Models\Company', 'company_id'); return $this->belongsTo(\App\Models\Company::class, 'company_id');
} }
/** /**
@ -142,7 +142,7 @@ class Component extends SnipeModel
*/ */
public function category() public function category()
{ {
return $this->belongsTo('\App\Models\Category', 'category_id'); return $this->belongsTo(\App\Models\Category::class, 'category_id');
} }
/** /**
@ -154,7 +154,7 @@ class Component extends SnipeModel
*/ */
public function assetlog() public function assetlog()
{ {
return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); return $this->hasMany(\App\Models\Actionlog::class, 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed();
} }
/** /**

18
app/Models/Consumable.php
View file

@ -11,7 +11,7 @@ use Watson\Validating\ValidatingTrait;
class Consumable extends SnipeModel class Consumable extends SnipeModel
{ {
protected $presenter = 'App\Presenters\ConsumablePresenter'; protected $presenter = \App\Presenters\ConsumablePresenter::class;
use CompanyableTrait; use CompanyableTrait;
use Loggable, Presentable; use Loggable, Presentable;
use SoftDeletes; use SoftDeletes;
@ -121,7 +121,7 @@ class Consumable extends SnipeModel
*/ */
public function admin() public function admin()
{ {
return $this->belongsTo('\App\Models\User', 'user_id'); return $this->belongsTo(\App\Models\User::class, 'user_id');
} }
/** /**
@ -133,7 +133,7 @@ class Consumable extends SnipeModel
*/ */
public function consumableAssignments() public function consumableAssignments()
{ {
return $this->hasMany('\App\Models\ConsumableAssignment'); return $this->hasMany(\App\Models\ConsumableAssignment::class);
} }
/** /**
@ -145,7 +145,7 @@ class Consumable extends SnipeModel
*/ */
public function company() public function company()
{ {
return $this->belongsTo('\App\Models\Company', 'company_id'); return $this->belongsTo(\App\Models\Company::class, 'company_id');
} }
/** /**
@ -157,7 +157,7 @@ class Consumable extends SnipeModel
*/ */
public function manufacturer() public function manufacturer()
{ {
return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id'); return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id');
} }
/** /**
@ -169,7 +169,7 @@ class Consumable extends SnipeModel
*/ */
public function location() public function location()
{ {
return $this->belongsTo('\App\Models\Location', 'location_id'); return $this->belongsTo(\App\Models\Location::class, 'location_id');
} }
/** /**
@ -181,7 +181,7 @@ class Consumable extends SnipeModel
*/ */
public function category() public function category()
{ {
return $this->belongsTo('\App\Models\Category', 'category_id'); return $this->belongsTo(\App\Models\Category::class, 'category_id');
} }
/** /**
@ -193,7 +193,7 @@ class Consumable extends SnipeModel
*/ */
public function assetlog() public function assetlog()
{ {
return $this->hasMany('\App\Models\Actionlog', 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed(); return $this->hasMany(\App\Models\Actionlog::class, 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed();
} }
/** /**
@ -221,7 +221,7 @@ class Consumable extends SnipeModel
*/ */
public function users() public function users()
{ {
return $this->belongsToMany('\App\Models\User', 'consumables_users', 'consumable_id', 'assigned_to')->withPivot('user_id')->withTrashed()->withTimestamps(); return $this->belongsToMany(\App\Models\User::class, 'consumables_users', 'consumable_id', 'assigned_to')->withPivot('user_id')->withTrashed()->withTimestamps();
} }
/** /**

6
app/Models/ConsumableAssignment.php
View file

@ -13,16 +13,16 @@ class ConsumableAssignment extends Model
public function consumable() public function consumable()
{ {
return $this->belongsTo('\App\Models\Consumable'); return $this->belongsTo(\App\Models\Consumable::class);
} }
public function user() public function user()
{ {
return $this->belongsTo('\App\Models\User', 'assigned_to'); return $this->belongsTo(\App\Models\User::class, 'assigned_to');
} }
public function admin() public function admin()
{ {
return $this->belongsTo('\App\Models\User', 'user_id'); return $this->belongsTo(\App\Models\User::class, 'user_id');
} }
} }

6
app/Models/CustomField.php
View file

@ -167,7 +167,7 @@ class CustomField extends Model
*/ */
public function fieldset() public function fieldset()
{ {
return $this->belongsToMany('\App\Models\CustomFieldset'); return $this->belongsToMany(\App\Models\CustomFieldset::class);
} }
/** /**
@ -179,7 +179,7 @@ class CustomField extends Model
*/ */
public function user() public function user()
{ {
return $this->belongsTo('\App\Models\User'); return $this->belongsTo(\App\Models\User::class);
} }
/** /**
@ -191,7 +191,7 @@ class CustomField extends Model
*/ */
public function defaultValues() public function defaultValues()
{ {
return $this->belongsToMany('\App\Models\AssetModel', 'models_custom_fields')->withPivot('default_value'); return $this->belongsToMany(\App\Models\AssetModel::class, 'models_custom_fields')->withPivot('default_value');
} }
/** /**

6
app/Models/CustomFieldset.php
View file

@ -38,7 +38,7 @@ class CustomFieldset extends Model
*/ */
public function fields() public function fields()
{ {
return $this->belongsToMany('\App\Models\CustomField')->withPivot(['required', 'order'])->orderBy('pivot_order'); return $this->belongsToMany(\App\Models\CustomField::class)->withPivot(['required', 'order'])->orderBy('pivot_order');
} }
/** /**
@ -50,7 +50,7 @@ class CustomFieldset extends Model
*/ */
public function models() public function models()
{ {
return $this->hasMany('\App\Models\AssetModel', 'fieldset_id'); return $this->hasMany(\App\Models\AssetModel::class, 'fieldset_id');
} }
/** /**
@ -62,7 +62,7 @@ class CustomFieldset extends Model
*/ */
public function user() public function user()
{ {
return $this->belongsTo('\App\Models\User'); //WARNING - not all CustomFieldsets have a User!! return $this->belongsTo(\App\Models\User::class); //WARNING - not all CustomFieldsets have a User!!
} }
/** /**

8
app/Models/Department.php
View file

@ -71,7 +71,7 @@ class Department extends SnipeModel
*/ */
public function company() public function company()
{ {
return $this->belongsTo('\App\Models\Company', 'company_id'); return $this->belongsTo(\App\Models\Company::class, 'company_id');
} }
/** /**
@ -83,7 +83,7 @@ class Department extends SnipeModel
*/ */
public function users() public function users()
{ {
return $this->hasMany('\App\Models\User', 'department_id'); return $this->hasMany(\App\Models\User::class, 'department_id');
} }
/** /**
@ -95,7 +95,7 @@ class Department extends SnipeModel
*/ */
public function manager() public function manager()
{ {
return $this->belongsTo('\App\Models\User', 'manager_id'); return $this->belongsTo(\App\Models\User::class, 'manager_id');
} }
/** /**
@ -107,7 +107,7 @@ class Department extends SnipeModel
*/ */
public function location() public function location()
{ {
return $this->belongsTo('\App\Models\Location', 'location_id'); return $this->belongsTo(\App\Models\Location::class, 'location_id');
} }
/** /**

2
app/Models/Depreciable.php
View file

@ -25,7 +25,7 @@ class Depreciable extends SnipeModel
public function depreciation() public function depreciation()
{ {
return $this->belongsTo('\App\Models\Depreciation', 'depreciation_id'); return $this->belongsTo(\App\Models\Depreciation::class, 'depreciation_id');
} }
public function get_depreciation() public function get_depreciation()

6
app/Models/Depreciation.php
View file

@ -8,7 +8,7 @@ use Watson\Validating\ValidatingTrait;
class Depreciation extends SnipeModel class Depreciation extends SnipeModel
{ {
protected $presenter = 'App\Presenters\DepreciationPresenter'; protected $presenter = \App\Presenters\DepreciationPresenter::class;
use Presentable; use Presentable;
// Declare the rules for the form validation // Declare the rules for the form validation
protected $rules = [ protected $rules = [
@ -58,7 +58,7 @@ class Depreciation extends SnipeModel
*/ */
public function models() public function models()
{ {
return $this->hasMany('\App\Models\AssetModel', 'depreciation_id'); return $this->hasMany(\App\Models\AssetModel::class, 'depreciation_id');
} }
/** /**
@ -70,6 +70,6 @@ class Depreciation extends SnipeModel
*/ */
public function licenses() public function licenses()
{ {
return $this->hasMany('\App\Models\License', 'depreciation_id'); return $this->hasMany(\App\Models\License::class, 'depreciation_id');
} }
} }

2
app/Models/Group.php
View file

@ -47,7 +47,7 @@ class Group extends SnipeModel
*/ */
public function users() public function users()
{ {
return $this->belongsToMany('\App\Models\User', 'users_groups'); return $this->belongsToMany(\App\Models\User::class, 'users_groups');
} }
/** /**

22
app/Models/License.php
View file

@ -13,7 +13,7 @@ use Watson\Validating\ValidatingTrait;
class License extends Depreciable class License extends Depreciable
{ {
protected $presenter = 'App\Presenters\LicensePresenter'; protected $presenter = \App\Presenters\LicensePresenter::class;
use SoftDeletes; use SoftDeletes;
use CompanyableTrait; use CompanyableTrait;
@ -264,7 +264,7 @@ class License extends Depreciable
*/ */
public function company() public function company()
{ {
return $this->belongsTo('\App\Models\Company', 'company_id'); return $this->belongsTo(\App\Models\Company::class, 'company_id');
} }
/** /**
@ -276,7 +276,7 @@ class License extends Depreciable
*/ */
public function category() public function category()
{ {
return $this->belongsTo('\App\Models\Category', 'category_id'); return $this->belongsTo(\App\Models\Category::class, 'category_id');
} }
/** /**
@ -288,7 +288,7 @@ class License extends Depreciable
*/ */
public function manufacturer() public function manufacturer()
{ {
return $this->belongsTo('\App\Models\Manufacturer', 'manufacturer_id'); return $this->belongsTo(\App\Models\Manufacturer::class, 'manufacturer_id');
} }
/** /**
@ -345,7 +345,7 @@ class License extends Depreciable
*/ */
public function assignedusers() public function assignedusers()
{ {
return $this->belongsToMany('\App\Models\User', 'license_seats', 'assigned_to', 'license_id'); return $this->belongsToMany(\App\Models\User::class, 'license_seats', 'assigned_to', 'license_id');
} }
/** /**
@ -357,7 +357,7 @@ class License extends Depreciable
*/ */
public function assetlog() public function assetlog()
{ {
return $this->hasMany('\App\Models\Actionlog', 'item_id') return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
->where('item_type', '=', self::class) ->where('item_type', '=', self::class)
->orderBy('created_at', 'desc'); ->orderBy('created_at', 'desc');
} }
@ -371,7 +371,7 @@ class License extends Depreciable
*/ */
public function uploads() public function uploads()
{ {
return $this->hasMany('\App\Models\Actionlog', 'item_id') return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
->where('item_type', '=', self::class) ->where('item_type', '=', self::class)
->where('action_type', '=', 'uploaded') ->where('action_type', '=', 'uploaded')
->whereNotNull('filename') ->whereNotNull('filename')
@ -387,7 +387,7 @@ class License extends Depreciable
*/ */
public function adminuser() public function adminuser()
{ {
return $this->belongsTo('\App\Models\User', 'user_id'); return $this->belongsTo(\App\Models\User::class, 'user_id');
} }
/** /**
@ -570,7 +570,7 @@ class License extends Depreciable
*/ */
public function licenseseats() public function licenseseats()
{ {
return $this->hasMany('\App\Models\LicenseSeat'); return $this->hasMany(\App\Models\LicenseSeat::class);
} }
/** /**
@ -582,7 +582,7 @@ class License extends Depreciable
*/ */
public function supplier() public function supplier()
{ {
return $this->belongsTo('\App\Models\Supplier', 'supplier_id'); return $this->belongsTo(\App\Models\Supplier::class, 'supplier_id');
} }
/** /**
@ -614,7 +614,7 @@ class License extends Depreciable
*/ */
public function freeSeats() public function freeSeats()
{ {
return $this->hasMany('\App\Models\LicenseSeat')->whereNull('assigned_to')->whereNull('deleted_at')->whereNull('asset_id'); return $this->hasMany(\App\Models\LicenseSeat::class)->whereNull('assigned_to')->whereNull('deleted_at')->whereNull('asset_id');
} }
/** /**

8
app/Models/LicenseSeat.php
View file

@ -14,7 +14,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
use SoftDeletes; use SoftDeletes;
use Loggable; use Loggable;
protected $presenter = 'App\Presenters\LicenseSeatPresenter'; protected $presenter = \App\Presenters\LicenseSeatPresenter::class;
use Presentable; use Presentable;
protected $dates = ['deleted_at']; protected $dates = ['deleted_at'];
@ -64,7 +64,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
*/ */
public function license() public function license()
{ {
return $this->belongsTo('\App\Models\License', 'license_id'); return $this->belongsTo(\App\Models\License::class, 'license_id');
} }
/** /**
@ -76,7 +76,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
*/ */
public function user() public function user()
{ {
return $this->belongsTo('\App\Models\User', 'assigned_to')->withTrashed(); return $this->belongsTo(\App\Models\User::class, 'assigned_to')->withTrashed();
} }
/** /**
@ -88,7 +88,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
*/ */
public function asset() public function asset()
{ {
return $this->belongsTo('\App\Models\Asset', 'asset_id')->withTrashed(); return $this->belongsTo(\App\Models\Asset::class, 'asset_id')->withTrashed();
} }
/** /**

16
app/Models/Location.php
View file

@ -16,7 +16,7 @@ use Watson\Validating\ValidatingTrait;
class Location extends SnipeModel class Location extends SnipeModel
{ {
protected $presenter = 'App\Presenters\LocationPresenter'; protected $presenter = \App\Presenters\LocationPresenter::class;
use Presentable; use Presentable;
use SoftDeletes; use SoftDeletes;
protected $dates = ['deleted_at']; protected $dates = ['deleted_at'];
@ -97,12 +97,12 @@ class Location extends SnipeModel
public function users() public function users()
{ {
return $this->hasMany('\App\Models\User', 'location_id'); return $this->hasMany(\App\Models\User::class, 'location_id');
} }
public function assets() public function assets()
{ {
return $this->hasMany('\App\Models\Asset', 'location_id') return $this->hasMany(\App\Models\Asset::class, 'location_id')
->whereHas('assetstatus', function ($query) { ->whereHas('assetstatus', function ($query) {
$query->where('status_labels.deployable', '=', 1) $query->where('status_labels.deployable', '=', 1)
->orWhere('status_labels.pending', '=', 1) ->orWhere('status_labels.pending', '=', 1)
@ -123,30 +123,30 @@ class Location extends SnipeModel
In all likelyhood, we need to denorm an "effective_location" column In all likelyhood, we need to denorm an "effective_location" column
into Assets to make this slightly less miserable. into Assets to make this slightly less miserable.
*/ */
return $this->hasMany('\App\Models\Asset', 'rtd_location_id'); return $this->hasMany(\App\Models\Asset::class, 'rtd_location_id');
} }
public function parent() public function parent()
{ {
return $this->belongsTo('\App\Models\Location', 'parent_id', 'id') return $this->belongsTo(\App\Models\Location::class, 'parent_id', 'id')
->with('parent'); ->with('parent');
} }
public function manager() public function manager()
{ {
return $this->belongsTo('\App\Models\User', 'manager_id'); return $this->belongsTo(\App\Models\User::class, 'manager_id');
} }
public function children() public function children()
{ {
return $this->hasMany('\App\Models\Location', 'parent_id') return $this->hasMany(\App\Models\Location::class, 'parent_id')
->with('children'); ->with('children');
} }
// I don't think we need this anymore since we de-normed location_id in assets? // I don't think we need this anymore since we de-normed location_id in assets?
public function assignedAssets() public function assignedAssets()
{ {
return $this->morphMany('App\Models\Asset', 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed();
} }
public function setLdapOuAttribute($ldap_ou) public function setLdapOuAttribute($ldap_ou)

12
app/Models/Manufacturer.php
View file

@ -10,7 +10,7 @@ use Watson\Validating\ValidatingTrait;
class Manufacturer extends SnipeModel class Manufacturer extends SnipeModel
{ {
protected $presenter = 'App\Presenters\ManufacturerPresenter'; protected $presenter = \App\Presenters\ManufacturerPresenter::class;
use Presentable; use Presentable;
use SoftDeletes; use SoftDeletes;
protected $dates = ['deleted_at']; protected $dates = ['deleted_at'];
@ -77,26 +77,26 @@ class Manufacturer extends SnipeModel
public function assets() public function assets()
{ {
return $this->hasManyThrough('\App\Models\Asset', '\App\Models\AssetModel', 'manufacturer_id', 'model_id'); return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'manufacturer_id', 'model_id');
} }
public function models() public function models()
{ {
return $this->hasMany('\App\Models\AssetModel', 'manufacturer_id'); return $this->hasMany(\App\Models\AssetModel::class, 'manufacturer_id');
} }
public function licenses() public function licenses()
{ {
return $this->hasMany('\App\Models\License', 'manufacturer_id'); return $this->hasMany(\App\Models\License::class, 'manufacturer_id');
} }
public function accessories() public function accessories()
{ {
return $this->hasMany('\App\Models\Accessory', 'manufacturer_id'); return $this->hasMany(\App\Models\Accessory::class, 'manufacturer_id');
} }
public function consumables() public function consumables()
{ {
return $this->hasMany('\App\Models\Consumable', 'manufacturer_id'); return $this->hasMany(\App\Models\Consumable::class, 'manufacturer_id');
} }
} }

12
app/Models/PredefinedKit.php
View file

@ -15,7 +15,7 @@ use Watson\Validating\ValidatingTrait;
*/ */
class PredefinedKit extends SnipeModel class PredefinedKit extends SnipeModel
{ {
protected $presenter = 'App\Presenters\PredefinedKitPresenter'; protected $presenter = \App\Presenters\PredefinedKitPresenter::class;
use Presentable; use Presentable;
protected $table = 'kits'; protected $table = 'kits';
@ -139,12 +139,12 @@ class PredefinedKit extends SnipeModel
*/ */
public function models() public function models()
{ {
return $this->belongsToMany('\App\Models\AssetModel', 'kits_models', 'kit_id', 'model_id')->withPivot('id', 'quantity'); return $this->belongsToMany(\App\Models\AssetModel::class, 'kits_models', 'kit_id', 'model_id')->withPivot('id', 'quantity');
} }
public function assets() public function assets()
{ {
return $this->hasManyThrough('\App\Models\Asset', '\App\Models\AssetModel', 'country_id', 'user_id'); return $this->hasManyThrough(\App\Models\Asset::class, \App\Models\AssetModel::class, 'country_id', 'user_id');
} }
/** /**
@ -153,7 +153,7 @@ class PredefinedKit extends SnipeModel
*/ */
public function licenses() public function licenses()
{ {
return $this->belongsToMany('\App\Models\License', 'kits_licenses', 'kit_id', 'license_id')->withPivot('id', 'quantity'); return $this->belongsToMany(\App\Models\License::class, 'kits_licenses', 'kit_id', 'license_id')->withPivot('id', 'quantity');
} }
/** /**
@ -162,7 +162,7 @@ class PredefinedKit extends SnipeModel
*/ */
public function consumables() public function consumables()
{ {
return $this->belongsToMany('\App\Models\Consumable', 'kits_consumables', 'kit_id', 'consumable_id')->withPivot('id', 'quantity'); return $this->belongsToMany(\App\Models\Consumable::class, 'kits_consumables', 'kit_id', 'consumable_id')->withPivot('id', 'quantity');
} }
/** /**
@ -171,7 +171,7 @@ class PredefinedKit extends SnipeModel
*/ */
public function accessories() public function accessories()
{ {
return $this->belongsToMany('\App\Models\Accessory', 'kits_accessories', 'kit_id', 'accessory_id')->withPivot('id', 'quantity'); return $this->belongsToMany(\App\Models\Accessory::class, 'kits_accessories', 'kit_id', 'accessory_id')->withPivot('id', 'quantity');
} }
/** /**

2
app/Models/Statuslabel.php
View file

@ -59,7 +59,7 @@ class Statuslabel extends SnipeModel
*/ */
public function assets() public function assets()
{ {
return $this->hasMany('\App\Models\Asset', 'status_id'); return $this->hasMany(\App\Models\Asset::class, 'status_id');
} }
/** /**

8
app/Models/Supplier.php
View file

@ -104,7 +104,7 @@ class Supplier extends SnipeModel
*/ */
public function assets() public function assets()
{ {
return $this->hasMany('\App\Models\Asset', 'supplier_id'); return $this->hasMany(\App\Models\Asset::class, 'supplier_id');
} }
/** /**
@ -116,7 +116,7 @@ class Supplier extends SnipeModel
*/ */
public function accessories() public function accessories()
{ {
return $this->hasMany('\App\Models\Accessory', 'supplier_id'); return $this->hasMany(\App\Models\Accessory::class, 'supplier_id');
} }
/** /**
@ -128,7 +128,7 @@ class Supplier extends SnipeModel
*/ */
public function asset_maintenances() public function asset_maintenances()
{ {
return $this->hasMany('\App\Models\AssetMaintenance', 'supplier_id'); return $this->hasMany(\App\Models\AssetMaintenance::class, 'supplier_id');
} }
/** /**
@ -156,7 +156,7 @@ class Supplier extends SnipeModel
*/ */
public function licenses() public function licenses()
{ {
return $this->hasMany('\App\Models\License', 'supplier_id'); return $this->hasMany(\App\Models\License::class, 'supplier_id');
} }
/** /**

32
app/Models/User.php
View file

@ -21,7 +21,7 @@ use Watson\Validating\ValidatingTrait;
class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference
{ {
protected $presenter = 'App\Presenters\UserPresenter'; protected $presenter = \App\Presenters\UserPresenter::class;
use SoftDeletes, ValidatingTrait; use SoftDeletes, ValidatingTrait;
use Authenticatable, Authorizable, CanResetPassword, HasApiTokens; use Authenticatable, Authorizable, CanResetPassword, HasApiTokens;
use UniqueUndeletedTrait; use UniqueUndeletedTrait;
@ -188,7 +188,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function company() public function company()
{ {
return $this->belongsTo('\App\Models\Company', 'company_id'); return $this->belongsTo(\App\Models\Company::class, 'company_id');
} }
/** /**
@ -200,7 +200,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function department() public function department()
{ {
return $this->belongsTo('\App\Models\Department', 'department_id'); return $this->belongsTo(\App\Models\Department::class, 'department_id');
} }
/** /**
@ -264,7 +264,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function assets() public function assets()
{ {
return $this->morphMany('App\Models\Asset', 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); return $this->morphMany(\App\Models\Asset::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed();
} }
/** /**
@ -279,7 +279,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function assetmaintenances() public function assetmaintenances()
{ {
return $this->hasMany('\App\Models\AssetMaintenance', 'user_id')->withTrashed(); return $this->hasMany(\App\Models\AssetMaintenance::class, 'user_id')->withTrashed();
} }
/** /**
@ -291,7 +291,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function accessories() public function accessories()
{ {
return $this->belongsToMany('\App\Models\Accessory', 'accessories_users', 'assigned_to', 'accessory_id') return $this->belongsToMany(\App\Models\Accessory::class, 'accessories_users', 'assigned_to', 'accessory_id')
->withPivot('id', 'created_at', 'note')->withTrashed(); ->withPivot('id', 'created_at', 'note')->withTrashed();
} }
@ -304,7 +304,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function consumables() public function consumables()
{ {
return $this->belongsToMany('\App\Models\Consumable', 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id')->withTrashed(); return $this->belongsToMany(\App\Models\Consumable::class, 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id')->withTrashed();
} }
/** /**
@ -316,7 +316,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function licenses() public function licenses()
{ {
return $this->belongsToMany('\App\Models\License', 'license_seats', 'assigned_to', 'license_id')->withPivot('id'); return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id');
} }
/** /**
@ -328,7 +328,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function userlog() public function userlog()
{ {
return $this->hasMany('\App\Models\Actionlog', 'target_id')->where('target_type', '=', 'App\Models\User')->orderBy('created_at', 'DESC')->withTrashed(); return $this->hasMany(\App\Models\Actionlog::class, 'target_id')->where('target_type', '=', \App\Models\User::class)->orderBy('created_at', 'DESC')->withTrashed();
} }
/** /**
@ -344,7 +344,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function userloc() public function userloc()
{ {
return $this->belongsTo('\App\Models\Location', 'location_id')->withTrashed(); return $this->belongsTo(\App\Models\Location::class, 'location_id')->withTrashed();
} }
/** /**
@ -356,7 +356,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function location() public function location()
{ {
return $this->belongsTo('\App\Models\Location', 'location_id')->withTrashed(); return $this->belongsTo(\App\Models\Location::class, 'location_id')->withTrashed();
} }
/** /**
@ -368,7 +368,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function manager() public function manager()
{ {
return $this->belongsTo('\App\Models\User', 'manager_id')->withTrashed(); return $this->belongsTo(\App\Models\User::class, 'manager_id')->withTrashed();
} }
/** /**
@ -380,7 +380,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function managedLocations() public function managedLocations()
{ {
return $this->hasMany('\App\Models\Location', 'manager_id'); return $this->hasMany(\App\Models\Location::class, 'manager_id');
} }
/** /**
@ -392,7 +392,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function groups() public function groups()
{ {
return $this->belongsToMany('\App\Models\Group', 'users_groups'); return $this->belongsToMany(\App\Models\Group::class, 'users_groups');
} }
/** /**
@ -404,7 +404,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function assetlog() public function assetlog()
{ {
return $this->hasMany('\App\Models\Asset', 'id')->withTrashed(); return $this->hasMany(\App\Models\Asset::class, 'id')->withTrashed();
} }
/** /**
@ -418,7 +418,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/ */
public function uploads() public function uploads()
{ {
return $this->hasMany('\App\Models\Actionlog', 'item_id') return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
->where('item_type', self::class) ->where('item_type', self::class)
->where('action_type', '=', 'uploaded') ->where('action_type', '=', 'uploaded')
->whereNotNull('filename') ->whereNotNull('filename')

4
app/Providers/EventServiceProvider.php
View file

@ -15,11 +15,11 @@ class EventServiceProvider extends ServiceProvider
*/ */
protected $listen = [ protected $listen = [
'Illuminate\Auth\Events\Login' => [ 'Illuminate\Auth\Events\Login' => [
'App\Listeners\LogSuccessfulLogin', \App\Listeners\LogSuccessfulLogin::class,
], ],
'Illuminate\Auth\Events\Failed' => [ 'Illuminate\Auth\Events\Failed' => [
'App\Listeners\LogFailedLogin', \App\Listeners\LogFailedLogin::class,
], ],
]; ];

10
database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php
View file

@ -26,20 +26,20 @@ class MigrateAssetLogToActionLog extends Migration
if (! is_null($log->asset_id)) { if (! is_null($log->asset_id)) {
$a->item_id = $log->asset_id; $a->item_id = $log->asset_id;
if ($log->asset_type == 'hardware') { if ($log->asset_type == 'hardware') {
$a->item_type = 'App\\Models\\Asset'; $a->item_type = \App\Models\Asset::class;
} else { } else {
$a->item_type = 'App\\Models\\License'; $a->item_type = \App\Models\License::class;
} }
} }
if (! is_null($log->accessory_id)) { if (! is_null($log->accessory_id)) {
$a->item_id = $log->accessory_id; $a->item_id = $log->accessory_id;
$a->item_type = 'App\\Models\\Accessory'; $a->item_type = \App\Models\Accessory::class;
} elseif (! is_null($log->consumable_id)) { } elseif (! is_null($log->consumable_id)) {
$a->item_id = $log->consumable_id; $a->item_id = $log->consumable_id;
$a->item_type = 'App\\Models\\Consumable'; $a->item_type = \App\Models\Consumable::class;
} elseif (! is_null($log->component_id)) { } elseif (! is_null($log->component_id)) {
$a->item_id = $log->component_id; $a->item_id = $log->component_id;
$a->item_type = 'App\\Models\\Component'; $a->item_type = \App\Models\Component::class;
} }
$a->action_type = $log->action_type; $a->action_type = $log->action_type;
// $a->checkout_to = $log->checkout_to; // $a->checkout_to = $log->checkout_to;

2
database/migrations/2016_11_24_160405_add_missing_target_type_to_logs_table.php
View file

@ -17,7 +17,7 @@ class AddMissingTargetTypeToLogsTable extends Migration
DB::table('action_logs')->where('target_type', null)->where(function ($query) { DB::table('action_logs')->where('target_type', null)->where(function ($query) {
$query->where('action_type', 'accepted') $query->where('action_type', 'accepted')
->orWhere('action_type', 'declined'); ->orWhere('action_type', 'declined');
})->update(['target_type'=> 'App\Models\User']); })->update(['target_type'=> \App\Models\User::class]);
} }
/** /**

2
database/migrations/2017_09_18_225619_fix_assigned_type_not_being_nulled.php
View file

@ -21,7 +21,7 @@ class FixAssignedTypeNotBeingNulled extends Migration
// Additionally, the importer did not set assigned_type when importing. // Additionally, the importer did not set assigned_type when importing.
// In the case where we have an assigned_to but not an assigned_type, set the assigned_type to User. // In the case where we have an assigned_to but not an assigned_type, set the assigned_type to User.
Asset::whereNotNull('assigned_to')->whereNull('assigned_type')->update(['assigned_type' => 'App\Models\User']); Asset::whereNotNull('assigned_to')->whereNull('assigned_type')->update(['assigned_type' => \App\Models\User::class]);
} }
/** /**

4
database/migrations/2018_09_10_082212_create_checkout_acceptances_for_unaccepted_assets.php
View file

@ -16,13 +16,13 @@ class CreateCheckoutAcceptancesForUnacceptedAssets extends Migration
public function up() public function up()
{ {
// Get all assets not accepted // Get all assets not accepted
$assets = DB::table('assets')->where('assigned_type', 'App\Models\User')->where('accepted', 'pending')->get(); $assets = DB::table('assets')->where('assigned_type', \App\Models\User::class)->where('accepted', 'pending')->get();
$acceptances = []; $acceptances = [];
foreach ($assets as $asset) { foreach ($assets as $asset) {
$acceptances[] = [ $acceptances[] = [
'checkoutable_type' => 'App\Models\Asset', 'checkoutable_type' => \App\Models\Asset::class,
'checkoutable_id' => $asset->id, 'checkoutable_id' => $asset->id,
'assigned_to_id' => $asset->assigned_to, 'assigned_to_id' => $asset->assigned_to,
]; ];

2
database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
View file

@ -43,7 +43,7 @@ class MoveAccessoryCheckoutNoteToJoinTable extends Migration
$action_log_entries = Actionlog::where('created_at', '=', $join_log->created_at) $action_log_entries = Actionlog::where('created_at', '=', $join_log->created_at)
->where('target_id', '=', $join_log->assigned_to) ->where('target_id', '=', $join_log->assigned_to)
->where('item_id', '=', $accessory->id) ->where('item_id', '=', $accessory->id)
->where('target_type', '=', 'App\\Models\\User') ->where('target_type', '=', \App\Models\User::class)
->where('action_type', '=', 'checkout') ->where('action_type', '=', 'checkout')
->orderBy('created_at', 'DESC')->get(); ->orderBy('created_at', 'DESC')->get();

6
tests/api/ApiCheckoutAssetsCest.php
View file

@ -25,7 +25,7 @@ class ApiCheckoutAssetsCest
$I->wantTo('Check out an asset to a user'); $I->wantTo('Check out an asset to a user');
//Grab an asset from the database that isn't checked out. //Grab an asset from the database that isn't checked out.
$asset = Asset::whereNull('assigned_to')->first(); $asset = Asset::whereNull('assigned_to')->first();
$targetUser = factory('App\Models\User')->create(); $targetUser = factory(\App\Models\User::class)->create();
$data = [ $data = [
'assigned_user' => $targetUser->id, 'assigned_user' => $targetUser->id,
'note' => 'This is a test checkout note', 'note' => 'This is a test checkout note',
@ -62,7 +62,7 @@ class ApiCheckoutAssetsCest
->where('model_id', 8) ->where('model_id', 8)
->where('status_id', Statuslabel::deployable()->first()->id) ->where('status_id', Statuslabel::deployable()->first()->id)
->first(); // We need to make sure that this is an asset/model that doesn't require acceptance ->first(); // We need to make sure that this is an asset/model that doesn't require acceptance
$targetAsset = factory('App\Models\Asset')->states('desktop-macpro')->create([ $targetAsset = factory(\App\Models\Asset::class)->states('desktop-macpro')->create([
'name' => 'Test Asset For Checkout to', 'name' => 'Test Asset For Checkout to',
]); ]);
$data = [ $data = [
@ -96,7 +96,7 @@ class ApiCheckoutAssetsCest
->where('model_id', 8) ->where('model_id', 8)
->where('status_id', Statuslabel::deployable()->first()->id) ->where('status_id', Statuslabel::deployable()->first()->id)
->first(); // We need to make sure that this is an asset/model that doesn't require acceptance ->first(); // We need to make sure that this is an asset/model that doesn't require acceptance
$targetLocation = factory('App\Models\Location')->create([ $targetLocation = factory(\App\Models\Location::class)->create([
'name' => 'Test Location for Checkout', 'name' => 'Test Location for Checkout',
]); ]);
$data = [ $data = [

2
tests/functional/AssetsCest.php
View file

@ -62,7 +62,7 @@ class AssetsCest
$seenValues = [ $seenValues = [
'asset_tag' => $asset->asset_tag, 'asset_tag' => $asset->asset_tag,
'assigned_to' => $userId, 'assigned_to' => $userId,
'assigned_type' => 'App\\Models\\User', 'assigned_type' => \App\Models\User::class,
'company_id' => $asset->company_id, 'company_id' => $asset->company_id,
'model_id' => $asset->model_id, 'model_id' => $asset->model_id,
'name' => $asset->name, 'name' => $asset->name,