diff --git a/app/Http/Middleware/ProtectedRoutes.php b/app/Http/Middleware/ProtectedRoutes.php index d9a2e47d..acb67f62 100644 --- a/app/Http/Middleware/ProtectedRoutes.php +++ b/app/Http/Middleware/ProtectedRoutes.php @@ -14,7 +14,6 @@ public function handle($request, Closure $next, ...$guards): mixed return redirect('/'); } - // @phpstan-ignore-next-line return parent::handle($request, $next, ...$guards); } } diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index bcc06a97..99520eb5 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -3,13 +3,10 @@ namespace App\Models; use App\Enums\SourceEnum; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; class BaseModel extends Model { - use HasFactory; - protected $guarded = []; public const SOURCE = SourceEnum::POWERUSE; diff --git a/app/Models/Charge.php b/app/Models/Charge.php index 10917fdc..57cea7d9 100644 --- a/app/Models/Charge.php +++ b/app/Models/Charge.php @@ -4,7 +4,6 @@ use App\Enums\SourceEnum; use Carbon\Carbon; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasMany; /** @@ -27,8 +26,6 @@ */ class Charge extends BaseModel { - use HasFactory; - protected $appends = ['source']; public function getSourceAttribute(): ?SourceEnum diff --git a/app/Models/ChargePrice.php b/app/Models/ChargePrice.php index b436df9a..b8a7205c 100644 --- a/app/Models/ChargePrice.php +++ b/app/Models/ChargePrice.php @@ -3,7 +3,6 @@ namespace App\Models; use Carbon\Carbon; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -18,8 +17,6 @@ */ class ChargePrice extends Model { - use HasFactory; - /** * @return BelongsTo */ diff --git a/app/Models/DatahubPriceList.php b/app/Models/DatahubPriceList.php index fd3b48ba..469ffb22 100644 --- a/app/Models/DatahubPriceList.php +++ b/app/Models/DatahubPriceList.php @@ -3,6 +3,7 @@ namespace App\Models; use Carbon\Carbon; +use Database\Factories\DatahubPriceListFactory; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; @@ -50,6 +51,7 @@ */ class DatahubPriceList extends BaseModel { + /** @use HasFactory */ use HasFactory; use SoftDeletes; diff --git a/app/Models/MeteringPoint.php b/app/Models/MeteringPoint.php index 4149c708..6d20b12c 100644 --- a/app/Models/MeteringPoint.php +++ b/app/Models/MeteringPoint.php @@ -5,6 +5,7 @@ use App\Casts\CopenhagenDate; use App\Enums\SourceEnum; use Carbon\Carbon; +use Database\Factories\MeteringPointFactory; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -40,6 +41,7 @@ */ class MeteringPoint extends BaseModel { + /** @use HasFactory */ use HasFactory; protected $appends = ['source']; diff --git a/app/Models/User.php b/app/Models/User.php index 814f4421..d10be2fc 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -3,6 +3,7 @@ namespace App\Models; use Carbon\Carbon; +use Database\Factories\UserFactory; use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasMany; @@ -26,6 +27,7 @@ */ class User extends Authenticatable implements MustVerifyEmail { + /** @use HasFactory */ use HasApiTokens, HasFactory, Notifiable; /**