[5.8] Fix cache TTL compliance to PSR interface

src/Illuminate/Cache/ApcStore.php

@@ -53,11 +53,15 @@ public function get($key)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function put($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         return $this->apc->put($this->prefix.$key, $value, (int) ($minutes * 60));
     }
 

src/Illuminate/Cache/ArrayStore.php

@@ -29,11 +29,15 @@ public function get($key)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function put($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $this->storage[$key] = $value;
 
         return true;

src/Illuminate/Cache/DatabaseStore.php

@@ -88,11 +88,15 @@ public function get($key)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function put($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $key = $this->prefix.$key;
 
         $value = $this->serialize($value);

src/Illuminate/Cache/DynamoDbStore.php

@@ -171,11 +171,15 @@ protected function isExpired(array $item, $expiration = null)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return void
      */
     public function put($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $this->dynamo->putItem([
             'TableName' => $this->table,
             'Item' => [
@@ -196,11 +200,15 @@ public function put($key, $value, $minutes)
      * Store multiple items in the cache for a given number of minutes.
      *
      * @param  array  $values
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return void
      */
     public function putMany(array $values, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $expiration = $this->toTimestamp($minutes);
 
         $this->dynamo->batchWriteItem([
@@ -231,11 +239,15 @@ public function putMany(array $values, $minutes)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function add($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         try {
             $response = $this->dynamo->putItem([
                 'TableName' => $this->table,

src/Illuminate/Cache/FileStore.php

@@ -54,11 +54,15 @@ public function get($key)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function put($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $this->ensureCacheDirectoryExists($path = $this->path($key));
 
         $result = $this->files->put(

src/Illuminate/Cache/MemcachedStore.php

@@ -97,11 +97,15 @@ public function many(array $keys)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function put($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         return $this->memcached->set(
             $this->prefix.$key, $value, $this->calculateExpiration($minutes)
         );
@@ -111,11 +115,15 @@ public function put($key, $value, $minutes)
      * Store multiple items in the cache for a given number of minutes.
      *
      * @param  array  $values
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function putMany(array $values, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $prefixedValues = [];
 
         foreach ($values as $key => $value) {
@@ -132,11 +140,15 @@ public function putMany(array $values, $minutes)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function add($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         return $this->memcached->add(
             $this->prefix.$key, $value, $this->calculateExpiration($minutes)
         );

src/Illuminate/Cache/NullStore.php

@@ -29,7 +29,7 @@ public function get($key)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function put($key, $value, $minutes)

src/Illuminate/Cache/RedisStore.php

@@ -84,11 +84,15 @@ public function many(array $keys)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function put($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $result = $this->connection()->setex(
             $this->prefix.$key, (int) max(1, $minutes * 60), $this->serialize($value)
         );
@@ -100,11 +104,15 @@ public function put($key, $value, $minutes)
      * Store multiple items in the cache for a given number of minutes.
      *
      * @param  array  $values
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function putMany(array $values, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $this->connection()->multi();
 
         $manyResult = null;
@@ -125,11 +133,15 @@ public function putMany(array $values, $minutes)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function add($key, $value, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $lua = "return redis.call('exists',KEYS[1])<1 and redis.call('setex',KEYS[1],ARGV[2],ARGV[1])";
 
         return (bool) $this->connection()->eval(

src/Illuminate/Cache/RedisTaggedCache.php

@@ -22,7 +22,7 @@ class RedisTaggedCache extends TaggedCache
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  \DateTime|float|int|null  $minutes
+     * @param  \DateTimeInterface|\DateInterval|float|int|null  $minutes
      * @return bool
      */
     public function put($key, $value, $minutes = null)

src/Illuminate/Cache/Repository.php

@@ -199,22 +199,22 @@ public function pull($key, $default = null)
     public function put($key, $value, $minutes = null)
     {
         if (is_array($key)) {
-            $result = $this->putMany($key, $value);
-
-            return $result;
+            return $this->putMany($key, $value);
         }
 
-        if (! is_null($minutes = $this->getMinutes($minutes))) {
-            $result = $this->store->put($this->itemKey($key), $value, $minutes);
+        $minutes = $this->getMinutes($minutes);
 
-            if ($result) {
-                $this->event(new KeyWritten($key, $value, $minutes));
-            }
+        if ($minutes !== null && $minutes <= 0) {
+            return false;
+        }
+
+        $result = $this->store->put($this->itemKey($key), $value, $minutes);
 
-            return $result;
+        if ($result) {
+            $this->event(new KeyWritten($key, $value, $minutes));
         }
 
-        return false;
+        return $result;
     }
 
     /**
@@ -229,24 +229,26 @@ public function set($key, $value, $ttl = null)
      * Store multiple items in the cache for a given number of minutes.
      *
      * @param  array  $values
-     * @param  \DateTimeInterface|\DateInterval|float|int  $minutes
+     * @param  \DateTimeInterface|\DateInterval|float|int|null  $minutes
      * @return bool
      */
     public function putMany(array $values, $minutes)
     {
-        if (! is_null($minutes = $this->getMinutes($minutes))) {
-            $result = $this->store->putMany($values, $minutes);
+        $minutes = $this->getMinutes($minutes);
 
-            if ($result) {
-                foreach ($values as $key => $value) {
-                    $this->event(new KeyWritten($key, $value, $minutes));
-                }
-            }
+        if ($minutes !== null && $minutes <= 0) {
+            return false;
+        }
 
-            return $result;
+        $result = $this->store->putMany($values, $minutes);
+
+        if ($result) {
+            foreach ($values as $key => $value) {
+                $this->event(new KeyWritten($key, $value, $minutes));
+            }
         }
 
-        return false;
+        return $result;
     }
 
     /**
@@ -262,12 +264,14 @@ public function setMultiple($values, $ttl = null)
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  \DateTimeInterface|\DateInterval|float|int  $minutes
+     * @param  \DateTimeInterface|\DateInterval|float|int|null  $minutes
      * @return bool
      */
     public function add($key, $value, $minutes)
     {
-        if (is_null($minutes = $this->getMinutes($minutes))) {
+        $minutes = $this->getMinutes($minutes);
+
+        if ($minutes !== null && $minutes <= 0) {
             return false;
         }
 
@@ -284,9 +288,7 @@ public function add($key, $value, $minutes)
         // so it exists for subsequent requests. Then, we will return true so it is
         // easy to know if the value gets added. Otherwise, we will return false.
         if (is_null($this->get($key))) {
-            $this->put($key, $value, $minutes);
-
-            return true;
+            return $this->put($key, $value, $minutes);
         }
 
         return false;
@@ -573,18 +575,22 @@ public function offsetUnset($key)
     /**
      * Calculate the number of minutes with the given duration.
      *
-     * @param  \DateTimeInterface|\DateInterval|float|int  $duration
+     * @param  \DateTimeInterface|\DateInterval|float|int|null  $minutes
      * @return float|int|null
      */
-    protected function getMinutes($duration)
+    protected function getMinutes($minutes)
     {
-        $duration = $this->parseDateInterval($duration);
+        if ($minutes === null) {
+            return null;
+        }
+
+        $duration = $this->parseDateInterval($minutes);
 
         if ($duration instanceof DateTimeInterface) {
             $duration = Carbon::now()->diffInRealSeconds($duration, false) / 60;
         }
 
-        return (int) ($duration * 60) > 0 ? $duration : null;
+        return $duration;
     }
 
     /**

src/Illuminate/Cache/RetrievesMultipleKeys.php

@@ -27,11 +27,15 @@ public function many(array $keys)
      * Store multiple items in the cache for a given number of minutes.
      *
      * @param  array  $values
-     * @param  float|int  $minutes
+     * @param  float|int|null  $minutes
      * @return bool
      */
     public function putMany(array $values, $minutes)
     {
+        if (is_null($minutes)) {
+            return false;
+        }
+
         $manyResult = null;
 
         foreach ($values as $key => $value) {

src/Illuminate/Contracts/Cache/Repository.php

@@ -38,7 +38,7 @@ public function pull($key, $default = null);
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  \DateTimeInterface|\DateInterval|float|int  $minutes
+     * @param  \DateTimeInterface|\DateInterval|float|int|null  $minutes
      * @return bool
      */
     public function put($key, $value, $minutes);
@@ -48,7 +48,7 @@ public function put($key, $value, $minutes);
      *
      * @param  string  $key
      * @param  mixed   $value
-     * @param  \DateTimeInterface|\DateInterval|float|int  $minutes
+     * @param  \DateTimeInterface|\DateInterval|float|int|null  $minutes
      * @return bool
      */
     public function add($key, $value, $minutes);