[5.5] Let Carbon be Macroable. (#19771)

* Let Carbon be Macroable.

* Require nesbot/carbon in illuminate/support and remove it everywhere else.

* StyleCI fix.

src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Auth\Passwords;
 
-use Carbon\Carbon;
 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;

src/Illuminate/Auth/composer.json

@@ -18,8 +18,7 @@
         "illuminate/contracts": "5.5.*",
         "illuminate/http": "5.5.*",
         "illuminate/queue": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "nesbot/carbon": "~1.20"
+        "illuminate/support": "5.5.*"
     },
     "autoload": {
         "psr-4": {

src/Illuminate/Cache/DatabaseStore.php

@@ -4,7 +4,7 @@
 
 use Closure;
 use Exception;
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Database\ConnectionInterface;
 

src/Illuminate/Cache/FileStore.php

@@ -3,8 +3,8 @@
 namespace Illuminate\Cache;
 
 use Exception;
-use Carbon\Carbon;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Filesystem\Filesystem;
 

src/Illuminate/Cache/MemcachedStore.php

@@ -3,8 +3,8 @@
 namespace Illuminate\Cache;
 
 use Memcached;
-use Carbon\Carbon;
 use ReflectionMethod;
+use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Contracts\Cache\LockProvider;
 

src/Illuminate/Cache/RateLimiter.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Cache;
 
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Cache\Repository as Cache;
 
 class RateLimiter

src/Illuminate/Cache/Repository.php

@@ -5,8 +5,8 @@
 use Closure;
 use DateTime;
 use ArrayAccess;
-use Carbon\Carbon;
 use BadMethodCallException;
+use Illuminate\Support\Carbon;
 use Illuminate\Cache\Events\CacheHit;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Cache\Events\KeyWritten;

src/Illuminate/Cache/composer.json

@@ -16,8 +16,7 @@
     "require": {
         "php": ">=7.0",
         "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "nesbot/carbon": "~1.20"
+        "illuminate/support": "5.5.*"
     },
     "autoload": {
         "psr-4": {

src/Illuminate/Console/Scheduling/Event.php

@@ -3,8 +3,8 @@
 namespace Illuminate\Console\Scheduling;
 
 use Closure;
-use Carbon\Carbon;
 use Cron\CronExpression;
+use Illuminate\Support\Carbon;
 use GuzzleHttp\Client as HttpClient;
 use Illuminate\Contracts\Mail\Mailer;
 use Symfony\Component\Process\Process;
@@ -629,7 +629,7 @@ public function getSummaryForDisplay()
      * @param  \DateTime|string  $currentTime
      * @param  int  $nth
      * @param  bool  $allowCurrentDate
-     * @return \Carbon\Carbon
+     * @return \Illuminate\Support\Carbon
      */
     public function nextRunDate($currentTime = 'now', $nth = 0, $allowCurrentDate = false)
     {

src/Illuminate/Console/Scheduling/ManagesFrequencies.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Console\Scheduling;
 
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 
 trait ManagesFrequencies
 {

src/Illuminate/Console/composer.json

@@ -17,7 +17,6 @@
         "php": ">=7.0",
         "illuminate/contracts": "5.5.*",
         "illuminate/support": "5.5.*",
-        "nesbot/carbon": "~1.20",
         "symfony/console": "~3.3"
     },
     "autoload": {

src/Illuminate/Cookie/CookieJar.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Cookie;
 
-use Carbon\Carbon;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Carbon;
 use Symfony\Component\HttpFoundation\Cookie;
 use Illuminate\Contracts\Cookie\QueueingFactory as JarContract;
 

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

@@ -2,11 +2,11 @@
 
 namespace Illuminate\Database\Eloquent\Concerns;
 
-use Carbon\Carbon;
 use LogicException;
 use DateTimeInterface;
 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;
@@ -656,7 +656,7 @@ public function fromJson($value, $asObject = false)
      * Return a timestamp as DateTime object with time set to 00:00:00.
      *
      * @param  mixed  $value
-     * @return \Carbon\Carbon
+     * @return \Illuminate\Support\Carbon
      */
     protected function asDate($value)
     {
@@ -667,7 +667,7 @@ protected function asDate($value)
      * Return a timestamp as DateTime object.
      *
      * @param  mixed  $value
-     * @return \Carbon\Carbon
+     * @return \Illuminate\Support\Carbon
      */
     protected function asDateTime($value)
     {

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

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Database\Eloquent\Concerns;
 
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 
 trait HasTimestamps
 {
@@ -76,7 +76,7 @@ public function setUpdatedAt($value)
     /**
      * Get a fresh timestamp for the model.
      *
-     * @return \Carbon\Carbon
+     * @return \Illuminate\Support\Carbon
      */
     public function freshTimestamp()
     {

src/Illuminate/Database/composer.json

@@ -18,8 +18,7 @@
         "php": ">=7.0",
         "illuminate/container": "5.5.*",
         "illuminate/contracts": "5.5.*",
-        "illuminate/support": "5.5.*",
-        "nesbot/carbon": "~1.20"
+        "illuminate/support": "5.5.*"
     },
     "autoload": {
         "psr-4": {

src/Illuminate/Foundation/Console/DownCommand.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Foundation\Console;
 
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Illuminate\Console\Command;
 
 class DownCommand extends Command

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

@@ -3,15 +3,15 @@
 namespace Illuminate\Foundation\Http\Exceptions;
 
 use Exception;
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 
 class MaintenanceModeException extends ServiceUnavailableHttpException
 {
     /**
      * When the application was put in maintenance mode.
      *
-     * @var \Carbon\Carbon
+     * @var \Illuminate\Support\Carbon
      */
     public $wentDownAt;
 
@@ -25,7 +25,7 @@ class MaintenanceModeException extends ServiceUnavailableHttpException
     /**
      * When the application should next be available.
      *
-     * @var \Carbon\Carbon
+     * @var \Illuminate\Support\Carbon
      */
     public $willBeAvailableAt;
 

src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php

@@ -3,7 +3,7 @@
 namespace Illuminate\Foundation\Http\Middleware;
 
 use Closure;
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Illuminate\Foundation\Application;
 use Symfony\Component\HttpFoundation\Cookie;
 use Illuminate\Contracts\Encryption\Encrypter;

src/Illuminate/Notifications/Messages/SlackAttachment.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Notifications\Messages;
 
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 
 class SlackAttachment
 {

src/Illuminate/Queue/Console/RestartCommand.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Queue\Console;
 
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Illuminate\Console\Command;
 
 class RestartCommand extends Command

src/Illuminate/Queue/Console/WorkCommand.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Queue\Console;
 
-use Carbon\Carbon;
 use Illuminate\Queue\Worker;
+use Illuminate\Support\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Queue\Job;
 use Illuminate\Queue\WorkerOptions;

src/Illuminate/Queue/DatabaseQueue.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Queue;
 
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Illuminate\Database\Connection;
 use Illuminate\Queue\Jobs\DatabaseJob;
 use Illuminate\Queue\Jobs\DatabaseJobRecord;

src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Queue\Failed;
 
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Illuminate\Database\ConnectionResolverInterface;
 
 class DatabaseFailedJobProvider implements FailedJobProviderInterface

src/Illuminate/Queue/InteractsWithTime.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Queue;
 
-use Carbon\Carbon;
 use DateTimeInterface;
+use Illuminate\Support\Carbon;
 
 trait InteractsWithTime
 {

src/Illuminate/Queue/composer.json

@@ -21,7 +21,6 @@
         "illuminate/database": "5.5.*",
         "illuminate/filesystem": "5.5.*",
         "illuminate/support": "5.5.*",
-        "nesbot/carbon": "~1.20",
         "symfony/debug": "~3.3",
         "symfony/process": "~3.3"
     },

src/Illuminate/Routing/Middleware/ThrottleRequests.php

@@ -3,7 +3,7 @@
 namespace Illuminate\Routing\Middleware;
 
 use Closure;
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Illuminate\Cache\RateLimiter;
 use Symfony\Component\HttpFoundation\Response;
 

src/Illuminate/Session/CookieSessionHandler.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Session;
 
-use Carbon\Carbon;
 use SessionHandlerInterface;
+use Illuminate\Support\Carbon;
 use Symfony\Component\HttpFoundation\Request;
 use Illuminate\Contracts\Cookie\QueueingFactory as CookieJar;
 

src/Illuminate/Session/DatabaseSessionHandler.php

@@ -2,9 +2,9 @@
 
 namespace Illuminate\Session;
 
-use Carbon\Carbon;
 use Illuminate\Support\Arr;
 use SessionHandlerInterface;
+use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\ConnectionInterface;

src/Illuminate/Session/FileSessionHandler.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Session;
 
-use Carbon\Carbon;
 use SessionHandlerInterface;
+use Illuminate\Support\Carbon;
 use Symfony\Component\Finder\Finder;
 use Illuminate\Filesystem\Filesystem;
 

src/Illuminate/Session/Middleware/StartSession.php

@@ -3,9 +3,9 @@
 namespace Illuminate\Session\Middleware;
 
 use Closure;
-use Carbon\Carbon;
 use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Illuminate\Session\SessionManager;
 use Illuminate\Contracts\Session\Session;
 use Illuminate\Session\CookieSessionHandler;

src/Illuminate/Session/composer.json

@@ -18,7 +18,6 @@
         "illuminate/contracts": "5.5.*",
         "illuminate/filesystem": "5.5.*",
         "illuminate/support": "5.5.*",
-        "nesbot/carbon": "~1.20",
         "symfony/finder": "~3.3",
         "symfony/http-foundation": "~3.3"
     },

src/Illuminate/Support/Carbon.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Illuminate\Support;
+
+use Carbon\Carbon as BaseCarbon;
+use Illuminate\Support\Traits\Macroable;
+
+class Carbon extends BaseCarbon
+{
+    use Macroable;
+}

src/Illuminate/Support/composer.json

@@ -17,7 +17,8 @@
         "php": ">=7.0",
         "ext-mbstring": "*",
         "doctrine/inflector": "~1.0",
-        "illuminate/contracts": "5.5.*"
+        "illuminate/contracts": "5.5.*",
+        "nesbot/carbon": "^1.20"
     },
     "replace": {
         "tightenco/collect": "self.version"

tests/Auth/AuthDatabaseTokenRepositoryTest.php

@@ -3,7 +3,7 @@
 namespace Illuminate\Tests\Auth;
 
 use Mockery as m;
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Auth\Passwords\DatabaseTokenRepository;
 

tests/Cache/CacheFileStoreTest.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Tests\Cache;
 
-use Carbon\Carbon;
+use Illuminate\Support\Carbon;
 use Illuminate\Cache\FileStore;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;