[5.5] Move InteractsWithTime to Support

src/Illuminate/Cache/DatabaseStore.php

@@ -6,11 +6,12 @@
 use Exception;
 use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Cache\Store;
+use Illuminate\Support\InteractsWithTime;
 use Illuminate\Database\ConnectionInterface;
 
 class DatabaseStore implements Store
 {
-    use RetrievesMultipleKeys;
+    use InteractsWithTime, RetrievesMultipleKeys;
 
     /**
      * The database connection instance.
@@ -72,7 +73,7 @@ public function get($key)
         // If this cache expiration date is past the current time, we will remove this
         // item from the cache. Then we will return a null value since the cache is
         // expired. We will use "Carbon" to make this comparison with the column.
-        if (Carbon::now()->getTimestamp() >= $cache->expiration) {
+        if ($this->currentTime() >= $cache->expiration) {
             $this->forget($key);
 
             return;
@@ -186,7 +187,7 @@ protected function incrementOrDecrement($key, $value, Closure $callback)
      */
     protected function getTime()
     {
-        return Carbon::now()->getTimestamp();
+        return $this->currentTime();
     }
 
     /**

src/Illuminate/Cache/FileStore.php

@@ -3,13 +3,13 @@
 namespace Illuminate\Cache;
 
 use Exception;
-use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\InteractsWithTime;
 
 class FileStore implements Store
 {
-    use RetrievesMultipleKeys;
+    use InteractsWithTime, RetrievesMultipleKeys;
 
     /**
      * The Illuminate Filesystem instance.
@@ -178,7 +178,7 @@ protected function getPayload($key)
         // If the current time is greater than expiration timestamps we will delete
         // the file and return null. This helps clean up the old files and keeps
         // this directory much cleaner for us as old files aren't hanging out.
-        if (Carbon::now()->getTimestamp() >= $expire) {
+        if ($this->currentTime() >= $expire) {
             $this->forget($key);
 
             return $this->emptyPayload();
@@ -189,7 +189,7 @@ protected function getPayload($key)
         // Next, we'll extract the number of minutes that are remaining for a cache
         // so that we can properly retain the time for things like the increment
         // operation that may be performed on this cache on a later operation.
-        $time = ($expire - Carbon::now()->getTimestamp()) / 60;
+        $time = ($expire - $this->currentTime()) / 60;
 
         return compact('data', 'time');
     }
@@ -225,7 +225,7 @@ protected function path($key)
      */
     protected function expiration($minutes)
     {
-        $time = Carbon::now()->getTimestamp() + (int) ($minutes * 60);
+        $time = $this->availableAt((int) ($minutes * 60));
 
         return $minutes === 0 || $time > 9999999999 ? 9999999999 : (int) $time;
     }

src/Illuminate/Cache/Lock.php

@@ -2,10 +2,13 @@
 
 namespace Illuminate\Cache;
 
+use Illuminate\Support\InteractsWithTime;
 use Illuminate\Contracts\Cache\LockTimeoutException;
 
 abstract class Lock
 {
+    use InteractsWithTime;
+
     /**
      * The name of the lock.
      *
@@ -69,12 +72,12 @@ public function get($callback = null)
      */
     public function block($seconds, $callback = null)
     {
-        $starting = time();
+        $starting = $this->currentTime();
 
         while (! $this->acquire()) {
             usleep(250 * 1000);
 
-            if (time() - $seconds >= $starting) {
+            if ($this->currentTime() - $seconds >= $starting) {
                 throw new LockTimeoutException;
             }
         }

src/Illuminate/Cache/MemcachedStore.php

@@ -4,12 +4,14 @@
 
 use Memcached;
 use ReflectionMethod;
-use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Cache\Store;
+use Illuminate\Support\InteractsWithTime;
 use Illuminate\Contracts\Cache\LockProvider;
 
 class MemcachedStore extends TaggableStore implements LockProvider, Store
 {
+    use InteractsWithTime;
+
     /**
      * The Memcached instance.
      *
@@ -212,7 +214,7 @@ public function flush()
      */
     protected function toTimestamp($minutes)
     {
-        return $minutes > 0 ? Carbon::now()->addSeconds($minutes * 60)->getTimestamp() : 0;
+        return $minutes > 0 ? $this->availableAt($minutes * 60) : 0;
     }
 
     /**

src/Illuminate/Cache/RateLimiter.php

@@ -2,11 +2,13 @@
 
 namespace Illuminate\Cache;
 
-use Illuminate\Support\Carbon;
+use Illuminate\Support\InteractsWithTime;
 use Illuminate\Contracts\Cache\Repository as Cache;
 
 class RateLimiter
 {
+    use InteractsWithTime;
+
     /**
      * The cache store implementation.
      *
@@ -60,7 +62,7 @@ public function tooManyAttempts($key, $maxAttempts, $decayMinutes = 1)
     protected function lockout($key, $decayMinutes)
     {
         $this->cache->add(
-            $key.':lockout', Carbon::now()->getTimestamp() + ($decayMinutes * 60), $decayMinutes
+            $key.':lockout', $this->availableAt($decayMinutes * 60), $decayMinutes
         );
     }
 
@@ -135,6 +137,6 @@ public function clear($key)
      */
     public function availableIn($key)
     {
-        return $this->cache->get($key.':lockout') - Carbon::now()->getTimestamp();
+        return $this->cache->get($key.':lockout') - $this->currentTime();
     }
 }

src/Illuminate/Cookie/CookieJar.php

@@ -3,12 +3,14 @@
 namespace Illuminate\Cookie;
 
 use Illuminate\Support\Arr;
-use Illuminate\Support\Carbon;
+use Illuminate\Support\InteractsWithTime;
 use Symfony\Component\HttpFoundation\Cookie;
 use Illuminate\Contracts\Cookie\QueueingFactory as JarContract;
 
 class CookieJar implements JarContract
 {
+    use InteractsWithTime;
+
     /**
      * The default path (if specified).
      *
@@ -62,7 +64,7 @@ public function make($name, $value, $minutes = 0, $path = null, $domain = null,
     {
         list($path, $domain, $secure, $sameSite) = $this->getPathAndDomain($path, $domain, $secure, $sameSite);
 
-        $time = ($minutes == 0) ? 0 : Carbon::now()->getTimestamp() + ($minutes * 60);
+        $time = ($minutes == 0) ? 0 : $this->availableAt($minutes * 60);
 
         return new Cookie($name, $value, $time, $path, $domain, $secure, $httpOnly, $raw, $sameSite);
     }

src/Illuminate/Foundation/Console/DownCommand.php

@@ -2,11 +2,13 @@
 
 namespace Illuminate\Foundation\Console;
 
-use Illuminate\Support\Carbon;
 use Illuminate\Console\Command;
+use Illuminate\Support\InteractsWithTime;
 
 class DownCommand extends Command
 {
+    use InteractsWithTime;
+
     /**
      * The console command signature.
      *
@@ -45,7 +47,7 @@ public function handle()
     protected function getDownFilePayload()
     {
         return [
-            'time' => Carbon::now()->getTimestamp(),
+            'time' => $this->currentTime(),
             'message' => $this->option('message'),
             'retry' => $this->getRetryTime(),
         ];

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

@@ -3,14 +3,16 @@
 namespace Illuminate\Foundation\Http\Middleware;
 
 use Closure;
-use Illuminate\Support\Carbon;
 use Illuminate\Foundation\Application;
+use Illuminate\Support\InteractsWithTime;
 use Symfony\Component\HttpFoundation\Cookie;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Session\TokenMismatchException;
 
 class VerifyCsrfToken
 {
+    use InteractsWithTime;
+
     /**
      * The application instance.
      *
@@ -155,7 +157,7 @@ protected function addCookieToResponse($request, $response)
 
         $response->headers->setCookie(
             new Cookie(
-                'XSRF-TOKEN', $request->session()->token(), Carbon::now()->getTimestamp() + 60 * $config['lifetime'],
+                'XSRF-TOKEN', $request->session()->token(), $this->availableAt(60 * $config['lifetime']),
                 $config['path'], $config['domain'], $config['secure'], false, false, $config['same_site'] ?? null
             )
         );

src/Illuminate/Queue/Console/RestartCommand.php

@@ -2,11 +2,13 @@
 
 namespace Illuminate\Queue\Console;
 
-use Illuminate\Support\Carbon;
 use Illuminate\Console\Command;
+use Illuminate\Support\InteractsWithTime;
 
 class RestartCommand extends Command
 {
+    use InteractsWithTime;
+
     /**
      * The console command name.
      *
@@ -28,7 +30,7 @@ class RestartCommand extends Command
      */
     public function handle()
     {
-        $this->laravel['cache']->forever('illuminate:queue:restart', Carbon::now()->getTimestamp());
+        $this->laravel['cache']->forever('illuminate:queue:restart', $this->currentTime());
 
         $this->info('Broadcasting queue restart signal.');
     }

src/Illuminate/Queue/Jobs/DatabaseJobRecord.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Queue\Jobs;
 
-use Illuminate\Queue\InteractsWithTime;
+use Illuminate\Support\InteractsWithTime;
 
 class DatabaseJobRecord
 {

src/Illuminate/Queue/Jobs/Job.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Queue\Jobs;
 
-use Illuminate\Queue\InteractsWithTime;
+use Illuminate\Support\InteractsWithTime;
 
 abstract class Job
 {

src/Illuminate/Queue/Queue.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Queue;
 
 use Illuminate\Container\Container;
+use Illuminate\Support\InteractsWithTime;
 
 abstract class Queue
 {

src/Illuminate/Routing/Middleware/ThrottleRequests.php

@@ -5,13 +5,15 @@
 use Closure;
 use RuntimeException;
 use Illuminate\Support\Str;
-use Illuminate\Support\Carbon;
 use Illuminate\Cache\RateLimiter;
+use Illuminate\Support\InteractsWithTime;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class ThrottleRequests
 {
+    use InteractsWithTime;
+
     /**
      * The rate limiter instance.
      *
@@ -151,7 +153,7 @@ protected function getHeaders($maxAttempts, $remainingAttempts, $retryAfter = nu
 
         if (! is_null($retryAfter)) {
             $headers['Retry-After'] = $retryAfter;
-            $headers['X-RateLimit-Reset'] = Carbon::now()->getTimestamp() + $retryAfter;
+            $headers['X-RateLimit-Reset'] = $this->availableAt($retryAfter);
         }
 
         return $headers;

src/Illuminate/Session/CookieSessionHandler.php

@@ -3,12 +3,14 @@
 namespace Illuminate\Session;
 
 use SessionHandlerInterface;
-use Illuminate\Support\Carbon;
+use Illuminate\Support\InteractsWithTime;
 use Symfony\Component\HttpFoundation\Request;
 use Illuminate\Contracts\Cookie\QueueingFactory as CookieJar;
 
 class CookieSessionHandler implements SessionHandlerInterface
 {
+    use InteractsWithTime;
+
     /**
      * The cookie jar instance.
      *
@@ -67,7 +69,7 @@ public function read($sessionId)
         $value = $this->request->cookies->get($sessionId) ?: '';
 
         if (! is_null($decoded = json_decode($value, true)) && is_array($decoded)) {
-            if (isset($decoded['expires']) && Carbon::now()->getTimestamp() <= $decoded['expires']) {
+            if (isset($decoded['expires']) && $this->currentTime() <= $decoded['expires']) {
                 return $decoded['data'];
             }
         }
@@ -82,7 +84,7 @@ public function write($sessionId, $data)
     {
         $this->cookie->queue($sessionId, json_encode([
             'data' => $data,
-            'expires' => Carbon::now()->addMinutes($this->minutes)->getTimestamp(),
+            'expires' => $this->availableAt($this->minutes * 60),
         ]), $this->minutes);
 
         return true;

src/Illuminate/Session/DatabaseSessionHandler.php

@@ -7,11 +7,14 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\InteractsWithTime;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Contracts\Container\Container;
 
 class DatabaseSessionHandler implements SessionHandlerInterface, ExistenceAwareInterface
 {
+    use InteractsWithTime;
+
     /**
      * The database connection instance.
      *
@@ -170,7 +173,7 @@ protected function getDefaultPayload($data)
     {
         $payload = [
             'payload' => base64_encode($data),
-            'last_activity' => Carbon::now()->getTimestamp(),
+            'last_activity' => $this->currentTime(),
         ];
 
         if (! $this->container) {
@@ -261,7 +264,7 @@ public function destroy($sessionId)
      */
     public function gc($lifetime)
     {
-        $this->getQuery()->where('last_activity', '<=', Carbon::now()->getTimestamp() - $lifetime)->delete();
+        $this->getQuery()->where('last_activity', '<=', $this->currentTime() - $lifetime)->delete();
     }
 
     /**

src/Illuminate/Queue/InteractsWithTime.php → src/Illuminate/Support/InteractsWithTime.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace Illuminate\Queue;
+namespace Illuminate\Support;
 
 use DateInterval;
 use DateTimeInterface;
-use Illuminate\Support\Carbon;
 
 trait InteractsWithTime
 {