Skip to content

A free open source IT asset/license management system

Apply pint to Observers and Policy directories

snipeb2c0a2123097
diff --git a/app/Observers/AccessoryObserver.php b/app/Observers/AccessoryObserver.php
index 0f8b2492cd..41142128ce 100644
--- a/app/Observers/AccessoryObserver.php
+++ b/app/Observers/AccessoryObserver.php
@@ -4,19 +4,17 @@ namespace App\Observers;
use App\Models\Accessory;
use App\Models\Actionlog;
-use Illuminate\Support\Facades\Auth;
class AccessoryObserver
{
/**
* Listen to the User created event.
*
- * @param Accessory $accessory
* @return void
*/
public function updated(Accessory $accessory)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Accessory::class;
$logAction->item_id = $accessory->id;
$logAction->created_at = date('Y-m-d H:i:s');
@@ -28,17 +26,16 @@ class AccessoryObserver
* Listen to the Accessory created event when
* a new accessory is created.
*
- * @param Accessory $accessory
* @return void
*/
public function created(Accessory $accessory)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Accessory::class;
$logAction->item_id = $accessory->id;
$logAction->created_at = date('Y-m-d H:i:s');
$logAction->created_by = auth()->id();
- if($accessory->imported) {
+ if ($accessory->imported) {
$logAction->setActionSource('importer');
}
$logAction->logaction('create');
@@ -47,12 +44,11 @@ class AccessoryObserver
/**
* Listen to the Accessory deleting event.
*
- * @param Accessory $accessory
* @return void
*/
public function deleting(Accessory $accessory)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Accessory::class;
$logAction->item_id = $accessory->id;
$logAction->created_at = date('Y-m-d H:i:s');
diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php
index adb9292dc1..8672c43cb2 100644
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -5,7 +5,6 @@ namespace App\Observers;
use App\Models\Actionlog;
use App\Models\Asset;
use App\Models\Setting;
-use Illuminate\Support\Facades\Auth;
use Carbon\Carbon;
class AssetObserver
@@ -13,7 +12,6 @@ class AssetObserver
/**
* Listen to the Asset updating event. This fires automatically every time an existing asset is saved.
*
- * @param Asset $asset
* @return void
*/
public function updating(Asset $asset)
@@ -24,17 +22,16 @@ class AssetObserver
$same_checkin_counter = false;
$restoring_or_deleting = false;
-
// This is a gross hack to prevent the double logging when restoring an asset
- if (array_key_exists('deleted_at', $attributes) && array_key_exists('deleted_at', $attributesOriginal)){
+ if (array_key_exists('deleted_at', $attributes) && array_key_exists('deleted_at', $attributesOriginal)) {
$restoring_or_deleting = (($attributes['deleted_at'] != $attributesOriginal['deleted_at']));
}
- if (array_key_exists('checkout_counter', $attributes) && array_key_exists('checkout_counter', $attributesOriginal)){
+ if (array_key_exists('checkout_counter', $attributes) && array_key_exists('checkout_counter', $attributesOriginal)) {
$same_checkout_counter = (($attributes['checkout_counter'] == $attributesOriginal['checkout_counter']));
}
- if (array_key_exists('checkin_counter', $attributes) && array_key_exists('checkin_counter', $attributesOriginal)){
+ if (array_key_exists('checkin_counter', $attributes) && array_key_exists('checkin_counter', $attributesOriginal)) {
$same_checkin_counter = (($attributes['checkin_counter'] == $attributesOriginal['checkin_counter']));
}
@@ -43,9 +40,8 @@ class AssetObserver
if (array_key_exists('assigned_to', $attributes) && array_key_exists('assigned_to', $attributesOriginal)
&& ($attributes['assigned_to'] == $attributesOriginal['assigned_to'])
&& ($same_checkout_counter) && ($same_checkin_counter)
- && ((isset( $attributes['next_audit_date']) ? $attributes['next_audit_date'] : null) == (isset($attributesOriginal['next_audit_date']) ? $attributesOriginal['next_audit_date']: null))
- && ($attributes['last_checkout'] == $attributesOriginal['last_checkout']) && (!$restoring_or_deleting))
- {
+ && ((isset($attributes['next_audit_date']) ? $attributes['next_audit_date'] : null) == (isset($attributesOriginal['next_audit_date']) ? $attributesOriginal['next_audit_date'] : null))
+ && ($attributes['last_checkout'] == $attributesOriginal['last_checkout']) && (! $restoring_or_deleting)) {
$changed = [];
foreach ($asset->getRawOriginal() as $key => $value) {
@@ -53,13 +49,13 @@ class AssetObserver
$changed[$key]['old'] = $asset->getRawOriginal()[$key];
$changed[$key]['new'] = $asset->getAttributes()[$key];
}
- }
+ }
- if (empty($changed)){
- return;
- }
+ if (empty($changed)) {
+ return;
+ }
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Asset::class;
$logAction->item_id = $asset->id;
$logAction->action_date = date('Y-m-d H:i:s');
@@ -75,18 +71,17 @@ class AssetObserver
* the next_auto_tag_base value in the settings table when i
* a new asset is created.
*
- * @param Asset $asset
* @return void
*/
public function created(Asset $asset)
{
if ($settings = Setting::getSettings()) {
$tag = $asset->asset_tag;
- $prefix = (string)($settings->auto_increment_prefix ?? '');
+ $prefix = (string) ($settings->auto_increment_prefix ?? '');
$number = substr($tag, strlen($prefix));
// IF - auto_increment_assets is on, AND (there is no prefix OR the prefix matches the start of the tag)
// AND the rest of the string after the prefix is all digits, THEN...
- if ($settings->auto_increment_assets && ($prefix=='' || strpos($tag, $prefix) === 0) && preg_match('/\d+/',$number) === 1) {
+ if ($settings->auto_increment_assets && ($prefix == '' || strpos($tag, $prefix) === 0) && preg_match('/\d+/', $number) === 1) {
// new way of auto-trueing-up auto_increment ID's
$next_asset_tag = intval($number, 10) + 1;
// we had to use 'intval' because the $number could be '01234' and
@@ -106,13 +101,13 @@ class AssetObserver
}
}
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Asset::class; // can we instead say $logAction->item = $asset ?
$logAction->item_id = $asset->id;
$logAction->action_date = date('Y-m-d H:i:s');
$logAction->created_at = date('Y-m-d H:i:s');
$logAction->created_by = auth()->id();
- if($asset->imported) {
+ if ($asset->imported) {
$logAction->setActionSource('importer');
}
$logAction->logaction('create');
@@ -121,12 +116,11 @@ class AssetObserver
/**
* Listen to the Asset deleting event.
*
- * @param Asset $asset
* @return void
*/
public function deleting(Asset $asset)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Asset::class;
$logAction->item_id = $asset->id;
$logAction->created_at = date('Y-m-d H:i:s');
@@ -138,12 +132,11 @@ class AssetObserver
/**
* Listen to the Asset deleting event.
*
- * @param Asset $asset
* @return void
*/
public function restoring(Asset $asset)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Asset::class;
$logAction->item_id = $asset->id;
$logAction->action_date = date('Y-m-d H:i:s');
@@ -168,25 +161,25 @@ class AssetObserver
public function saving(Asset $asset)
{
// determine if calculated eol and then calculate it - this should only happen on a new asset
- if (is_null($asset->asset_eol_date) && !is_null($asset->purchase_date) && ($asset->model?->eol > 0)) {
+ if (is_null($asset->asset_eol_date) && ! is_null($asset->purchase_date) && ($asset->model?->eol > 0)) {
$asset->asset_eol_date = $asset->purchase_date->addMonths($asset->model->eol)->format('Y-m-d');
- $asset->eol_explicit = false;
- }
+ $asset->eol_explicit = false;
+ }
- // determine if explicit and set eol_explicit to true
- if (!is_null($asset->asset_eol_date) && !is_null($asset->purchase_date)) {
- if ($asset->model?->eol > 0) {
+ // determine if explicit and set eol_explicit to true
+ if (! is_null($asset->asset_eol_date) && ! is_null($asset->purchase_date)) {
+ if ($asset->model?->eol > 0) {
$months = (int) Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date, true);
- if($months != $asset->model->eol) {
+ if ($months != $asset->model->eol) {
$asset->eol_explicit = true;
}
}
- } elseif (!is_null($asset->asset_eol_date) && is_null($asset->purchase_date)) {
- $asset->eol_explicit = true;
- }
+ } elseif (! is_null($asset->asset_eol_date) && is_null($asset->purchase_date)) {
+ $asset->eol_explicit = true;
+ }
- if ((!is_null($asset->asset_eol_date)) && (!is_null($asset->purchase_date)) && (is_null($asset->model?->eol) || ($asset->model?->eol == 0))) {
- $asset->eol_explicit = true;
- }
+ if ((! is_null($asset->asset_eol_date)) && (! is_null($asset->purchase_date)) && (is_null($asset->model?->eol) || ($asset->model?->eol == 0))) {
+ $asset->eol_explicit = true;
+ }
}
}
diff --git a/app/Observers/ComponentObserver.php b/app/Observers/ComponentObserver.php
index dfc5091b3d..cf9db6723e 100644
--- a/app/Observers/ComponentObserver.php
+++ b/app/Observers/ComponentObserver.php
@@ -4,25 +4,23 @@ namespace App\Observers;
use App\Models\Actionlog;
use App\Models\Component;
-use Illuminate\Support\Facades\Auth;
class ComponentObserver
{
/**
* Listen to the User created event.
*
- * @param Component $component
* @return void
*/
public function updated(Component $component)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Component::class;
$logAction->item_id = $component->id;
$logAction->created_at = date('Y-m-d H:i:s');
$logAction->action_date = date('Y-m-d H:i:s');
$logAction->created_by = auth()->id();
- if($component->imported) {
+ if ($component->imported) {
$logAction->setActionSource('importer');
}
$logAction->logaction('update');
@@ -32,18 +30,17 @@ class ComponentObserver
* Listen to the Component created event when
* a new component is created.
*
- * @param Component $component
* @return void
*/
public function created(Component $component)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Component::class;
$logAction->item_id = $component->id;
$logAction->created_at = date('Y-m-d H:i:s');
$logAction->action_date = date('Y-m-d H:i:s');
$logAction->created_by = auth()->id();
- if($component->imported) {
+ if ($component->imported) {
$logAction->setActionSource('importer');
}
$logAction->logaction('create');
@@ -52,12 +49,11 @@ class ComponentObserver
/**
* Listen to the Component deleting event.
*
- * @param Component $component
* @return void
*/
public function deleting(Component $component)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Component::class;
$logAction->item_id = $component->id;
$logAction->created_at = date('Y-m-d H:i:s');
diff --git a/app/Observers/ConsumableObserver.php b/app/Observers/ConsumableObserver.php
index 57471cee9c..6e944c8fac 100644
--- a/app/Observers/ConsumableObserver.php
+++ b/app/Observers/ConsumableObserver.php
@@ -4,7 +4,6 @@ namespace App\Observers;
use App\Models\Actionlog;
use App\Models\Consumable;
-use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
@@ -13,14 +12,13 @@ class ConsumableObserver
/**
* Listen to the User created event.
*
- * @param Consumable $consumable
* @return void
*/
public function updated(Consumable $consumable)
{
$changed = [];
-
+
foreach ($consumable->getRawOriginal() as $key => $value) {
// Check and see if the value changed
if ($consumable->getRawOriginal()[$key] != $consumable->getAttributes()[$key]) {
@@ -30,7 +28,7 @@ class ConsumableObserver
}
if (count($changed) > 0) {
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Consumable::class;
$logAction->item_id = $consumable->id;
$logAction->created_at = date('Y-m-d H:i:s');
@@ -44,17 +42,16 @@ class ConsumableObserver
* Listen to the Consumable created event when
* a new consumable is created.
*
- * @param Consumable $consumable
* @return void
*/
public function created(Consumable $consumable)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Consumable::class;
$logAction->item_id = $consumable->id;
$logAction->created_at = date('Y-m-d H:i:s');
$logAction->created_by = auth()->id();
- if($consumable->imported) {
+ if ($consumable->imported) {
$logAction->setActionSource('importer');
}
$logAction->logaction('create');
@@ -63,7 +60,6 @@ class ConsumableObserver
/**
* Listen to the Consumable deleting event.
*
- * @param Consumable $consumable
* @return void
*/
public function deleting(Consumable $consumable)
@@ -81,8 +77,6 @@ class ConsumableObserver
}
}
-
-
try {
Storage::disk('public')->delete('consumables/'.$consumable->image);
} catch (\Exception $e) {
@@ -92,9 +86,7 @@ class ConsumableObserver
$consumable->image = null;
$consumable->save();
-
-
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Consumable::class;
$logAction->item_id = $consumable->id;
$logAction->created_at = date('Y-m-d H:i:s');
diff --git a/app/Observers/LicenseObserver.php b/app/Observers/LicenseObserver.php
index 4e355bf639..3276f91dec 100644
--- a/app/Observers/LicenseObserver.php
+++ b/app/Observers/LicenseObserver.php
@@ -4,19 +4,17 @@ namespace App\Observers;
use App\Models\Actionlog;
use App\Models\License;
-use Illuminate\Support\Facades\Auth;
class LicenseObserver
{
/**
* Listen to the User created event.
*
- * @param License $license
* @return void
*/
public function updated(License $license)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = License::class;
$logAction->item_id = $license->id;
$logAction->created_at = date('Y-m-d H:i:s');
@@ -28,17 +26,16 @@ class LicenseObserver
* Listen to the License created event when
* a new license is created.
*
- * @param License $license
* @return void
*/
public function created(License $license)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = License::class;
$logAction->item_id = $license->id;
$logAction->created_at = date('Y-m-d H:i:s');
$logAction->created_by = auth()->id();
- if($license->imported) {
+ if ($license->imported) {
$logAction->setActionSource('importer');
}
$logAction->logaction('create');
@@ -47,12 +44,11 @@ class LicenseObserver
/**
* Listen to the License deleting event.
*
- * @param License $license
* @return void
*/
public function deleting(License $license)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = License::class;
$logAction->item_id = $license->id;
$logAction->created_at = date('Y-m-d H:i:s');
diff --git a/app/Observers/LocationObserver.php b/app/Observers/LocationObserver.php
index a8ce4b5c82..384d71a117 100644
--- a/app/Observers/LocationObserver.php
+++ b/app/Observers/LocationObserver.php
@@ -10,7 +10,6 @@ class LocationObserver
/**
* Listen to the User created event.
*
- * @param Location $location
* @return void
*/
public function updating(Location $location)
@@ -27,7 +26,7 @@ class LocationObserver
}
if (count($changed) > 0) {
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Location::class;
$logAction->item_id = $location->id;
$logAction->created_at = date('Y-m-d H:i:s');
@@ -42,17 +41,16 @@ class LocationObserver
* Listen to the Location created event when
* a new location is created.
*
- * @param Location $location
* @return void
*/
public function created(Location $location)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Location::class;
$logAction->item_id = $location->id;
$logAction->created_at = date('Y-m-d H:i:s');
$logAction->created_by = auth()->id();
- if($location->imported) {
+ if ($location->imported) {
$logAction->setActionSource('importer');
}
$logAction->logaction('create');
@@ -61,12 +59,11 @@ class LocationObserver
/**
* Listen to the Location deleting event.
*
- * @param Location $location
* @return void
*/
public function deleting(Location $location)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Location::class;
$logAction->item_id = $location->id;
$logAction->created_at = date('Y-m-d H:i:s');
@@ -76,7 +73,7 @@ class LocationObserver
public function restoring(Location $location)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Location::class;
$logAction->item_id = $location->id;
$logAction->created_at = date('Y-m-d H:i:s');
diff --git a/app/Observers/MaintenanceObserver.php b/app/Observers/MaintenanceObserver.php
index 7e59d1dbc0..47462d10cd 100644
--- a/app/Observers/MaintenanceObserver.php
+++ b/app/Observers/MaintenanceObserver.php
@@ -3,20 +3,19 @@
namespace App\Observers;
use App\Models\Actionlog;
-use App\Models\Maintenance;
use App\Models\Asset;
+use App\Models\Maintenance;
class MaintenanceObserver
{
/**
* Listen to the User created event.
*
- * @param Maintenance $maintenance
* @return void
*/
public function updated(Maintenance $maintenance)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Maintenance::class;
$logAction->item_id = $maintenance->id;
$logAction->target_type = Asset::class;
@@ -24,7 +23,7 @@ class MaintenanceObserver
$logAction->created_at = date('Y-m-d H:i:s');
$logAction->action_date = date('Y-m-d H:i:s');
$logAction->created_by = auth()->id();
- if($maintenance->imported) {
+ if ($maintenance->imported) {
$logAction->setActionSource('importer');
}
$logAction->logaction('update');
@@ -34,12 +33,11 @@ class MaintenanceObserver
* Listen to the Component created event when
* a new component is created.
*
- * @param Maintenance $maintenance
* @return void
*/
public function created(Maintenance $maintenance)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Maintenance::class;
$logAction->item_id = $maintenance->id;
$logAction->target_type = Asset::class;
@@ -47,7 +45,7 @@ class MaintenanceObserver
$logAction->created_at = date('Y-m-d H:i:s');
$logAction->action_date = date('Y-m-d H:i:s');
$logAction->created_by = auth()->id();
- if($maintenance->imported) {
+ if ($maintenance->imported) {
$logAction->setActionSource('importer');
}
$logAction->logaction('create');
@@ -56,12 +54,11 @@ class MaintenanceObserver
/**
* Listen to the Component deleting event.
*
- * @param Maintenance $maintenance
* @return void
*/
public function deleting(Maintenance $maintenance)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = Maintenance::class;
$logAction->item_id = $maintenance->id;
$logAction->target_type = Asset::class;
diff --git a/app/Observers/SettingObserver.php b/app/Observers/SettingObserver.php
index ec9dec3f23..562444447f 100644
--- a/app/Observers/SettingObserver.php
+++ b/app/Observers/SettingObserver.php
@@ -10,7 +10,6 @@ class SettingObserver
/**
* Listen to the Setting saved event.
*
- * @param Setting $setting
*
* @return void
*/
diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
index cead5c8081..e4f108c8ff 100644
--- a/app/Observers/UserObserver.php
+++ b/app/Observers/UserObserver.php
@@ -4,14 +4,12 @@ namespace App\Observers;
use App\Models\Actionlog;
use App\Models\User;
-use Illuminate\Support\Facades\Auth;
class UserObserver
{
/**
* Listen to the User updating event. This fires automatically every time an existing asset is saved.
*
- * @param User $user
* @return void
*/
public function updating(User $user)
@@ -50,9 +48,9 @@ class UserObserver
'autoassign_licenses',
'vip',
'password',
- 'permissions'
+ 'permissions',
];
-
+
$changed = [];
foreach ($user->getRawOriginal() as $key => $value) {
@@ -78,7 +76,7 @@ class UserObserver
}
if (count($changed) > 0) {
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = User::class;
$logAction->item_id = $user->id;
$logAction->target_type = User::class; // can we instead say $logAction->item = $asset ?
@@ -89,7 +87,6 @@ class UserObserver
$logAction->logaction('update');
}
-
}
/**
@@ -97,12 +94,11 @@ class UserObserver
* the next_auto_tag_base value in the settings table when i
* a new asset is created.
*
- * @param User $user
* @return void
*/
public function created(User $user)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = User::class; // can we instead say $logAction->item = $asset ?
$logAction->item_id = $user->id;
$logAction->created_at = date('Y-m-d H:i:s');
@@ -113,12 +109,11 @@ class UserObserver
/**
* Listen to the User deleting event.
*
- * @param User $user
* @return void
*/
public function deleting(User $user)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = User::class;
$logAction->item_id = $user->id;
$logAction->target_type = User::class; // can we instead say $logAction->item = $asset ?
@@ -131,12 +126,11 @@ class UserObserver
/**
* Listen to the User deleting event.
*
- * @param User $user
* @return void
*/
public function restoring(User $user)
{
- $logAction = new Actionlog();
+ $logAction = new Actionlog;
$logAction->item_type = User::class;
$logAction->item_id = $user->id;
$logAction->target_type = User::class; // can we instead say $logAction->item = $asset ?
@@ -145,6 +139,4 @@ class UserObserver
$logAction->created_by = auth()->id();
$logAction->logaction('restore');
}
-
-
}
diff --git a/app/Policies/AssetPolicy.php b/app/Policies/AssetPolicy.php
index 6a15f5c77e..bdb7b72508 100644
--- a/app/Policies/AssetPolicy.php
+++ b/app/Policies/AssetPolicy.php
@@ -2,8 +2,8 @@
namespace App\Policies;
-use App\Models\User;
use App\Models\Asset;
+use App\Models\User;
class AssetPolicy extends CheckoutablePermissionsPolicy
{
@@ -12,12 +12,12 @@ class AssetPolicy extends CheckoutablePermissionsPolicy
return 'assets';
}
- public function viewRequestable(User $user, Asset $asset = null)
+ public function viewRequestable(User $user, ?Asset $asset = null)
{
return $user->hasAccess('assets.view.requestable');
}
- public function audit(User $user, Asset $asset = null)
+ public function audit(User $user, ?Asset $asset = null)
{
return $user->hasAccess('assets.audit');
}
diff --git a/app/Policies/CompanyPolicy.php b/app/Policies/CompanyPolicy.php
index 948d6c86c2..78d1b831b4 100644
--- a/app/Policies/CompanyPolicy.php
+++ b/app/Policies/CompanyPolicy.php
@@ -8,5 +8,4 @@ class CompanyPolicy extends SnipePermissionsPolicy
{
return 'companies';
}
-
}
diff --git a/app/Policies/LicensePolicy.php b/app/Policies/LicensePolicy.php
index 38f5700ad1..e7e3b14ec7 100644
--- a/app/Policies/LicensePolicy.php
+++ b/app/Policies/LicensePolicy.php
@@ -23,11 +23,10 @@ class LicensePolicy extends CheckoutablePermissionsPolicy
* see/edit that product key.
*
* @see https://github.com/grokability/snipe-it/issues/6956
- * @param \App\Models\User $user
- * @param \App\Models\License $license
+ *
* @return mixed
*/
- public function viewKeys(User $user, License $license = null)
+ public function viewKeys(User $user, ?License $license = null)
{
if ($user->hasAccess('licenses.keys') || $user->hasAccess('licenses.create') || $user->hasAccess('licenses.edit')) {
return true;
@@ -39,14 +38,14 @@ class LicensePolicy extends CheckoutablePermissionsPolicy
/**
* Determine whether the user can access files associated with licenses.
*
- * @param \App\Models\User $user
* @return mixed
*/
public function files(User $user, $license = null)
{
- if ($user->hasAccess('licenses.files')) {
+ if ($user->hasAccess('licenses.files')) {
return true;
}
+
return false;
}
diff --git a/app/Policies/SnipePermissionsPolicy.php b/app/Policies/SnipePermissionsPolicy.php
index 48ac074030..eab440b3c8 100644
--- a/app/Policies/SnipePermissionsPolicy.php
+++ b/app/Policies/SnipePermissionsPolicy.php
@@ -48,7 +48,6 @@ abstract class SnipePermissionsPolicy
*
* @see https://snipe-it.readme.io/docs/permissions
*/
-
if ($user->hasAccess('admin')) {
return true;
}
@@ -58,26 +57,23 @@ abstract class SnipePermissionsPolicy
* via $this→authorize('something', Model::class) then calling Company:: isCurrentUserHasAccess($item) gets weird.
* Bail out here by returning "nothing" and allow the relevant method lower in this class to be called and handle authorization.
*/
- if (!$item instanceof Model){
+ if (! $item instanceof Model) {
return;
}
-
/**
* The Company::isCurrentUserHasAccess() method from the company model handles the check for FMCS already so we
* don't have to do that here.
*/
- if (!Company::isCurrentUserHasAccess($item)) {
+ if (! Company::isCurrentUserHasAccess($item)) {
return false;
}
}
-
/**
* These methods handle the generic view/create/edit/delete permissions for the model.
*
- * @param User $user
* @return bool
*/
public function index(User $user)
@@ -88,7 +84,6 @@ abstract class SnipePermissionsPolicy
/**
* Determine whether the user can view the model.
*
- * @param \App\Models\User $user
* @return mixed
*/
public function view(User $user, $item = null)
@@ -104,7 +99,6 @@ abstract class SnipePermissionsPolicy
/**
* Determine whether the user can create model.
*
- * @param \App\Models\User $user
* @return mixed
*/
public function create(User $user)
@@ -115,7 +109,6 @@ abstract class SnipePermissionsPolicy
/**
* Determine whether the user can update the model.
*
- * @param \App\Models\User $user
* @return mixed
*/
public function update(User $user, $item = null)
@@ -123,11 +116,9 @@ abstract class SnipePermissionsPolicy
return $user->hasAccess($this->columnName().'.edit');
}
-
/**
* Determine whether the user can update the model.
*
- * @param \App\Models\User $user
* @return mixed
*/
public function checkout(User $user, $item = null)
@@ -138,7 +129,6 @@ abstract class SnipePermissionsPolicy
/**
* Determine whether the user can delete the model.
*
- * @param \App\Models\User $user
* @return mixed
*/
public function delete(User $user, $item = null)
@@ -154,7 +144,6 @@ abstract class SnipePermissionsPolicy
/**
* Determine whether the user can manage the model.
*
- * @param \App\Models\User $user
* @return mixed
*/
public function manage(User $user, $item = null)