diff --git a/composer.json b/composer.json index 928413721682..9edc1da50bc6 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "league/commonmark": "^2.2.1", "league/flysystem": "^3.8.0", "monolog/monolog": "^3.0", - "nesbot/carbon": "^3.0.0-beta.3@beta", + "nesbot/carbon": "^2.72.2 || ^3.0.0-beta.3@beta", "nunomaduro/termwind": "^2.0", "psr/container": "^1.1.1|^2.0.1", "psr/log": "^1.0|^2.0|^3.0", diff --git a/src/Illuminate/Support/Carbon.php b/src/Illuminate/Support/Carbon.php index f3a9240e75e2..bd56ad832988 100644 --- a/src/Illuminate/Support/Carbon.php +++ b/src/Illuminate/Support/Carbon.php @@ -3,6 +3,7 @@ namespace Illuminate\Support; use Carbon\Carbon as BaseCarbon; +use Carbon\CarbonImmutable as BaseCarbonImmutable; use Illuminate\Support\Traits\Conditionable; use Illuminate\Support\Traits\Dumpable; use Ramsey\Uuid\Uuid; @@ -12,13 +13,19 @@ class Carbon extends BaseCarbon { use Conditionable, Dumpable; + /** + * {@inheritdoc} + */ + public static function setTestNow(mixed $testNow = null): void + { + BaseCarbon::setTestNow($testNow); + BaseCarbonImmutable::setTestNow($testNow); + } + /** * Create a Carbon instance from a given ordered UUID or ULID. - * - * @param \Ramsey\Uuid\Uuid|\Symfony\Component\Uid\Ulid|string $id - * @return \Illuminate\Support\Carbon */ - public static function createFromId($id) + public static function createFromId(Uuid|Ulid|string $id): static { if (is_string($id)) { $id = Ulid::isValid($id) ? Ulid::fromString($id) : Uuid::fromString($id); diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index 007e7706ae7d..33c2696c3d85 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -23,7 +23,7 @@ "illuminate/conditionable": "^11.0", "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", - "nesbot/carbon": "^3.0.0-beta.3@beta", + "nesbot/carbon": "^2.72.2 || ^3.0.0-beta.3@beta", "voku/portable-ascii": "^2.0" }, "conflict": {