QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-16 09:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add return types and typed parameters to remaining 10 models

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Models/TaxType.php
View File

@@ -2,6 +2,9 @@
namespace App\Models;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -38,17 +41,17 @@ class TaxType extends Model
return $this->belongsTo(Company::class);
}
public function scopeWhereCompany($query)
public function scopeWhereCompany(Builder $query): void
{
$query->where('company_id', request()->header('company'));
}
public function scopeWhereTaxType($query, $tax_type_id)
public function scopeWhereTaxType(Builder $query, int $tax_type_id): void
{
$query->orWhere('id', $tax_type_id);
}
public function scopeApplyFilters($query, array $filters)
public function scopeApplyFilters(Builder $query, array $filters): void
{
$filters = collect($filters);
@@ -71,17 +74,20 @@ class TaxType extends Model
}
}
public function scopeWhereOrder($query, $orderByField, $orderBy)
public function scopeWhereOrder(Builder $query, string $orderByField, string $orderBy): void
{
$query->orderBy($orderByField, $orderBy);
}
public function scopeWhereSearch($query, $search)
public function scopeWhereSearch(Builder $query, string $search): void
{
$query->where('name', 'LIKE', '%'.$search.'%');
}
public function scopePaginateData($query, $limit)
/**
* @return Collection|LengthAwarePaginator
*/
public function scopePaginateData(Builder $query, string $limit)
{
if ($limit == 'all') {
return $query->get();