From 2920c57e699afc4e511d19497e667da16be06117 Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Sun, 2 Jan 2022 11:42:32 +0100
Subject: [PATCH] Lint
---
app/Payment/Payment.php | 20 ++++++++++++++------
app/Pdf/PdfGenerator.php | 4 ++--
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/app/Payment/Payment.php b/app/Payment/Payment.php
index e9251c4c..2e8f2c0b 100644
--- a/app/Payment/Payment.php
+++ b/app/Payment/Payment.php
@@ -5,8 +5,10 @@ namespace App\Payment;
use App\Member\Member;
use App\Payment\Status;
use App\Payment\Subscription;
+use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
class Payment extends Model
{
@@ -14,31 +16,37 @@ class Payment extends Model
public $fillable = ['member_id', 'subscription_id', 'nr', 'status_id', 'last_remembered_at'];
- public function member() {
+ public function member(): BelongsTo
+ {
return $this->belongsTo(Member::class);
}
- public function subscription() {
+ public function subscription(): BelongsTo
+ {
return $this->belongsTo(Subscription::class);
}
- public function status() {
+ public function status(): BelongsTo
+ {
return $this->belongsTo(Status::class);
}
- public function scopeWhereNeedsPayment($q) {
+ public function scopeWhereNeedsPayment(Builder $q): Builder
+ {
return $q->whereHas('status', function($q) {
return $q->needsPayment();
});
}
- public function scopeWhereNeedsBill($q) {
+ public function scopeWhereNeedsBill(Builder $q): Builder
+ {
return $q->whereHas('status', function($q) {
return $q->where('is_bill', true);
});
}
- public function scopeWhereNeedsRemember($q) {
+ public function scopeWhereNeedsRemember(Builder $q): Builder
+ {
return $q->whereHas('status', function($q) {
return $q->where('is_remember', true);
})->where(fn ($query) => $query->whereNull('last_remembered_at')->orWhere('last_remembered_at', '<=', now()->subMonths(6)));
diff --git a/app/Pdf/PdfGenerator.php b/app/Pdf/PdfGenerator.php
index 4e4aad22..ae92af9a 100644
--- a/app/Pdf/PdfGenerator.php
+++ b/app/Pdf/PdfGenerator.php
@@ -39,9 +39,9 @@ class PdfGenerator implements Responsable
public function compileView(): string
{
- return (string) view()->make($this->repo->getView(), [
+ return view()->make($this->repo->getView(), [
'data' => $this->repo,
- ]);
+ ])->render();
}
public function toResponse($request)