[5.8] Upgrade Carbon to version 2 and allow CarbonImmutable

composer.json

@@ -23,7 +23,7 @@
         "erusev/parsedown": "^1.7",
         "league/flysystem": "^1.0.8",
         "monolog/monolog": "^1.12",
-        "nesbot/carbon": "^1.26.3",
+        "nesbot/carbon": "^2.0",
         "psr/container": "^1.0",
         "psr/simple-cache": "^1.0",
         "ramsey/uuid": "^3.7",

src/Illuminate/Auth/Notifications/VerifyEmail.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Auth\Notifications;
 
-use Illuminate\Support\Carbon;
+use Carbon\Factory;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Notifications\Notification;
@@ -59,7 +59,7 @@ public function toMail($notifiable)
     protected function verificationUrl($notifiable)
     {
         return URL::temporarySignedRoute(
-            'verification.verify', Carbon::now()->addMinutes(60), ['id' => $notifiable->getKey()]
+            'verification.verify', app(Factory::class)->now()->addMinutes(60), ['id' => $notifiable->getKey()]
         );
     }
 

src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Auth\Passwords;
 
+use Carbon\Factory;
 use Illuminate\Support\Str;
-use Illuminate\Support\Carbon;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
@@ -107,7 +107,11 @@ protected function deleteExisting(CanResetPasswordContract $user)
      */
     protected function getPayload($email, $token)
     {
-        return ['email' => $email, 'token' => $this->hasher->make($token), 'created_at' => new Carbon];
+        return [
+            'email' => $email,
+            'token' => $this->hasher->make($token),
+            'created_at' => app(Factory::class)->now(),
+        ];
     }
 
     /**
@@ -136,7 +140,7 @@ public function exists(CanResetPasswordContract $user, $token)
      */
     protected function tokenExpired($createdAt)
     {
-        return Carbon::parse($createdAt)->addSeconds($this->expires)->isPast();
+        return app(Factory::class)->parse($createdAt)->addSeconds($this->expires)->isPast();
     }
 
     /**
@@ -157,7 +161,7 @@ public function delete(CanResetPasswordContract $user)
      */
     public function deleteExpired()
     {
-        $expiredAt = Carbon::now()->subSeconds($this->expires);
+        $expiredAt = app(Factory::class)->now()->subSeconds($this->expires);
 
         $this->getTable()->where('created_at', '<', $expiredAt)->delete();
     }

src/Illuminate/Cache/Repository.php

@@ -4,9 +4,9 @@
 
 use Closure;
 use ArrayAccess;
+use Carbon\Factory;
 use DateTimeInterface;
 use BadMethodCallException;
-use Illuminate\Support\Carbon;
 use Illuminate\Cache\Events\CacheHit;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Cache\Events\KeyWritten;
@@ -554,7 +554,8 @@ protected function getMinutes($duration)
         $duration = $this->parseDateInterval($duration);
 
         if ($duration instanceof DateTimeInterface) {
-            $duration = Carbon::now()->diffInSeconds(Carbon::createFromTimestamp($duration->getTimestamp()), false) / 60;
+            $dateFactory = app(Factory::class);
+            $duration = $dateFactory->now()->diffInSeconds($dateFactory->createFromTimestamp($duration->getTimestamp()), false) / 60;
         }
 
         return (int) ($duration * 60) > 0 ? $duration : null;

src/Illuminate/Console/Scheduling/Event.php

@@ -3,9 +3,11 @@
 namespace Illuminate\Console\Scheduling;
 
 use Closure;
+use Carbon\Carbon;
+use Carbon\Factory;
 use Cron\CronExpression;
+use Carbon\CarbonImmutable;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Carbon;
 use GuzzleHttp\Client as HttpClient;
 use Illuminate\Contracts\Mail\Mailer;
 use Symfony\Component\Process\Process;
@@ -295,7 +297,8 @@ public function runsInMaintenanceMode()
      */
     protected function expressionPasses()
     {
-        $date = Carbon::now();
+        /** @var Carbon|CarbonImmutable $date */
+        $date = app(Factory::class)->now();
 
         if ($this->timezone) {
             $date->setTimezone($this->timezone);
@@ -687,11 +690,11 @@ public function getSummaryForDisplay()
      * @param  \DateTime|string  $currentTime
      * @param  int  $nth
      * @param  bool  $allowCurrentDate
-     * @return \Illuminate\Support\Carbon
+     * @return \Carbon\Carbon
      */
     public function nextRunDate($currentTime = 'now', $nth = 0, $allowCurrentDate = false)
     {
-        return Carbon::instance(CronExpression::factory(
+        return app(Factory::class)->instance(CronExpression::factory(
             $this->getExpression()
         )->getNextRunDate($currentTime, $nth, $allowCurrentDate, $this->timezone));
     }

src/Illuminate/Console/Scheduling/ManagesFrequencies.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Console\Scheduling;
 
-use Illuminate\Support\Carbon;
+use Carbon\Factory;
 
 trait ManagesFrequencies
 {
@@ -53,9 +53,11 @@ public function unlessBetween($startTime, $endTime)
     private function inTimeInterval($startTime, $endTime)
     {
         return function () use ($startTime, $endTime) {
-            return Carbon::now($this->timezone)->between(
-                Carbon::parse($startTime, $this->timezone),
-                Carbon::parse($endTime, $this->timezone),
+            $dateFactory = app(Factory::class);
+
+            return $dateFactory->now($this->timezone)->between(
+                $dateFactory->parse($startTime, $this->timezone),
+                $dateFactory->parse($endTime, $this->timezone),
                 true
             );
         };

src/Illuminate/Console/Scheduling/ScheduleRunCommand.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Console\Scheduling;
 
-use Illuminate\Support\Carbon;
+use Carbon\Factory;
 use Illuminate\Console\Command;
 
 class ScheduleRunCommand extends Command
@@ -31,7 +31,7 @@ class ScheduleRunCommand extends Command
     /**
      * The 24 hour timestamp this scheduler command started running.
      *
-     * @var \Illuminate\Support\Carbon;
+     * @var \Carbon\Carbon;
      */
     protected $startedAt;
 
@@ -52,7 +52,7 @@ public function __construct(Schedule $schedule)
     {
         $this->schedule = $schedule;
 
-        $this->startedAt = Carbon::now();
+        $this->startedAt = app(Factory::class)->now();
 
         parent::__construct();
     }

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -2,11 +2,12 @@
 
 namespace Illuminate\Database\Eloquent\Concerns;
 
+use Carbon\Factory;
 use LogicException;
 use DateTimeInterface;
+use Carbon\CarbonInterface;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Collection as BaseCollection;
@@ -716,7 +717,7 @@ public function fromJson($value, $asObject = false)
      * Return a timestamp as DateTime object with time set to 00:00:00.
      *
      * @param  mixed  $value
-     * @return \Illuminate\Support\Carbon
+     * @return \Carbon\Carbon
      */
     protected function asDate($value)
     {
@@ -727,22 +728,24 @@ protected function asDate($value)
      * Return a timestamp as DateTime object.
      *
      * @param  mixed  $value
-     * @return \Illuminate\Support\Carbon
+     * @return \Carbon\Carbon
      */
     protected function asDateTime($value)
     {
         // If this value is already a Carbon instance, we shall just return it as is.
         // This prevents us having to re-instantiate a Carbon instance when we know
         // it already is one, which wouldn't be fulfilled by the DateTime check.
-        if ($value instanceof Carbon) {
+        if ($value instanceof CarbonInterface) {
             return $value;
         }
 
+        $dateFactory = app(Factory::class);
+
         // If the value is already a DateTime instance, we will just skip the rest of
         // these checks since they will be a waste of time, and hinder performance
         // when checking the field. We will just return the DateTime right away.
         if ($value instanceof DateTimeInterface) {
-            return new Carbon(
+            return $dateFactory->parse(
                 $value->format('Y-m-d H:i:s.u'), $value->getTimezone()
             );
         }
@@ -751,20 +754,20 @@ protected function asDateTime($value)
         // and format a Carbon object from this timestamp. This allows flexibility
         // when defining your date fields as they might be UNIX timestamps here.
         if (is_numeric($value)) {
-            return Carbon::createFromTimestamp($value);
+            return $dateFactory->createFromTimestamp($value);
         }
 
         // If the value is in simply year, month, day format, we will instantiate the
         // Carbon instances from that format. Again, this provides for simple date
         // fields on the database, while still supporting Carbonized conversion.
         if ($this->isStandardDateFormat($value)) {
-            return Carbon::createFromFormat('Y-m-d', $value)->startOfDay();
+            return $dateFactory->createFromFormat('Y-m-d', $value)->startOfDay();
         }
 
         // Finally, we will just assume this date is in the format used by default on
         // the database connection and use that format to create the Carbon object
         // that is returned back out to the developers after we convert it here.
-        return Carbon::createFromFormat(
+        return $dateFactory->createFromFormat(
             str_replace('.v', '.u', $this->getDateFormat()), $value
         );
     }

src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Database\Eloquent\Concerns;
 
-use Illuminate\Support\Carbon;
+use Carbon\Factory;
 
 trait HasTimestamps
 {
@@ -77,11 +77,11 @@ public function setUpdatedAt($value)
     /**
      * Get a fresh timestamp for the model.
      *
-     * @return \Illuminate\Support\Carbon
+     * @return \Carbon\Carbon
      */
     public function freshTimestamp()
     {
-        return new Carbon;
+        return app(Factory::class)->now();
     }
 
     /**

src/Illuminate/Filesystem/FilesystemAdapter.php

@@ -2,11 +2,11 @@
 
 namespace Illuminate\Filesystem;
 
+use Carbon\Factory;
 use RuntimeException;
 use Illuminate\Http\File;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
-use Illuminate\Support\Carbon;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection;
 use League\Flysystem\AdapterInterface;
@@ -548,7 +548,7 @@ public function getAwsTemporaryUrl($adapter, $path, $expiration, $options)
     public function getRackspaceTemporaryUrl($adapter, $path, $expiration, $options)
     {
         return $adapter->getContainer()->getObject($path)->getTemporaryUrl(
-            Carbon::now()->diffInSeconds($expiration),
+            app(Factory::class)->now()->diffInSeconds($expiration),
             $options['method'] ?? 'GET',
             $options['forcePublicUrl'] ?? true
         );

src/Illuminate/Foundation/Http/Exceptions/MaintenanceModeException.php

@@ -3,15 +3,16 @@
 namespace Illuminate\Foundation\Http\Exceptions;
 
 use Exception;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
+use Carbon\Factory;
 use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 
 class MaintenanceModeException extends ServiceUnavailableHttpException
 {
     /**
      * When the application was put in maintenance mode.
      *
-     * @var \Illuminate\Support\Carbon
+     * @var Carbon
      */
     public $wentDownAt;
 
@@ -25,7 +26,7 @@ class MaintenanceModeException extends ServiceUnavailableHttpException
     /**
      * When the application should next be available.
      *
-     * @var \Illuminate\Support\Carbon
+     * @var Carbon
      */
     public $willBeAvailableAt;
 
@@ -43,12 +44,13 @@ public function __construct($time, $retryAfter = null, $message = null, Exceptio
     {
         parent::__construct($retryAfter, $message, $previous, $code);
 
-        $this->wentDownAt = Carbon::createFromTimestamp($time);
+        $dateFactory = app(Factory::class);
+        $this->wentDownAt = $dateFactory->createFromTimestamp($time);
 
         if ($retryAfter) {
             $this->retryAfter = $retryAfter;
 
-            $this->willBeAvailableAt = Carbon::createFromTimestamp($time)->addSeconds($this->retryAfter);
+            $this->willBeAvailableAt = $dateFactory->createFromTimestamp($time)->addSeconds($this->retryAfter);
         }
     }
 }

src/Illuminate/Foundation/Testing/TestCase.php

@@ -3,7 +3,8 @@
 namespace Illuminate\Foundation\Testing;
 
 use Mockery;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
+use Carbon\CarbonImmutable;
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Console\Application as Artisan;
@@ -165,6 +166,9 @@ protected function tearDown()
         if (class_exists(Carbon::class)) {
             Carbon::setTestNow();
         }
+        if (class_exists(CarbonImmutable::class)) {
+            CarbonImmutable::setTestNow();
+        }
 
         $this->afterApplicationCreatedCallbacks = [];
         $this->beforeApplicationDestroyedCallbacks = [];