feat: use carbon immutable dates

pushpak1300 · Jan 18, 2025 · 65998d6 · 65998d6
1 parent 86fcb8b
commit 65998d6
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 51 deletions.
diff --git a/app/Models/Membership.php b/app/Models/Membership.php
@@ -4,16 +4,16 @@
 
 namespace App\Models;
 
-use Illuminate\Support\Carbon;
+use Carbon\CarbonImmutable;
 use Laravel\Jetstream\Membership as JetstreamMembership;
 
 /**
  * @property int $id
  * @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<static>|Membership newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership newQuery()
@@ -25,9 +25,6 @@
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Membership whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|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
@@ -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,14 +31,14 @@
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection query()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereData($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereExpiresAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereProvider($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereProviderId($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereRefreshToken($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereToken($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereUserId($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|OauthConnection whereExpiresAt($value)
  *
  * @mixin \Eloquent
  */

diff --git 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,16 +19,16 @@
  * @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<int, TeamInvitation> $teamInvitations
  * @property-read int|null $team_invitations_count
  * @property-read Membership|null $membership
  * @property-read Collection<int, User> $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<static>|Team newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Team newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Team query()
@@ -39,9 +39,6 @@
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Team whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|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
@@ -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<static>|TeamInvitation newModelQuery()
@@ -27,9 +27,6 @@
  * @method static \Illuminate\Database\Eloquent\Builder<static>|TeamInvitation whereTeamId($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|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
@@ -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<int, DatabaseNotification> $notifications
  * @property-read int|null $notifications_count
+ * @property-read Collection<int, OauthConnection> $oauthConnections
+ * @property-read int|null $oauth_connections_count
  * @property-read Collection<int, Team> $ownedTeams
  * @property-read int|null $owned_teams_count
+ * @property-read Collection<int, Team> $ownedTeamsBase
+ * @property-read int|null $owned_teams_base_count
  * @property-read string $profile_photo_url
+ * @property-read Collection<int, Subscription> $subscriptions
+ * @property-read int|null $subscriptions_count
  * @property-read Membership|null $membership
  * @property-read Collection<int, Team> $teams
  * @property-read int|null $teams_count
  * @property-read Collection<int, PersonalAccessToken> $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<static>|User hasExpiredGenericTrial()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User onGenericTrial()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User query()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereCurrentTeamId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereDeletedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereEmail($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereEmailVerifiedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User wherePassword($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User wherePmLastFour($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User wherePmType($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereProfilePhotoPath($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereRememberToken($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereStripeId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTrialEndsAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTwoFactorConfirmedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTwoFactorRecoveryCodes($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTwoFactorSecret($value)
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereUpdatedAt($value)
  *
- * @noinspection PhpFullyQualifiedNameUsageInspection
- * @noinspection PhpUnnecessaryFullyQualifiedNameInspection
- *
- * @property-read Collection<int, Team> $ownedTeamsBase
- * @property-read int|null $owned_teams_base_count
- * @property-read Collection<int, OauthConnection> $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<int, Subscription> $subscriptions
- * @property-read int|null $subscriptions_count
- *
- * @method static \Illuminate\Database\Eloquent\Builder<static>|User hasExpiredGenericTrial()
- * @method static \Illuminate\Database\Eloquent\Builder<static>|User onGenericTrial()
- * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|User wherePmLastFour($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|User wherePmType($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereStripeId($value)
- * @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTrialEndsAt($value)
- *
  * @mixin \Eloquent
  */
 final class User extends Authenticatable implements FilamentUser, MustVerifyEmail