A free open source IT asset/license management system
Small phpstan fixes
snipe180f95ae25ea
diff --git a/app/Http/Transformers/MaintenancesTransformer.php b/app/Http/Transformers/MaintenancesTransformer.phpindex 00c5dead99..d4203d90be 100644--- a/app/Http/Transformers/MaintenancesTransformer.php+++ b/app/Http/Transformers/MaintenancesTransformer.php@@ -147,22 +147,35 @@ class MaintenancesTransformerpublic function transformMaintenanceForReport(Maintenance $assetmaintenance){+ // Hoist chained relation values into locals so the array literal is+ // one nullsafe chain per lookup (returning scalar-or-null) rather+ // than the same chain twice inside a `X ? e(X) : null` ternary.+ // Same runtime, quiet on larastan's nullsafe.neverNull warnings.+ $asset = $assetmaintenance->asset;+ $modelName = $asset?->model?->name;+ $modelNumber = $asset?->model?->model_number;+ $statusName = $asset?->status?->display_name;+ $assignedTo = $asset?->assignedTo?->display_name;+ $companyName = $asset?->company?->name;+ $locationName = $asset?->location?->name;+ $supplierName = $assetmaintenance->supplier?->name;+$array = ['id' => (int) $assetmaintenance->id,- 'asset_name' => ($assetmaintenance->asset->name) ? e($assetmaintenance->asset->name) : null,- 'asset_tag' => ($assetmaintenance->asset->asset_tag) ? e($assetmaintenance->asset->asset_tag) : null,- 'serial' => ($assetmaintenance->asset?->serial) ? e($assetmaintenance->asset->serial) : null,+ 'asset_name' => $asset?->name ? e($asset->name) : null,+ 'asset_tag' => $asset?->asset_tag ? e($asset->asset_tag) : null,+ 'serial' => $asset?->serial ? e($asset->serial) : null,'image' => ($assetmaintenance->image != '') ? Storage::disk('public')->url('maintenances/'.e($assetmaintenance->image)) : null,- 'model' => ($assetmaintenance->asset?->model?->name) ? e($assetmaintenance->asset?->model?->name) : null,- 'model_number' => ($assetmaintenance->asset?->model?->model_number) ? e($assetmaintenance->asset?->model?->model_number) : null,- 'status_label' => ($assetmaintenance->asset?->status) ? e($assetmaintenance->asset?->status?->display_name) : null,- 'assigned_to' => ($assetmaintenance->asset?->assigned) ? e($assetmaintenance->asset?->assigned?->display_name) : null,- 'company' => ($assetmaintenance->asset?->company?->name) ? e($assetmaintenance->asset->company->name) : null,+ 'model' => $modelName ? e($modelName) : null,+ 'model_number' => $modelNumber ? e($modelNumber) : null,+ 'status_label' => $statusName ? e($statusName) : null,+ 'assigned_to' => $assignedTo ? e($assignedTo) : null,+ 'company' => $companyName ? e($companyName) : null,'name' => ($assetmaintenance->name) ? e($assetmaintenance->name) : null,'title' => ($assetmaintenance->name) ? e($assetmaintenance->name) : null, // legacy to not change the shape of the API- 'location' => (($assetmaintenance->asset) && ($assetmaintenance->asset->location)) ? e($assetmaintenance->asset->location->name) : null,+ 'location' => $locationName ? e($locationName) : null,'notes' => ($assetmaintenance->notes) ? Helper::parseEscapedMarkedownInline($assetmaintenance->notes) : null,- 'supplier' => ($assetmaintenance->supplier) ? e($assetmaintenance->supplier?->name) : null,+ 'supplier' => $supplierName ? e($supplierName) : null,'url' => ($assetmaintenance->url) ? e($assetmaintenance->url) : null,'cost' => Helper::formatCurrencyOutput($assetmaintenance->cost),// DEPRECATED: bare-string maintenance_type. Kept for APIdiff --git a/app/Models/Maintenance.php b/app/Models/Maintenance.phpindex 4f636810d0..2a2752eba0 100644--- a/app/Models/Maintenance.php+++ b/app/Models/Maintenance.php@@ -28,11 +28,11 @@ use Watson\Validating\ValidatingTrait;* @property-read \App\Models\User|null $adminuser* @property-read \App\Models\User|null $responsibleParty* @property-read \App\Models\User|null $completedByUser+ * @property-read \Illuminate\Database\Eloquent\Model|null $item*/class Maintenance extends SnipeModel implements ICompanyableChild{use CompanyableChildTrait;-use HasFactory;use HasUploads;use Loggable, Presentable;diff --git a/app/Presenters/MaintenancesPresenter.php b/app/Presenters/MaintenancesPresenter.phpindex 11348de6dc..bc6e48fd95 100644--- a/app/Presenters/MaintenancesPresenter.php+++ b/app/Presenters/MaintenancesPresenter.php@@ -3,7 +3,9 @@namespace App\Presenters;/**- * Class AssetModelPresenter+ * Class MaintenancesPresenter+ *+ * @property \App\Models\Maintenance $model*/class MaintenancesPresenter extends Presenter{