diff --git a/extensions/tags/src/Access/DiscussionPolicy.php b/extensions/tags/src/Access/DiscussionPolicy.php index 3790782e94..742632cae0 100755 --- a/extensions/tags/src/Access/DiscussionPolicy.php +++ b/extensions/tags/src/Access/DiscussionPolicy.php @@ -62,7 +62,7 @@ public function tag(User $actor, Discussion $discussion): ?string if ( $allowEditTags === '-1' || ($allowEditTags === 'reply' && $discussion->participant_count <= 1) - || (is_numeric($allowEditTags) && $discussion->created_at->diffInMinutes(new Carbon) < $allowEditTags) + || (is_numeric($allowEditTags) && $discussion->created_at->diffInMinutes(new Carbon, true) < $allowEditTags) ) { return $this->allow(); } diff --git a/framework/core/composer.json b/framework/core/composer.json index d3e09de9e0..f7a4c8e559 100644 --- a/framework/core/composer.json +++ b/framework/core/composer.json @@ -72,7 +72,7 @@ "middlewares/base-path-router": "^2.0.1", "middlewares/request-handler": "^2.0.2", "monolog/monolog": "^3.0", - "nesbot/carbon": "^2.0", + "nesbot/carbon": "^3.0", "nikic/fast-route": "^1.3", "psr/http-message": "^1.1", "psr/http-server-handler": "^1.0.2", diff --git a/framework/core/src/Discussion/Access/DiscussionPolicy.php b/framework/core/src/Discussion/Access/DiscussionPolicy.php index 3e4099b079..321b312813 100644 --- a/framework/core/src/Discussion/Access/DiscussionPolicy.php +++ b/framework/core/src/Discussion/Access/DiscussionPolicy.php @@ -37,7 +37,7 @@ public function rename(User $actor, Discussion $discussion): ?string if ($allowRenaming === '-1' || ($allowRenaming === 'reply' && $discussion->participant_count <= 1) - || (is_numeric($allowRenaming) && $discussion->created_at->diffInMinutes() < $allowRenaming)) { + || (is_numeric($allowRenaming) && $discussion->created_at->diffInMinutes(null, true) < $allowRenaming)) { return $this->allow(); } } diff --git a/framework/core/src/Http/AccessToken.php b/framework/core/src/Http/AccessToken.php index 69aa2e3045..15f7a8c566 100644 --- a/framework/core/src/Http/AccessToken.php +++ b/framework/core/src/Http/AccessToken.php @@ -111,7 +111,7 @@ public function touch($attribute = null, ServerRequestInterface $request = null) { $now = Carbon::now(); - if ($this->last_activity_at === null || $this->last_activity_at->diffInSeconds($now) > AccessToken::LAST_ACTIVITY_UPDATE_DIFF) { + if ($this->last_activity_at === null || $this->last_activity_at->diffInSeconds($now, true) > AccessToken::LAST_ACTIVITY_UPDATE_DIFF) { $this->last_activity_at = $now; } diff --git a/framework/core/src/Post/Access/PostPolicy.php b/framework/core/src/Post/Access/PostPolicy.php index 2171f1f556..333fc0ab83 100644 --- a/framework/core/src/Post/Access/PostPolicy.php +++ b/framework/core/src/Post/Access/PostPolicy.php @@ -41,7 +41,7 @@ public function edit(User $actor, Post $post): ?string if ($allowEditing === '-1' || ($allowEditing === 'reply' && $post->number >= $post->discussion->last_post_number) - || (is_numeric($allowEditing) && $post->created_at->diffInMinutes(new Carbon) < $allowEditing)) { + || (is_numeric($allowEditing) && $post->created_at->diffInMinutes(new Carbon, true) < $allowEditing)) { return $this->allow(); } } @@ -56,7 +56,7 @@ public function hide(User $actor, Post $post): ?string if ($allowHiding === '-1' || ($allowHiding === 'reply' && $post->number >= $post->discussion->last_post_number) - || (is_numeric($allowHiding) && $post->created_at->diffInMinutes(new Carbon) < $allowHiding)) { + || (is_numeric($allowHiding) && $post->created_at->diffInMinutes(new Carbon, true) < $allowHiding)) { return $this->allow(); } } diff --git a/framework/core/src/User/EmailToken.php b/framework/core/src/User/EmailToken.php index ed91dbdbee..58ebcffa36 100644 --- a/framework/core/src/User/EmailToken.php +++ b/framework/core/src/User/EmailToken.php @@ -65,7 +65,7 @@ public function scopeValidOrFail(Builder $query, string $id): static /** @var static|null $token */ $token = $query->find($id); - if (! $token || $token->created_at->diffInDays() >= 1) { + if (! $token || $token->created_at->diffInDays(null, true) >= 1) { throw new InvalidConfirmationTokenException; } diff --git a/framework/core/src/User/User.php b/framework/core/src/User/User.php index 767a7630cc..e8e0c1f939 100644 --- a/framework/core/src/User/User.php +++ b/framework/core/src/User/User.php @@ -438,7 +438,7 @@ public function updateLastSeen(): static { $now = Carbon::now(); - if ($this->last_seen_at === null || $this->last_seen_at->diffInSeconds($now) > User::LAST_SEEN_UPDATE_DIFF) { + if ($this->last_seen_at === null || $this->last_seen_at->diffInSeconds($now, true) > User::LAST_SEEN_UPDATE_DIFF) { $this->last_seen_at = $now; }