From 65998d6200a69aceb3ddd1e66b6d0a84150c479e Mon Sep 17 00:00:00 2001 From: Pushpak Chhajed Date: Sat, 18 Jan 2025 19:30:04 +0530 Subject: [PATCH] feat: use carbon immutable dates --- app/Models/Membership.php | 9 ++---- app/Models/OauthConnection.php | 8 +++--- app/Models/Team.php | 11 +++----- app/Models/TeamInvitation.php | 9 ++---- app/Models/User.php | 51 +++++++++++++++------------------- 5 files changed, 37 insertions(+), 51 deletions(-) diff --git a/app/Models/Membership.php b/app/Models/Membership.php index dd22673..6338cde 100644 --- a/app/Models/Membership.php +++ b/app/Models/Membership.php @@ -4,7 +4,7 @@ namespace App\Models; -use Illuminate\Support\Carbon; +use Carbon\CarbonImmutable; use Laravel\Jetstream\Membership as JetstreamMembership; /** @@ -12,8 +12,8 @@ * @property int $team_id * @property int $user_id * @property string|null $role - * @property Carbon|null $created_at - * @property Carbon|null $updated_at + * @property CarbonImmutable|null $created_at + * @property CarbonImmutable|null $updated_at * * @method static \Illuminate\Database\Eloquent\Builder|Membership newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Membership newQuery() @@ -25,9 +25,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|Membership whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Membership whereUserId($value) * - * @noinspection PhpFullyQualifiedNameUsageInspection - * @noinspection PhpUnnecessaryFullyQualifiedNameInspection - * * @mixin \Eloquent */ final class Membership extends JetstreamMembership diff --git a/app/Models/OauthConnection.php b/app/Models/OauthConnection.php index bfe9436..8304a04 100644 --- a/app/Models/OauthConnection.php +++ b/app/Models/OauthConnection.php @@ -4,7 +4,7 @@ namespace App\Models; -use Illuminate\Support\Carbon; +use Carbon\CarbonImmutable; use Illuminate\Support\Collection; use Illuminate\Database\Eloquent\Model; use Database\Factories\OauthConnectionFactory; @@ -21,8 +21,8 @@ * @property string|null $token * @property string|null $refresh_token * @property string|null $expires_at - * @property Carbon|null $created_at - * @property Carbon|null $updated_at + * @property CarbonImmutable|null $created_at + * @property CarbonImmutable|null $updated_at * @property-read User $user * * @method static \Database\Factories\OauthConnectionFactory factory($count = null, $state = []) @@ -31,6 +31,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection query() * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereData($value) + * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereExpiresAt($value) * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereProvider($value) * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereProviderId($value) @@ -38,7 +39,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereToken($value) * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereUserId($value) - * @method static \Illuminate\Database\Eloquent\Builder|OauthConnection whereExpiresAt($value) * * @mixin \Eloquent */ diff --git a/app/Models/Team.php b/app/Models/Team.php index e9c888f..75d938e 100644 --- a/app/Models/Team.php +++ b/app/Models/Team.php @@ -4,7 +4,7 @@ namespace App\Models; -use Illuminate\Support\Carbon; +use Carbon\CarbonImmutable; use Database\Factories\TeamFactory; use Laravel\Jetstream\Events\TeamCreated; use Laravel\Jetstream\Events\TeamDeleted; @@ -19,8 +19,8 @@ * @property int $user_id * @property string $name * @property bool $personal_team - * @property Carbon|null $created_at - * @property Carbon|null $updated_at + * @property CarbonImmutable|null $created_at + * @property CarbonImmutable|null $updated_at * @property-read User|null $owner * @property-read Collection $teamInvitations * @property-read int|null $team_invitations_count @@ -28,7 +28,7 @@ * @property-read Collection $users * @property-read int|null $users_count * - * @method static TeamFactory factory($count = null, $state = []) + * @method static \Database\Factories\TeamFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|Team newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Team newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Team query() @@ -39,9 +39,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|Team whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Team whereUserId($value) * - * @noinspection PhpFullyQualifiedNameUsageInspection - * @noinspection PhpUnnecessaryFullyQualifiedNameInspection - * * @mixin \Eloquent */ final class Team extends JetstreamTeam diff --git a/app/Models/TeamInvitation.php b/app/Models/TeamInvitation.php index 96ac09a..0bf5674 100644 --- a/app/Models/TeamInvitation.php +++ b/app/Models/TeamInvitation.php @@ -4,7 +4,7 @@ namespace App\Models; -use Illuminate\Support\Carbon; +use Carbon\CarbonImmutable; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Laravel\Jetstream\TeamInvitation as JetstreamTeamInvitation; @@ -13,8 +13,8 @@ * @property int $team_id * @property string $email * @property string|null $role - * @property Carbon|null $created_at - * @property Carbon|null $updated_at + * @property CarbonImmutable|null $created_at + * @property CarbonImmutable|null $updated_at * @property-read Team $team * * @method static \Illuminate\Database\Eloquent\Builder|TeamInvitation newModelQuery() @@ -27,9 +27,6 @@ * @method static \Illuminate\Database\Eloquent\Builder|TeamInvitation whereTeamId($value) * @method static \Illuminate\Database\Eloquent\Builder|TeamInvitation whereUpdatedAt($value) * - * @noinspection PhpFullyQualifiedNameUsageInspection - * @noinspection PhpUnnecessaryFullyQualifiedNameInspection - * * @mixin \Eloquent */ final class TeamInvitation extends JetstreamTeamInvitation diff --git a/app/Models/User.php b/app/Models/User.php index d819b7f..4a2fde1 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -5,8 +5,8 @@ namespace App\Models; use Filament\Panel; +use Carbon\CarbonImmutable; use Laravel\Cashier\Billable; -use Illuminate\Support\Carbon; use Laravel\Jetstream\HasTeams; use Laravel\Cashier\Subscription; use Laravel\Sanctum\HasApiTokens; @@ -30,69 +30,64 @@ * @property int $id * @property string $name * @property string $email - * @property Carbon|null $email_verified_at + * @property CarbonImmutable|null $email_verified_at * @property string $password * @property string|null $remember_token * @property int|null $current_team_id * @property string|null $profile_photo_path - * @property Carbon|null $created_at - * @property Carbon|null $updated_at + * @property CarbonImmutable|null $created_at + * @property CarbonImmutable|null $updated_at + * @property string|null $deleted_at * @property string|null $two_factor_secret * @property string|null $two_factor_recovery_codes * @property string|null $two_factor_confirmed_at + * @property string|null $stripe_id + * @property string|null $pm_type + * @property string|null $pm_last_four + * @property string|null $trial_ends_at * @property-read Team|null $currentTeam * @property-read DatabaseNotificationCollection $notifications * @property-read int|null $notifications_count + * @property-read Collection $oauthConnections + * @property-read int|null $oauth_connections_count * @property-read Collection $ownedTeams * @property-read int|null $owned_teams_count + * @property-read Collection $ownedTeamsBase + * @property-read int|null $owned_teams_base_count * @property-read string $profile_photo_url + * @property-read Collection $subscriptions + * @property-read int|null $subscriptions_count * @property-read Membership|null $membership * @property-read Collection $teams * @property-read int|null $teams_count * @property-read Collection $tokens * @property-read int|null $tokens_count * - * @method static UserFactory factory($count = null, $state = []) + * @method static \Database\Factories\UserFactory factory($count = null, $state = []) + * @method static \Illuminate\Database\Eloquent\Builder|User hasExpiredGenericTrial() * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|User newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|User onGenericTrial() * @method static \Illuminate\Database\Eloquent\Builder|User query() * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereCurrentTeamId($value) + * @method static \Illuminate\Database\Eloquent\Builder|User whereDeletedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereEmail($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereEmailVerifiedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|User wherePassword($value) + * @method static \Illuminate\Database\Eloquent\Builder|User wherePmLastFour($value) + * @method static \Illuminate\Database\Eloquent\Builder|User wherePmType($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereProfilePhotoPath($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereRememberToken($value) + * @method static \Illuminate\Database\Eloquent\Builder|User whereStripeId($value) + * @method static \Illuminate\Database\Eloquent\Builder|User whereTrialEndsAt($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereTwoFactorConfirmedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereTwoFactorRecoveryCodes($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereTwoFactorSecret($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value) * - * @noinspection PhpFullyQualifiedNameUsageInspection - * @noinspection PhpUnnecessaryFullyQualifiedNameInspection - * - * @property-read Collection $ownedTeamsBase - * @property-read int|null $owned_teams_base_count - * @property-read Collection $oauthConnections - * @property-read int|null $oauth_connections_count - * @property string|null $deleted_at - * @property string|null $stripe_id - * @property string|null $pm_type - * @property string|null $pm_last_four - * @property string|null $trial_ends_at - * @property-read Collection $subscriptions - * @property-read int|null $subscriptions_count - * - * @method static \Illuminate\Database\Eloquent\Builder|User hasExpiredGenericTrial() - * @method static \Illuminate\Database\Eloquent\Builder|User onGenericTrial() - * @method static \Illuminate\Database\Eloquent\Builder|User whereDeletedAt($value) - * @method static \Illuminate\Database\Eloquent\Builder|User wherePmLastFour($value) - * @method static \Illuminate\Database\Eloquent\Builder|User wherePmType($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereStripeId($value) - * @method static \Illuminate\Database\Eloquent\Builder|User whereTrialEndsAt($value) - * * @mixin \Eloquent */ final class User extends Authenticatable implements FilamentUser, MustVerifyEmail