Skip to content

Commit f74e5a2

Browse files
[6.x] Handle CarbonInterval instances in Localize middleware (#14209)
1 parent 62a0fde commit f74e5a2

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

src/Http/Middleware/CP/Localize.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Statamic\Http\Middleware\CP;
44

55
use Carbon\CarbonInterface;
6+
use Carbon\CarbonInterval;
67
use Closure;
78
use DateTime;
89
use Illuminate\Support\Facades\Date;
@@ -24,7 +25,11 @@ public function handle($request, Closure $next)
2425

2526
// Get original Carbon format so it can be restored later.
2627
$originalToStringFormat = $this->getToStringFormat();
27-
Date::setToStringFormat(function (CarbonInterface $date) {
28+
Date::setToStringFormat(function (CarbonInterface|CarbonInterval $date) {
29+
if ($date instanceof CarbonInterval) {
30+
return $date->forHumans();
31+
}
32+
2833
return $date->setTimezone(Statamic::displayTimezone())->format(Statamic::dateFormat());
2934
});
3035

src/Http/Middleware/Localize.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Statamic\Http\Middleware;
44

55
use Carbon\CarbonInterface;
6+
use Carbon\CarbonInterval;
67
use Closure;
78
use Illuminate\Support\Facades\Date;
89
use ReflectionClass;
@@ -32,7 +33,11 @@ public function handle($request, Closure $next)
3233

3334
// Get original Carbon format so it can be restored later.
3435
$originalToStringFormat = $this->getToStringFormat();
35-
Date::setToStringFormat(function (CarbonInterface $date) {
36+
Date::setToStringFormat(function (CarbonInterface|CarbonInterval $date) {
37+
if ($date instanceof CarbonInterval) {
38+
return $date->forHumans();
39+
}
40+
3641
return $date->setTimezone(Statamic::displayTimezone())->format(Statamic::dateFormat());
3742
});
3843

0 commit comments

Comments
 (0)