Updated dependencies; Fixed codeformatting and phpstan

This commit is contained in:
Constantin Graf
2024-07-31 12:53:41 +02:00
committed by Constantin Graf
parent 5b7df869ad
commit d8968399d6
78 changed files with 1038 additions and 1148 deletions

View File

@@ -29,5 +29,6 @@ use OwenIt\Auditing\Models\Audit as PackageAuditModel;
*/
class Audit extends PackageAuditModel
{
/** @use HasFactory<AuditFactory> */
use HasFactory;
}

View File

@@ -30,7 +30,10 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
class Client extends Model implements AuditableContract
{
use Auditable;
/** @use HasFactory<ClientFactory> */
use HasFactory;
use HasUuids;
/**

View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace App\Models;
use Database\Factories\FailedJobFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Carbon;
@@ -16,6 +17,7 @@ use Illuminate\Support\Carbon;
*/
class FailedJob extends Model
{
/** @use HasFactory<FailedJobFactory> */
use HasFactory;
/**

View File

@@ -30,7 +30,10 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
class Member extends JetstreamMembership implements AuditableContract
{
use Auditable;
/** @use HasFactory<MemberFactory> */
use HasFactory;
use HasUuids;
/**

View File

@@ -9,6 +9,7 @@ use Database\Factories\OrganizationFactory;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Carbon;
@@ -42,7 +43,10 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
class Organization extends JetstreamTeam implements AuditableContract
{
use Auditable;
/** @use HasFactory<OrganizationFactory> */
use HasFactory;
use HasUuids;
/**
@@ -110,7 +114,7 @@ class Organization extends JetstreamTeam implements AuditableContract
*/
public function users(): BelongsToMany
{
return $this->belongsToMany(Jetstream::userModel(), Jetstream::membershipModel())
return $this->belongsToMany(User::class, Member::class)
->withPivot([
'id',
'role',
@@ -120,6 +124,16 @@ class Organization extends JetstreamTeam implements AuditableContract
->as('membership');
}
/**
* Get the owner of the team.
*
* @return BelongsTo<User, Organization>
*/
public function owner(): BelongsTo
{
return $this->belongsTo(User::class, 'user_id');
}
/**
* @return HasMany<Member>
*/

View File

@@ -9,7 +9,6 @@ use Database\Factories\OrganizationInvitationFactory;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
use Laravel\Jetstream\Jetstream;
use Laravel\Jetstream\TeamInvitation as JetstreamTeamInvitation;
use OwenIt\Auditing\Auditable;
use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
@@ -28,7 +27,10 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
class OrganizationInvitation extends JetstreamTeamInvitation implements AuditableContract
{
use Auditable;
/** @use HasFactory<OrganizationInvitationFactory> */
use HasFactory;
use HasUuids;
/**
@@ -55,7 +57,7 @@ class OrganizationInvitation extends JetstreamTeamInvitation implements Auditabl
*/
public function organization(): BelongsTo
{
return $this->belongsTo(Jetstream::teamModel(), 'organization_id');
return $this->belongsTo(Organization::class, 'organization_id');
}
/**
@@ -65,6 +67,6 @@ class OrganizationInvitation extends JetstreamTeamInvitation implements Auditabl
*/
public function team(): BelongsTo
{
return $this->belongsTo(Jetstream::teamModel(), 'organization_id');
return $this->belongsTo(Organization::class, 'organization_id');
}
}

View File

@@ -41,7 +41,10 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
class Project extends Model implements AuditableContract
{
use Auditable;
/** @use HasFactory<ProjectFactory> */
use HasFactory;
use HasUuids;
/**

View File

@@ -32,7 +32,10 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
class ProjectMember extends Model implements AuditableContract
{
use Auditable;
/** @use HasFactory<ProjectMemberFactory> */
use HasFactory;
use HasUuids;
/**

View File

@@ -26,7 +26,10 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
class Tag extends Model implements AuditableContract
{
use Auditable;
/** @use HasFactory<TagFactory> */
use HasFactory;
use HasUuids;
/**

View File

@@ -35,7 +35,10 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
class Task extends Model implements AuditableContract
{
use Auditable;
/** @use HasFactory<TaskFactory> */
use HasFactory;
use HasUuids;
/**

View File

@@ -49,7 +49,10 @@ class TimeEntry extends Model implements AuditableContract
{
use Auditable;
use ComputedAttributes;
/** @use HasFactory<TimeEntryFactory> */
use HasFactory;
use HasUuids;
/**

View File

@@ -59,7 +59,10 @@ class User extends Authenticatable implements AuditableContract, FilamentUser, M
{
use Auditable;
use HasApiTokens;
/** @use HasFactory<UserFactory> */
use HasFactory;
use HasProfilePhoto;
use HasTeams;
use HasUuids;