From 54420dfe9994554a3e22acd399ecb918dedb3a52 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 2 Aug 2023 19:14:28 +1000 Subject: [PATCH] Updates for static analysis --- app/Helpers/Invoice/ProRata.php | 1 + app/Http/Controllers/LicenseController.php | 1 - app/Models/Quote.php | 1 + app/Models/RecurringInvoice.php | 12 ++++++------ app/Models/Vendor.php | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/Helpers/Invoice/ProRata.php b/app/Helpers/Invoice/ProRata.php index 7c2027f6b8ac..92f1000ef5dd 100644 --- a/app/Helpers/Invoice/ProRata.php +++ b/app/Helpers/Invoice/ProRata.php @@ -69,6 +69,7 @@ class ProRata return []; } + /** @var \App\Models\RecurringInvoice $recurring_invoice **/ $recurring_invoice = RecurringInvoice::find($invoice->recurring_id)->first(); if (! $recurring_invoice) { diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php index 1ead42dac365..ec130115ba96 100644 --- a/app/Http/Controllers/LicenseController.php +++ b/app/Http/Controllers/LicenseController.php @@ -14,7 +14,6 @@ namespace App\Http\Controllers; use App\Models\Account; use App\Utils\CurlUtils; use Carbon\Carbon; -use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\Http; use stdClass; diff --git a/app/Models/Quote.php b/app/Models/Quote.php index b3426acb5547..da496f7d63dd 100644 --- a/app/Models/Quote.php +++ b/app/Models/Quote.php @@ -43,6 +43,7 @@ use Laracasts\Presenter\PresentableTrait; * @property string|null $number * @property float $discount * @property bool $is_amount_discount + * @property bool $auto_bill_enabled * @property string|null $po_number * @property string|null $date * @property string|null $last_sent_date diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index a41f58629fb6..9bc2e06a00bb 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -278,7 +278,7 @@ class RecurringInvoice extends BaseModel return $value; } - public function vendor() + public function vendor(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Vendor::class); } @@ -293,27 +293,27 @@ class RecurringInvoice extends BaseModel return $this->hasManyThrough(Backup::class, Activity::class); } - public function company() + public function company(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Company::class); } - public function client() + public function client(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Client::class)->withTrashed(); } - public function project() + public function project(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Project::class)->withTrashed(); } - public function user() + public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(User::class)->withTrashed(); } - public function assigned_user() + public function assigned_user(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(User::class, 'assigned_user_id', 'id')->withTrashed(); } diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php index 84ca29d6f31d..43ed415da681 100644 --- a/app/Models/Vendor.php +++ b/app/Models/Vendor.php @@ -164,7 +164,7 @@ class Vendor extends BaseModel return self::class; } - public function primary_contact() + public function primary_contact(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(VendorContact::class)->where('is_primary', true); } @@ -179,12 +179,12 @@ class Vendor extends BaseModel return $this->belongsTo(User::class, 'assigned_user_id', 'id')->withTrashed(); } - public function contacts() + public function contacts(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(VendorContact::class)->orderBy('is_primary', 'desc'); } - public function activities() + public function activities(): \Illuminate\Database\Eloquent\Relations\HasMany { return $this->hasMany(Activity::class); }