Add return types and typed parameters to remaining 10 models

Complete the type modernization across all models. Adds Builder-typed
$query parameters and return types to all scope methods, typed parameters
on accessors, and PHPDoc on scopePaginateData/scopeApplyFilters.

Models updated: Address, EstimateItem, Expense, ExpenseCategory,
InvoiceItem, Item, Note, Tax, TaxType, Unit.

5 models needed no changes (Country, Currency, ImpersonationLog,
Module, UserSetting) as they had no untyped public methods.
This commit is contained in:
Darko Gjorgjijoski
2026-04-03 20:53:41 +02:00
parent 0fa1aac748
commit e9ee74cd01
10 changed files with 103 additions and 59 deletions

View File

@@ -4,6 +4,7 @@ namespace App\Models;
use App\Traits\HasCustomFieldsTrait;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -51,12 +52,12 @@ class InvoiceItem extends Model
return $this->belongsTo(RecurringInvoice::class);
}
public function scopeWhereCompany($query, $company_id)
public function scopeWhereCompany(Builder $query, int $company_id): void
{
$query->where('company_id', $company_id);
}
public function scopeInvoicesBetween($query, $start, $end)
public function scopeInvoicesBetween(Builder $query, Carbon $start, Carbon $end): void
{
$query->whereHas('invoice', function ($query) use ($start, $end) {
$query->whereBetween(
@@ -66,7 +67,7 @@ class InvoiceItem extends Model
});
}
public function scopeApplyInvoiceFilters($query, array $filters)
public function scopeApplyInvoiceFilters(Builder $query, array $filters): void
{
$filters = collect($filters);
@@ -77,7 +78,7 @@ class InvoiceItem extends Model
}
}
public function scopeItemAttributes($query)
public function scopeItemAttributes(Builder $query): void
{
$query->select(
DB::raw('sum(quantity) as total_quantity, sum(base_total) as total_amount, invoice_items.name')